@nerd-bible/wordgard 0.3.5 → 0.3.6

package/dist/command.d.ts

@@ -511,7 +511,7 @@ declare const insertLineBreak: Command.Pure;
 The command that handles enter presses. The default handler will,
 if the selection is not in an inline context, insert an empty
 default textblock in its position. Otherwise it first tries
-`liftEmptyTextblock`, then `splitTextblock`.
+`liftEmptyBlock`, then `splitTextblock`.
 */
 declare const enter: Command.Pure;
 /**
@@ -705,11 +705,11 @@ selection is empty.
 */
 declare function deleteSelection(state: GardState): Transaction.Spec | false;
 /**
-If the cursor is inside an empty textblock, return a transaction
-that deletes the entire block. `dir` determines which way the
-cursor moves after the deletion.
+If the cursor is inside an empty plot, return a transaction that
+deletes the entire plot. `dir` determines which way the cursor
+moves after the deletion.
 */
-declare function deleteEmptyTextblock(state: GardState, dir?: -1 | 1): Transaction.Spec | false;
+declare function deleteEmptyPlot(state: GardState, dir?: -1 | 1): Transaction.Spec | false;
 /**
 If the cursor is at the start of a textblock that can be joined to
 a textblock before it, return a transaction to performs this join.
@@ -793,4 +793,4 @@ updated to perform those joins.
 */
 declare function autoJoinBlocks(state: GardState, tr: Transaction.Spec): Transaction.Spec;
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyTextblock, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };

package/dist/command.js

@@ -150,14 +150,14 @@ function deleteSelection(state) {
         userEvent: "delete.selection"
     });
 }
-function deleteEmptyTextblock(state, dir = -1) {
+function deleteEmptyPlot(state, dir = -1) {
     if (!state.selection.isCursor)
         return false;
-    let block = state.sel.head.textblockParent;
-    if (!block || block.start < block.end || block.before == 0 && block.after == state.doc.length)
+    let plot = state.sel.head.parent;
+    if (!plot.parent || plot.start < plot.end)
         return false;
     return {
-        changes: { from: block.before, to: block.after, fit: true },
+        changes: { from: plot.before, to: plot.after, fit: true },
         selection: (cx, changes) => GardSelection.near(cx, changes.mapPos(state.selection.head), dir),
         scrollIntoView: true,
         userEvent: dir < 0 ? "delete.backward" : "delete.forward"
@@ -289,12 +289,9 @@ function deleteBackward(state, word = false) {
     for (;;) {
         if (next.isPlot && next.type.isolating)
             return false;
-        if (next.isLeaf || state.isAtom(next.type))
+        if (next.isLeaf || state.isAtom(next.type) || !next.content.length)
             break;
-        let last = next.content.length - 1;
-        if (last < 0)
-            return false;
-        next = next.content[last];
+        next = next.content[next.content.length - 1];
         pos--;
     }
     if (next.is(Leaf.Text)) {
@@ -336,13 +333,14 @@ function deleteBackward(state, word = false) {
     }
     let from = pos - next.length, to = pos;
     let parent = state.doc.resolve(pos).parent;
-    while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
-        if (!parent.parent)
-            return false;
-        parent = parent.parent;
-        from--;
-        to++;
-    }
+    if (next.type.isBlock)
+        while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
+            if (!parent.parent)
+                return false;
+            parent = parent.parent;
+            from--;
+            to++;
+        }
     return {
         changes: { from, to },
         scrollIntoView: true,
@@ -366,10 +364,8 @@ function deleteForward(state, word = false) {
     for (;;) {
         if (next.isPlot && next.type.isolating)
             return false;
-        if (next.isLeaf || state.isAtom(next.type))
+        if (next.isLeaf || state.isAtom(next.type) || !next.content.length)
             break;
-        if (!next.content.length)
-            return false;
         next = next.content[0];
         pos++;
     }
@@ -412,13 +408,14 @@ function deleteForward(state, word = false) {
     }
     let from = pos, to = pos + next.length;
     let parent = state.doc.resolve(pos).parent;
-    while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
-        if (!parent.parent)
-            return false;
-        parent = parent.parent;
-        from--;
-        to++;
-    }
+    if (next.type.isBlock)
+        while (parent && parent.node.type.isBlock && parent.node.content.length == 1) {
+            if (!parent.parent)
+                return false;
+            parent = parent.parent;
+            from--;
+            to++;
+        }
     return {
         changes: { from, to },
         scrollIntoView: true,
@@ -766,15 +763,15 @@ const deleteUnit = ({ state }, dir) => {
     if (state.readOnly)
         return false;
     return deleteSelection(state) || (dir == "forward"
-        ? joinForward(state) || deleteForward(state) || deleteEmptyTextblock(state, 1)
-        : joinListItems(state) || joinBackward(state) || deleteBackward(state) || deleteEmptyTextblock(state, -1));
+        ? joinForward(state) || deleteForward(state) || deleteEmptyPlot(state, 1)
+        : joinListItems(state) || joinBackward(state) || deleteBackward(state) || deleteEmptyPlot(state, -1));
 };
 const deleteWord = ({ state }, dir) => {
     if (state.readOnly)
         return false;
     return deleteSelection(state) || (dir == "forward"
-        ? joinForward(state) || deleteForward(state, true) || deleteEmptyTextblock(state, 1)
-        : joinListItems(state) || joinBackward(state) || deleteBackward(state, true) || deleteEmptyTextblock(state, -1));
+        ? joinForward(state) || deleteForward(state, true) || deleteEmptyPlot(state, 1)
+        : joinListItems(state) || joinBackward(state) || deleteBackward(state, true) || deleteEmptyPlot(state, -1));
 };
 const deleteToLineEnd = (wg, dir) => {
     if (wg.state.readOnly)
@@ -1101,8 +1098,7 @@ function extendSel(base, head) {
 const moveByUnit = ({ state }, { dir, extend }) => {
     let forward = isForward(dir, state), selection = asTextSel(state.selection, forward);
     if (!selection.empty && !extend) {
-        let next = selection.normalCursorAtBound(state, forward);
-        return next ? setSelection(next) : false;
+        return setSelection(GardSelection.near(state, forward ? selection.to : selection.from, forward ? -1 : 1));
     }
     else {
         let next = selection.nextNormalCursor(state, forward);
@@ -1133,10 +1129,10 @@ function nextVertical(wg, sel, forward, distance, allowNode) {
 }
 const moveByLine = (wg, { dir, extend }) => {
     let { state } = wg, { selection } = state, forward = dir == "down";
-    if (state.selection instanceof GardSelection.Node) {
-        let next = !extend && state.selection.normalCursorAtBound(state, forward);
+    if (selection instanceof GardSelection.Node) {
+        let next = !extend && GardSelection.near(state, forward ? selection.to : selection.from, forward ? -1 : 1);
         if (next && !state.doc.resolve(next.head).parent.node.inlineContent)
-            return setSelection(GardSelection.cursor(next.head, next.headSide, state.selection.goalColumn));
+            return setSelection(GardSelection.cursor(next.head, next.headSide, selection.goalColumn));
         selection = GardSelection.cursor(forward ? selection.to : selection.from, undefined, selection.goalColumn);
     }
     else {
@@ -1448,4 +1444,4 @@ const Menu = /*@__PURE__*/(function (Menu) {
     Menu.resolve = resolve;
 ;return Menu})({});
 
-export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyTextblock, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };
+export { Command, Menu, autoJoinBlocks, canAddMarkInRange, clearNonFitting, deleteBackward, deleteEmptyPlot, deleteForward, deleteLine, deleteSelection, deleteToLineEnd, deleteUnit, deleteWord, doUnwrapBlock, enter, findUnwrappable, findWrappable, insertLineBreak, insertText, joinBackward, joinBlocks, joinForward, joinListItems, liftEmptyBlock, listIsActive, moveByLine, moveByPage, moveByUnit, moveByWord, moveToDocSide, moveToLineSide, moveToTextblockSide, redo, selectAll, selectedTextblocks, setAlignment, setDirection, setTextblockType, splitTextblock, toggleBlock, toggleEmphasis, toggleList, toggleMark, toggleStrong, toggleUnderline, transposeChars, undo, unwrapBlock, wrapBlock, wrapBlockRange };

package/dist/doc.d.ts

@@ -250,7 +250,7 @@ declare class Elt<T = string> {
     /**
     Convert an element (with only string content) to a DOM tree.
     */
-    toDOM(this: Elt<string>, doc?: Document): Element | Text;
+    toDOM(this: Elt<string>, doc?: Document): Element;
 }
 declare namespace Elt {
     /**
@@ -1685,6 +1685,11 @@ declare namespace Plot {
         */
         readonly orientation: "row" | "column";
         /**
+        True if this is an inline plot with {@link
+        Plot.Spec.cursorInsideBounds `cursorInsideBounds`} set.
+        */
+        readonly cursorInsideBounds: boolean;
+        /**
         The spec used to define this plot type.
         */
         readonly spec: Plot.Spec<any>;

package/dist/doc.js

@@ -1429,6 +1429,7 @@ class Plot {
         neutral;
         preserveWhitespace;
         orientation;
+        cursorInsideBounds;
         spec;
         constructor(name, flags, spec) {
             super(name, flags, spec, NodeShape.from(name, false, spec.shape));
@@ -1440,6 +1441,7 @@ class Plot {
             this.neutral = spec.neutral ?? !this.defining;
             this.preserveWhitespace = spec.preserveWhitespace ?? !!this.hasRole(Node.Role.Code);
             this.orientation = flags & 2 ? "row" : spec.orientation || "column";
+            this.cursorInsideBounds = !!((flags & 1) && spec.cursorInsideBounds);
             this.default = "defaultParam" in spec ? Plot.Tag.new(this, spec.defaultParam, none) :
                 (flags & 16) ? Plot.Tag.new(this, null, none) : null;
             if (!this.shape.atom && this.isInline && !this.inlineContent)
@@ -3069,6 +3071,9 @@ function splatContext(top, cx) {
     for (let ch of cx.children)
         top.push(ch);
 }
+function isFitBarrier(plot) {
+    return plot.isolating || plot.cursorInsideBounds;
+}
 function fitReplacement(doc, from, to, slice, context) {
     if (!slice.length)
         return fitDeletion(doc, from, to);
@@ -3099,10 +3104,10 @@ function fitReplacement(doc, from, to, slice, context) {
     let found, foundCost = 1e8;
     let neutral = true, toEnd = true;
     scan: for (let cxFrom = from.parent, cxTo = to.parent, fromDepth = from.depth, toDepth = to.depth, start = from.pos, end = to.pos; cxFrom.parent; cxFrom = cxFrom.parent, start--, fromDepth--) {
-        if (cxFrom.start != start || cxFrom.node.type.isolating)
+        if (cxFrom.start != start || isFitBarrier(cxFrom.node.type))
             break;
         while (toDepth > fromDepth) {
-            if (cxTo.node.type.isolating)
+            if (isFitBarrier(cxTo.node.type))
                 break scan;
             cxTo = cxTo.parent;
             toDepth--;
@@ -3136,17 +3141,22 @@ function fitReplacement(doc, from, to, slice, context) {
     if (found)
         return found;
     if (from.pos == to.pos && !from.inText) {
-        let cx = from.parent, before = from.pos, after = from.pos;
-        for (; cx.parent && !cx.node.type.isolating && (before == cx.start || after == cx.end); cx = cx.parent, before--, after++) {
+        let cx = from.parent;
+        for (let before = from.index ? -1 : from.pos, after = from.pos == from.parent.end ? from.pos : -1; before > -1 || after > -1;) {
             for (let i = -1; i < context.length; i++) {
                 let type = i >= 0 ? context[i].type : firstType;
                 if (!type)
                     continue;
-                if (doc.schema.canContain(cx.parent.node.type, type)) {
-                    let pos = before == cx.start ? cx.before : cx.after;
+                if (doc.schema.canContain(cx.node.type, type)) {
+                    let pos = before > -1 ? before : after;
                     return { from: pos, to: pos, slice: i >= 0 ? closeSlice(doc.schema, slice, context, i + 1, true) : slice };
                 }
             }
+            if (isFitBarrier(cx.node.type) || !cx.parent)
+                break;
+            before = before == cx.start ? before - 1 : -1;
+            after = after == cx.end ? after + 1 : -1;
+            cx = cx.parent;
         }
     }
     for (let i = 0; i < context.length; i++) {
@@ -3161,7 +3171,7 @@ function fitDeletion(doc, from, to) {
     let toDepth = to.depth;
     let covered;
     for (let cx = from.parent, cxTo = to.parent, depth = from.depth, start = from.pos, end = to.pos; cx.parent; start--, cx = cx.parent, depth--) {
-        if (cx.start != start || cx.node.type.isolating)
+        if (cx.start != start || isFitBarrier(cx.node.type))
             break;
         while (toDepth > depth) {
             cxTo = cxTo.parent;

package/dist/editor.js

@@ -1,5 +1,5 @@
 import { GardState, GardSelection, TextblockMap, BidiSpan, Transaction } from 'wordgard/state';
-import { Attributes, Elt, Node, Leaf, ChangeSet, parse, Slice, Plot, serialize, Pos, ValidationError } from 'wordgard/doc';
+import { Attributes, Elt, Node, Leaf, ChangeSet, parse, Slice, Plot, serialize, Pos, ValidationError, Mark } from 'wordgard/doc';
 import { StyleModule } from 'style-mod';
 import { findClusterBreak } from '@marijn/find-cluster-break';
 import { enter, insertLineBreak, selectAll, undo, redo, transposeChars, Command, deleteUnit, deleteWord, deleteToLineEnd, moveByUnit, moveByLine, moveByWord, moveToLineSide, moveToDocSide, moveByPage, moveToTextblockSide, setAlignment, toggleUnderline, toggleEmphasis, toggleStrong, deleteLine, insertText, setDirection, deleteSelection, Menu, findWrappable, wrapBlockRange, autoJoinBlocks } from 'wordgard/command';
@@ -229,6 +229,15 @@ const baseTagShape = /*@__PURE__*/memo((tag) => {
     return addMarkAttributes(tag.is(Leaf.Text) ? Widget.EditableText.of(tag.param)
         : tag.type.shape.create(tag.param), tag);
 });
+function renderMarks(marks, around) {
+    let result = addMarkAttributes(Elt.create("span", Attributes.none, [around]), Leaf.text(around, marks));
+    for (let i = marks.length - 1; i >= 0; i--) {
+        let mark = marks[i];
+        if (mark.type.element)
+            result = renderMarkWrapper(mark).fill([result]);
+    }
+    return result.toDOM();
+}
 class AttributeRangeDecoration extends Decoration.Range {
     attribute;
     value;
@@ -2610,15 +2619,20 @@ class ContentUpdate {
             return tile;
         }
     }
-    ensureBR() {
+    ensureHackNode() {
         let tile = this.new;
         if (!tile.isPlotContent)
             return;
         while (tile.isNodeInner)
             tile = tile.parent;
         let node = tile.node;
-        if (!node || !node.isPlot || !node.isTextblock)
+        if (!node || !node.isPlot || !(node.isTextblock || node.type.isInline))
+            return;
+        if (node.type.isInline) {
+            if (!this.new.children.length)
+                this.new.addChild(new WidgetTile(imgHack, null, 16 | 64, imgHack.render(this.wg)));
             return;
+        }
         let hasHack = -1, needsHack = true;
         for (let parent = this.new, i = parent.children.length;;) {
             if (i > 0) {
@@ -2656,7 +2670,7 @@ class ContentUpdate {
         }
     }
     up() {
-        this.ensureBR();
+        this.ensureHackNode();
         this.new = this.new.parent;
     }
     leaveNode() {
@@ -2739,7 +2753,7 @@ class ContentUpdate {
     finish() {
         while (!(this.new instanceof DocTile))
             this.up();
-        this.ensureBR();
+        this.ensureHackNode();
         return this.new;
     }
 }
@@ -2784,7 +2798,11 @@ const brHack = /*@__PURE__*/Widget.create({
     editable: true
 });
 const imgHack = /*@__PURE__*/Widget.create({
-    render() { return document.createElement("img"); },
+    render() {
+        let img = document.createElement("img");
+        img.className = "wg-buffer";
+        return img;
+    },
     editable: true
 });
 function separateComposition(sections, comp) {
@@ -2817,18 +2835,26 @@ function separateComposition(sections, comp) {
     return result;
 }
 
+class Coords {
+    ref;
+    rect;
+    constructor(ref, rect) {
+        this.ref = ref;
+        this.rect = rect;
+    }
+}
 function coordsAtPos(wg, pos, assoc) {
     let { offset, tile, pos: tilePos } = wg.docTile.resolve(pos, assoc);
     if (tile instanceof TextTile) {
         let node = tile.dom, len = node.nodeValue.length;
         if (!len)
-            return singleRect(textRange(node, 0, 0), 1);
+            return new Coords(tile, singleRect(textRange(node, 0, 0), 1));
         let from = offset, to = offset, side = assoc < 0 && from || from == len ? 1 : -1;
         if (side < 0)
             to++;
         else
             from--;
-        return flattenV(singleRect(textRange(node, from, to), side, true), (side < 0) == ltrAt(wg.state, pos, assoc));
+        return new Coords(tile, flattenV(singleRect(textRange(node, from, to), side, true), (side < 0) == ltrAt(wg.state, pos, assoc)));
     }
     let tagTile = tile;
     while (!tagTile.node)
@@ -2839,10 +2865,10 @@ function coordsAtPos(wg, pos, assoc) {
         if (tile.widget.type.inFlow) {
             let rect = singleRect(tile.dom, after ? 1 : -1);
             if (rect.width || rect.height)
-                return horizontal ? flattenH(rect, !after) : flattenV(rect, ltrAt(wg.state, pos, 1) == !after);
+                return new Coords(tile, horizontal ? flattenH(rect, !after) : flattenV(rect, ltrAt(wg.state, pos, 1) == !after));
         }
         if (!tile.parent)
-            return new DOMRect;
+            return new Coords(tile, new DOMRect);
         offset = tile.parent.children.indexOf(tile) + (after ? 1 : 0);
         tile = tile.parent;
         assoc = after ? 1 : -1;
@@ -2854,7 +2880,7 @@ function coordsAtPos(wg, pos, assoc) {
                     continue;
                 let rect = singleRect(before.dom, 1);
                 if (rect.width || rect.height)
-                    return horizontal ? flattenH(rect, false) : flattenV(rect, !ltrAt(wg.state, pos, 1));
+                    return new Coords(before, horizontal ? flattenH(rect, false) : flattenV(rect, !ltrAt(wg.state, pos, 1)));
             }
         }
         else {            for (let i = offset; i < tile.children.length; i++) {
@@ -2863,12 +2889,12 @@ function coordsAtPos(wg, pos, assoc) {
                     continue;
                 let rect = singleRect(after.dom, -1);
                 if (rect.width || rect.height)
-                    return horizontal ? flattenH(rect, true) : flattenV(rect, ltrAt(wg.state, pos, 1));
+                    return new Coords(after, horizontal ? flattenH(rect, true) : flattenV(rect, ltrAt(wg.state, pos, 1)));
             }
         }
     }
     let rect = singleRect(tile.dom, -assoc);
-    return horizontal ? flattenH(rect, assoc < 0) : flattenV(rect, assoc < 0);
+    return new Coords(tile, horizontal ? flattenH(rect, assoc < 0) : flattenV(rect, assoc < 0));
 }
 function flattenV(rect, left) {
     return rect.width ? new DOMRect(left ? rect.left : rect.right, rect.top, 0, rect.height) : rect;
@@ -3141,6 +3167,13 @@ const baseStyles = /*@__PURE__*/buildTheme("." + styleID, {
         borderLeft: "1.8px solid currentColor",
         marginLeft: "-0.9px",
     },
+    ".wg-cursor-v.wg-cursor-bold": {
+        borderLeft: "2.4px solid currentColor",
+        marginLeft: "-1.2px",
+    },
+    ".wg-cursor-v.wg-cursor-italic": {
+        transform: "rotate(10deg)"
+    },
     ".wg-cursor-h": {
         borderTop: "1.8px solid currentColor",
         marginTop: "-0.9px",
@@ -3151,6 +3184,10 @@ const baseStyles = /*@__PURE__*/buildTheme("." + styleID, {
             backgroundColor: "transparent"
         }
     },
+    ".wg-buffer": {
+        verticalAlign: "bottom",
+        height: "1em",
+    },
     "wg-placeholder": {
         opacity: "0.6",
         display: "inline-block",
@@ -3963,7 +4000,7 @@ class InputState {
         let inText = node.nodeType == 3;
         let ref = this.wg.docTile.posFromDOM(node, inText ? 0 : offset);
         let dir = -1;
-        let textBefore = textNodeBefore(node.parentNode, domIndex(node));
+        let textBefore = node.parentNode && textNodeBefore(node.parentNode, domIndex(node));
         let prev = textBefore && Tile.get(textBefore);
         if (prev instanceof TextTile && prev.length < prev.dom.nodeValue.length)
             dir = 1;
@@ -3986,8 +4023,8 @@ class InputState {
         let type = event.inputType, range;
         let { wg } = this, sel = wg.state.selection;
         if (data.domRange) {
-            range = { from: this.domMapping.mapPos(data.domRange.from),
-                to: this.domMapping.mapPos(data.domRange.to) };
+            range = { from: snapToSel(wg.state, this.domMapping.mapPos(data.domRange.from)),
+                to: snapToSel(wg.state, this.domMapping.mapPos(data.domRange.to)) };
             if (!this.domMapping.empty && type == "insertText" && !this.composing && range.from == range.to) {
                 let fromMax = this.domMapping.mapPos(data.domRange.from, 1);
                 if (range.from <= sel.from && fromMax >= sel.to)
@@ -3996,7 +4033,7 @@ class InputState {
         }
         let command = inputTypeCommands[type];
         if ((type == "deleteContentBackward" || type == "deleteContentForward") && range &&
-            (sel.empty
+            range.from != range.to &&            (sel.empty
                 ? !isSingleChar(this.domDoc, data.domRange.from, data.domRange.to) ||
                     sel.head != (type == "deleteContentBackward" ? range.to : range.from)
                 : sel.from != range.from || sel.to != range.to)) {
@@ -4089,6 +4126,39 @@ class InputState {
             this.mouseSelection.disconnect();
     }
 }
+function snapToSel(state, pos) {
+    let { head, anchor } = state.selection;
+    if (pos == head || pos == anchor)
+        return pos;
+    if (onlyInlineNodeBoundsBetween(state.doc, head, pos))
+        return head;
+    if (head != anchor && onlyInlineNodeBoundsBetween(state.doc, head, pos))
+        return anchor;
+    return pos;
+}
+function onlyInlineNodeBoundsBetween(doc, a, b) {
+    if (a > b)
+        [a, b] = [b, a];
+    let { parent, index, inText } = doc.resolve(a);
+    if (inText)
+        return false;
+    for (; a < b; a++) {
+        if (index == parent.node.content.length) {
+            if (!parent.node.type.isInline)
+                return false;
+            index = parent.index + 1;
+            parent = parent.parent;
+        }
+        else {
+            let next = parent.node.content[index];
+            if (!next.isPlot || !next.type.isInline)
+                return false;
+            parent = Pos.Plot.create(parent, next, a, index);
+            index = 0;
+        }
+    }
+    return true;
+}
 function isSingleChar(doc, from, to) {
     if (to > from + 10)
         return false;
@@ -4712,9 +4782,34 @@ class ViewState {
 const cursorBlinkRate = /*@__PURE__*/GardState.Facet.define({
     combine: inputs => inputs.length ? Math.min(...inputs) : 1200
 });
-class cursorLayer {
+class CursorStyle {
+    height;
+    align;
+    color;
+    bold;
+    italic;
+    constructor(height, align, color, bold, italic) {
+        this.height = height;
+        this.align = align;
+        this.color = color;
+        this.bold = bold;
+        this.italic = italic;
+    }
+    static read(node, height) {
+        let win = node.ownerDocument.defaultView || window;
+        let elt = node.nodeType == 1 ? node : node.parentNode;
+        let style = win.getComputedStyle(elt);
+        return new CursorStyle(height, style.verticalAlign, style.color, +style.fontWeight > 400, style.fontStyle == "italic");
+    }
+    eq(other) {
+        return other && this.height == other.height && this.align == other.align &&
+            this.color == other.color && this.bold == other.bold && this.italic == other.italic;
+    }
+}
+class CursorLayer {
     layer;
-    pos = null;
+    info = null;
+    cached = null;
     constructor(wg) {
         this.layer = wg.scrollDOM.appendChild(document.createElement("wg-cursor-layer"));
         this.positionCursor = this.positionCursor.bind(this);
@@ -4737,48 +4832,131 @@ class cursorLayer {
         this.layer.remove();
     }
     positionCursor(wg) {
-        let pos = cursorPos(wg), cur = this.pos;
-        if (!pos ? cur : !cur || cur.left != pos.left || cur.top != pos.top || cur.size != pos.size) {
-            this.pos = pos;
-            wg.scheduleDOMWrite(() => {
-                let cursor = this.layer.firstChild;
-                if (!pos) {
-                    if (cursor)
-                        cursor.remove();
-                }
-                else {
-                    if (!cursor)
-                        cursor = this.layer.appendChild(document.createElement("wg-cursor"));
-                    cursor.className = "wg-cursor-" + (pos.horiz ? "h" : "v");
-                    cursor.style.top = pos.top + "px";
-                    cursor.style.left = pos.left + "px";
-                    cursor.style.width = pos.horiz ? pos.size + "px" : "";
-                    cursor.style.height = pos.horiz ? "" : pos.size + "px";
-                }
-            });
-        }
+        getCursorInfo(wg, this, info => {
+            let cur = this.info;
+            if (!info ? cur : !cur || cur.left != info.left || cur.top != info.top || cur.size != info.size ||
+                (cur.style ? !cur.style.eq(info.style) : info.style)) {
+                this.info = info;
+                wg.scheduleDOMWrite(() => {
+                    let cursor = this.layer.firstChild;
+                    if (!info) {
+                        if (cursor)
+                            cursor.remove();
+                    }
+                    else {
+                        if (!cursor)
+                            cursor = this.layer.appendChild(document.createElement("wg-cursor"));
+                        cursor.className = "wg-cursor-" + (info.horiz ? "h" : "v");
+                        cursor.style.top = info.top + "px";
+                        cursor.style.left = info.left + "px";
+                        cursor.style.width = info.horiz ? info.size + "px" : "";
+                        cursor.style.height = info.horiz ? "" : info.size + "px";
+                        cursor.style.borderLeftColor = info.style ? info.style.color : "";
+                        cursor.classList.toggle("wg-cursor-bold", info.style?.bold ?? false);
+                        cursor.classList.toggle("wg-cursor-italic", info.style?.italic ?? false);
+                    }
+                });
+            }
+        });
     }
 }
+function alignOffset(align, height) {
+    if (align == "super")
+        return height * 0.36;
+    if (align == "sub")
+        return height * -0.17;
+    if (align.endsWith("px"))
+        return +align.slice(0, align.length - 2);
+    if (align.endsWith("%"))
+        return height * (+align.slice(0, align.length - 1)) * 100;
+    return 0;
+}
 const VertWidth = 30, VertGap = 5;
-function cursorPos(wg) {
+function getCursorInfo(wg, plugin, cont) {
     let { state } = wg;
     if (!state.selection.isCursor)
-        return null;
-    let { head, headSide } = state.selection;
-    let { left, right, top, bottom } = wg.coordsAtPos(head, headSide);
-    let horiz = top == bottom, size = horiz ? right - left : bottom - top;
-    if (horiz && size > VertWidth) {
-        size = VertWidth;
-        if (!wg.state.textLTR)
-            left = right - size;
+        return cont(null);
+    let { head, headSide } = state.selection, { sel } = wg.state;
+    let { ref, rect } = coordsAtPos(wg, head, headSide);
+    let doc = wg.contentDOM.getBoundingClientRect();
+    if (!sel.head.parent.node.inlineContent) {
+        let width = Math.max(VertWidth, rect.width), top = rect.top;
         let other = wg.coordsAtPos(head, headSide > 0 ? -1 : 1);
         if (other.top == other.bottom && other.top != top) {
             let move = Math.min(VertGap, Math.abs(other.top - top) / 2);
-            top = bottom = top + move * (other.top < top ? -1 : 1);
+            top = top + move * (other.top < top ? -1 : 1);
         }
+        return cont({
+            left: (wg.state.textLTR ? rect.left : rect.right - width) - doc.left,
+            top: top - doc.top,
+            size: width,
+            horiz: true, style: null
+        });
     }
-    let doc = wg.contentDOM.getBoundingClientRect();
-    return { left: left - doc.left, top: top - doc.top, size, horiz };
+    let finish = (style, vertRect) => {
+        if (style && (!plugin.cached || plugin.cached.style != style))
+            plugin.cached = { style, marks, parent: sel.head.parent.node.tag };
+        let height = style ? style.height : rect.height;
+        let bot = rect.bottom;
+        if (vertRect && (vertRect.top < rect.bottom && vertRect.bottom > rect.top)) {
+            bot = vertRect.bottom;
+        }
+        else {
+            let win = ref.dom.ownerDocument.defaultView || window;
+            let refAlign = win.getComputedStyle((ref.dom.nodeType == 1 ? ref.dom : ref.dom.parentNode)).verticalAlign;
+            if (style && refAlign != style.align) {
+                bot += alignOffset(refAlign, rect.height) - alignOffset(style.align, style.height);
+            }
+        }
+        cont({
+            left: rect.left - doc.left,
+            top: bot - height - doc.top,
+            size: height,
+            horiz: false, style
+        });
+    };
+    let marks = sel.activeMarks;
+    if (ref instanceof TextTile) {
+        let node = ref.posBefore < head ? state.sel.head.nodeBefore : state.sel.head.nodeAfter;
+        if (node && node.isText && Mark.sameSet(node.marks, marks))
+            return finish(CursorStyle.read(ref.dom, rect.height), rect);
+    }
+    let pos = sel.head.parent.start, foundRect, foundNode;
+    for (let sibling of sel.head.parent.node.content) {
+        if (sibling.isText && Mark.sameSet(sibling.marks, marks)) {
+            let { tile } = wg.docTile.resolve(pos, 1);
+            if (tile instanceof TextTile) {
+                let rects = textRange(tile.dom, 0, tile.length).getClientRects();
+                foundNode = tile.dom;
+                for (let i = 0; i < rects.length; i++) {
+                    foundRect = rects[i];
+                    if (foundRect.top < rect.bottom && foundRect.bottom > rect.top)
+                        break;
+                }
+            }
+        }
+        pos += sibling.length;
+    }
+    if (foundNode)
+        return finish(CursorStyle.read(foundNode, foundRect.height), foundRect);
+    if (plugin.cached && Mark.sameSet(plugin.cached.marks, marks) && plugin.cached.parent.eq(sel.head.parent.node.tag))
+        return finish(plugin.cached.style);
+    if (!marks.length)
+        return finish(null);
+    let target = sel.head.parent.node.isDoc ? wg.contentDOM : wg.nodeDOM(sel.head.parent.before);
+    wg.scheduleDOMWrite(() => {
+        let temp = renderMarks(marks, "M");
+        temp.style.position = "absolute";
+        wg.observer.ignore(() => target.insertBefore(temp, target.firstChild));
+        wg.scheduleDOMRead(() => {
+            wg.scheduleDOMWrite(() => wg.observer.ignore(() => temp.remove()));
+            let inner = temp;
+            while (inner.firstChild)
+                inner = inner.firstChild;
+            let r = textRange(inner, 0, 1).getClientRects()[0];
+            finish(CursorStyle.read(inner, r.height), r);
+        });
+    });
 }
 function setBlinkRate(state, dom) {
     dom.style.animationDuration = state.facet(cursorBlinkRate) + "ms";
@@ -5132,7 +5310,7 @@ class Wordgard {
     }
     coordsAtPos(pos, assoc = -1) {
         this.ensureFlushed();
-        return coordsAtPos(this, pos, assoc);
+        return coordsAtPos(this, pos, assoc).rect;
     }
     coordsForElement(pos) {
         this.ensureFlushed();
@@ -5381,7 +5559,7 @@ function attrsFromFacet(wg, facet, base) {
     Wordgard.Update = Update;
 ;return Wordgard})(Wordgard);
 const editorPlugin = /*@__PURE__*/GardState.Facet.define();
-const cursorPlugin = /*@__PURE__*/Wordgard.Plugin.fromClass(cursorLayer);
+const cursorPlugin = /*@__PURE__*/Wordgard.Plugin.fromClass(CursorLayer);
 class PluginInstance {
     spec;
     mustUpdate = null;

package/dist/state.d.ts

@@ -136,6 +136,10 @@ declare abstract class GardSelection {
     */
     static cursor(pos: number, side?: -1 | 1, goalColumn?: number): GardSelection.Text;
     /**
+    Find a normal cursor near the given position.
+    */
+    static near(cx: GardSelection.Context, pos: number, side?: -1 | 1, goalColumn?: number): GardSelection.Text;
+    /**
     Create a text selection.
     */
     static range(anchor: number, head?: number, headSide?: -1 | 1, goalColumn?: number): GardSelection.Text;
@@ -161,18 +165,10 @@ declare abstract class GardSelection {
     */
     nextNormalCursor(cx: GardSelection.Context, forward?: boolean): GardSelection.Text | null;
     /**
-    Get a normal cursor at the start or end of this selection.
-    */
-    normalCursorAtBound(cx: GardSelection.Context, forward?: boolean): GardSelection.Text | null;
-    /**
     Move across one word starting from this selection's head.
     */
     skipWord(cx: GardSelection.Context, forward?: boolean): GardSelection.Text | null;
     /**
-    Find a normal selection near the given position.
-    */
-    static near(cx: GardSelection.Context, pos: number, bias?: -1 | 1): GardSelection.Text;
-    /**
     Find a normal selection at the start of the document or the
     given textblock.
     */

package/dist/state.js

@@ -384,7 +384,7 @@ class TextblockMap {
                         sectionPos = pos + ch.length;
                     }
                 }
-                else if (ch.type.spec.cursorInsideBounds) {
+                else if (ch.type.cursorInsideBounds) {
                     text += " ";
                     scan(ch, pos + 1);
                     text += " ";
@@ -590,6 +590,10 @@ class GardSelection {
     static cursor(pos, side, goalColumn) {
         return GardSelection.Text.createInner(pos, pos, side, goalColumn);
     }
+    static near(cx, pos, side = 1, goalColumn) {
+        let norm = findNormalAt(cx, pos, side);
+        return GardSelection.cursor(norm.pos, norm.side, goalColumn);
+    }
     static range(anchor, head, headSide, goalColumn) {
         return GardSelection.Text.createInner(anchor, head ?? anchor, headSide, goalColumn);
     }
@@ -597,23 +601,13 @@ class GardSelection {
         return GardSelection.Node.create(pos, node, goalColumn);
     }
     nextNormalCursor(cx, forward = true) {
-        let found = scanNormalFrom(cx, this.head, this.headSide, forward, true);
-        return found && GardSelection.cursor(found.pos, found.side);
-    }
-    normalCursorAtBound(cx, forward = true) {
-        let found = scanNormalFrom(cx, forward ? this.to : this.from, forward ? -1 : 1, forward, false);
+        let found = scanNormalFrom(cx, this.head, this.headSide, forward);
         return found && GardSelection.cursor(found.pos, found.side);
     }
     skipWord(cx, forward = true) {
         let found = skipWord(cx, this.head, this.headSide, forward);
         return found && GardSelection.cursor(found.pos, found.side);
     }
-    static near(cx, pos, bias = 1) {
-        let norm = scanNormalFrom(cx, pos, bias, bias > 0, false) ??
-            scanNormalFrom(cx, pos, -bias, bias < 0, false) ??
-            { pos: pos, side: -1 };
-        return GardSelection.cursor(norm.pos, norm.side);
-    }
     static atStart(cx, block) {
         return cursorAtStart(cx, block);
     }
@@ -621,7 +615,7 @@ class GardSelection {
         let found = block
             ? TextblockMap.get(cx, block.start, block.node).visualSide(false)
             : cx.doc.inlineContent ? TextblockMap.get(cx, 0, cx.doc).visualSide(false)
-                : scanNormalFrom(cx, cx.doc.length, -1, false, false) ?? { pos: cx.doc.length, side: -1 };
+                : findNormalAt(cx, cx.doc.length, -1);
         return GardSelection.cursor(found.pos, found.side);
     }
 }
@@ -760,7 +754,7 @@ function cursorAtStart(cx, block) {
     let found = block
         ? TextblockMap.get(cx, block.start, block.node).visualSide(true)
         : cx.doc.inlineContent ? TextblockMap.get(cx, 0, cx.doc).visualSide(true)
-            : scanNormalFrom(cx, 0, 1, true, false) ?? { pos: 0, side: 1 };
+            : findNormalAt(cx, 0, 1);
     return GardSelection.cursor(found.pos, found.side);
 }
 function isBarrier(cx, node) {
@@ -769,13 +763,11 @@ function isBarrier(cx, node) {
     let override = node.type.spec.cursorBarrier;
     if (override != null)
         return override;
-    return node.type.isolating || node.type.preserveWhitespace || node.type.isBlock && cx.config.isAtom(node.type);
+    return node.type.isBlock && (node.type.isolating || node.type.preserveWhitespace || cx.config.isAtom(node.type));
 }
-function scanNormalFrom(cx, from, side, forward, mustMove) {
+function scanNormalFrom(cx, from, side, forward) {
     let pos = cx.doc.resolve(from), pastBarrier = false;
     if (pos.parent.node.inlineContent) {
-        if (!mustMove)
-            return { pos: pos.pos, side };
         let block = pos.textblockParent;
         let map = TextblockMap.get(cx, block.start, block.node);
         let next = cx.config.visualCursorMotion ? map.moveVisually(pos.pos, side, forward) : map.moveLogically(pos.pos, forward);
@@ -813,7 +805,7 @@ function scanNormalFrom(cx, from, side, forward, mustMove) {
         }
         if (index == (forward ? node.content.length : 0)) {
             let barrier = !next || isBarrier(cx, node);
-            if ((bottom != from || !mustMove) && pastBarrier && barrier)
+            if ((bottom != from) && pastBarrier && barrier)
                 return { pos: bottom, side: forward ? -1 : 1 };
             if (!next)
                 return null;
@@ -827,7 +819,7 @@ function scanNormalFrom(cx, from, side, forward, mustMove) {
         else {
             let nextNode = node.content[index - (forward ? 0 : 1)];
             let barrier = isBarrier(cx, nextNode);
-            if (pastBarrier && (bottom != from || !mustMove) && barrier)
+            if (pastBarrier && (bottom != from) && barrier)
                 return { pos: bottom, side: forward ? -1 : 1 };
             if (nextNode.isLeaf || cx.config.isAtom(nextNode.type)) {
                 index += step;
@@ -847,12 +839,52 @@ function scanNormalFrom(cx, from, side, forward, mustMove) {
         }
     }
 }
+function findNormalAt(cx, pos, bias) {
+    let res = cx.doc.resolve(pos), lowest = pos;
+    if (res.inText) {
+        let text = res.parent.node.content[res.index].tag.param;
+        let off = bias > 0 ? findClusterBreak(text, res.inText - 1) : findClusterBreak(text, res.inText + 1, false);
+        pos += off - res.inText;
+        if (off > 0 && off < text.length)
+            return { pos, side: bias };
+        res = Pos.create(res.parent, pos, res.index + (off ? 1 : 0), 0);
+    }
+    for (let pass = 0; pass < 2; pass++) {
+        let dir = !pass ? bias : -bias, { parent, index } = res, curPos = pos;
+        for (;;) {
+            if (parent.node.inlineContent &&
+                (parent.node.type.isBlock || curPos > parent.start && curPos < parent.end || parent.node.type.cursorInsideBounds))
+                return { pos: curPos, side: bias };
+            if (index == (dir > 0 ? parent.node.content.length : 0)) {
+                if ((parent.node.type.isInline ? parent.node.type.cursorInsideBounds : isBarrier(cx, parent.node)) ||
+                    !parent.parent)
+                    break;
+                lowest = curPos = curPos + dir;
+                index = parent.index + (dir > 0 ? 1 : 0);
+                parent = parent.parent;
+            }
+            else {
+                let next = parent.node.content[index + (dir > 0 ? 0 : -1)];
+                if (next.isLeaf || isBarrier(cx, next))
+                    break;
+                if (!parent.node.inlineContent && next.inlineContent && cx.config.visualCursorMotion) {
+                    let startPos = curPos - (dir > 0 ? 0 : next.length) + 1;
+                    return TextblockMap.get(cx, startPos, next).visualSide(dir > 0);
+                }
+                parent = Pos.Plot.create(parent, next, curPos, index);
+                index = dir > 0 ? 0 : next.content.length;
+                curPos += dir;
+            }
+        }
+    }
+    return { pos: lowest, side: bias };
+}
 function skipWord(cx, start, side, forward) {
     let last = null;
     for (let pos = start, visually = cx.config.visualCursorMotion;;) {
         let block = cx.doc.resolve(pos).textblockParent;
         if (!block) {
-            let next = scanNormalFrom(cx, pos, side, forward, true);
+            let next = scanNormalFrom(cx, pos, side, forward);
             if (!next)
                 return last;
             ({ pos, side } = next);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nerd-bible/wordgard",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "Semantic rich text editor system",
   "type": "module",
   "main": "dist/index.js",