inklet 4.0.0.dev8__tar.gz → 4.0.0.dev9__tar.gz

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
       tag:
         description: Published GitHub release tag
         required: true
-        default: v4.0.0.dev8
+        default: v4.0.0.dev9
         type: string
       dry_run:
         description: Validate release files without uploading to PyPI
@@ -43,7 +43,7 @@ jobs:
           RELEASE_TAG: ${{ inputs.tag }}
         run: |
           [[ "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(\.dev[0-9]+)?$ ]] || {
-            echo 'Expected a stable or development tag such as v3.1.0 or v4.0.0.dev8' >&2
+            echo 'Expected a stable or development tag such as v3.1.0 or v4.0.0.dev9' >&2
             exit 1
           }
           gh release view "$RELEASE_TAG" --json isDraft,isPrerelease > "$RUNNER_TEMP/release.json"

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## 4.0.0.dev9 — 2026-09-12
+
+Ninth development preview: mouse movement and proportional artwork scaling.
+3.1.0 remains the stable release.
+
+- Add click/drag selection and movement, corner scale handles, containing-group
+  selection, keyboard nudges and cancellable pointer gestures to LayoutEditor.
+- Map gestures through nested physical coordinate units and scales. Preserve
+  measured positions with folded offsets and keep the opposite scale corner fixed.
+- Add explicit Composition child scale, preserving registered ports and scaling
+  complete artwork. Width/height fitting retains its separate layout semantics.
+- Save scale in composition-layout schema 0.2; continue loading schema 0.1 files.
+- Cover geometry, ports, all four corners, undo/reopen, nested transforms,
+  invalid gestures and browser/Python export agreement; update the editor guide.
+
 ## 4.0.0.dev8 — 2026-09-12
 
 Eighth development preview: local browser layout editing with Python compilation.

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: inklet
-Version: 4.0.0.dev8
+Version: 4.0.0.dev9
 Summary: Scientific figures with live data, measured layout, and consistent vector exports.
 Project-URL: Repository, https://github.com/Mapika/inklet
 Project-URL: Documentation, https://inklet.readthedocs.io/en/latest/
@@ -81,16 +81,16 @@ their signatures and report schemas may change.
 
 ## 4.0 development preview
 
-**4.0.0.dev8** adds a local browser layout inspector backed by the Python
-compiler. Edit named placements and dimensions, undo/redo changes, save layout
-choices, and export the same compiled preview to SVG or PDF.
+**4.0.0.dev9** adds mouse movement and proportional artwork scaling to the
+local layout editor. Drag named objects and groups, use corner handles, undo
+gestures, and save choices that reproduce through the Python compiler.
 ```sh
-python -m pip install "inklet==4.0.0.dev8"
+python -m pip install "inklet==4.0.0.dev9"
 ```
 
 [Preview guide and examples](https://inklet.readthedocs.io/en/latest/development-preview/) ·
 [4.0 roadmap](https://inklet.readthedocs.io/en/latest/roadmap/) ·
-[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev8)
+[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev9)
 
 This is an opt-in development release. Experimental APIs and saved-state schemas
 may change; 3.1.0 remains the stable release. General browser editing,

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/README.md

@@ -31,16 +31,16 @@ their signatures and report schemas may change.
 
 ## 4.0 development preview
 
-**4.0.0.dev8** adds a local browser layout inspector backed by the Python
-compiler. Edit named placements and dimensions, undo/redo changes, save layout
-choices, and export the same compiled preview to SVG or PDF.
+**4.0.0.dev9** adds mouse movement and proportional artwork scaling to the
+local layout editor. Drag named objects and groups, use corner handles, undo
+gestures, and save choices that reproduce through the Python compiler.
 ```sh
-python -m pip install "inklet==4.0.0.dev8"
+python -m pip install "inklet==4.0.0.dev9"
 ```
 
 [Preview guide and examples](https://inklet.readthedocs.io/en/latest/development-preview/) ·
 [4.0 roadmap](https://inklet.readthedocs.io/en/latest/roadmap/) ·
-[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev8)
+[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev9)
 
 This is an opt-in development release. Experimental APIs and saved-state schemas
 may change; 3.1.0 remains the stable release. General browser editing,

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/api.md

@@ -218,7 +218,7 @@ A figure assembled from named children and measured expressions.
 
 * `measure(name, dimension='width')` -- Reference a child's measured width or height, in composition units.
 * `point(name, anchor='center')` -- Reference a placed child's compass point or registered port.
-* `add(name, item, *, x=0, y=0, anchor=None, width=None, height=None)`
+* `add(name, item, *, x=0, y=0, anchor=None, width=None, height=None, scale=1)`
 * `replace(name, item)` -- Replace a child while preserving its placement and dependent references.
 * `slot(name, **placement)` -- Declare a required content input with the same placement options as add().
 * `copy()` -- Copy nested compositions, plots, modules and component instructions.

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/compatibility.md

@@ -48,7 +48,7 @@ Blender. Scene creation and rendering run Blender in a separate process.
 ### Development-preview table adapters
 
 The [pandas and Polars adapters](table-inputs.md) are included in the experimental
-[4.0.0.dev8 preview](development-preview.md), not in stable 3.1.0. Their `pandas` and `polars` extras are separate
+[4.0.0.dev9 preview](development-preview.md), not in stable 3.1.0. Their `pandas` and `polars` extras are separate
 from core dependencies. The adapter CI jobs use Linux/Python 3.12 with pandas
 2.2.0 / Polars 1.0.0 and the versions pinned in `requirements-tables.txt`.
 Both paths check scalar/identity contracts and saved-state SVG reconstruction.

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/composition-recipes.md

@@ -86,7 +86,9 @@ assert before.to_svg() == old_svg
 assert doc.compile() is after
 ```
 
-`place()` changes only placement fields: `x`, `y`, `anchor`, `width`, `height`.
+`place()` changes placement fields: `x`, `y`, `anchor`, `width`, `height` and
+`scale`. Explicit `scale` (dev9) uniformly scales complete artwork, including
+text and strokes; it is separate from fitting a plot to a new width/height.
 Set `anchor`, `width` or `height` to `None` to restore their unspecified behavior.
 `replace()` replaces content and keeps its placement and named relationships.
 Dimension updates through `configure()` validate before mutation; expressions,

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/development-preview.md

@@ -1,6 +1,6 @@
-# Inklet 4.0.0.dev8
+# Inklet 4.0.0.dev9
 
-The eighth 4.0 development release includes the linked plotting, mapping,
+The ninth 4.0 development release includes the linked plotting, mapping,
 engineering and scientific workflows developed since 3.1.0. It is an installable
 snapshot for trying real examples and reporting problems. **3.1.0 remains the
 stable release.** The [4.0 roadmap](roadmap.md) still has open work.
@@ -8,7 +8,7 @@ stable release.** The [4.0 roadmap](roadmap.md) still has open work.
 ```sh
 python -m venv .venv
 source .venv/bin/activate
-python -m pip install "inklet==4.0.0.dev8"
+python -m pip install "inklet==4.0.0.dev9"
 ```
 
 On Windows PowerShell, activate with `.venv\Scripts\Activate.ps1` instead.
@@ -19,9 +19,9 @@ stable releases; see its [installation documentation](https://pip.pypa.io/en/sta
 Optional extras can be installed with the same pin:
 
 ```sh
-python -m pip install "inklet[render,pandas,polars]==4.0.0.dev8"
+python -m pip install "inklet[render,pandas,polars]==4.0.0.dev9"
 # Add calibrated volumes and TIFF workflows when needed:
-python -m pip install "inklet[volume,render]==4.0.0.dev8"
+python -m pip install "inklet[volume,render]==4.0.0.dev9"
 ```
 
 The core preview needs no browser server, NumPy, pandas, Polars or Blender.
@@ -29,7 +29,26 @@ Opening the generated HTML requires a browser. PNG/PDF exports from browser
 figures use separate Chrome/Chromium and Pillow; native Diagram exports retain
 their existing requirements. See [installation](installation.md).
 
-## Local layout inspector in dev8
+## Mouse movement and scaling in dev9
+
+The [layout editor](layout-editor.md) now supports direct mouse movement and
+proportional corner scaling of named objects and groups. Alt-click selects a
+containing group, arrow keys nudge, and Escape cancels. A drag shows an outline;
+release compiles the actual figure and updates dependent links.
+
+Moves preserve measured positions by adding offsets. Scaling keeps the opposite
+corner fixed, including inside scaled groups with different coordinate units.
+Each completed edit participates in undo/redo and saved-layout reconstruction.
+Uniform artwork scaling includes text and strokes; plot width/height controls
+retain their separate typography-preserving layout behavior.
+
+![Mouse selection and proportional scaling in the local editor](assets/guides/layout-editor-gestures.png)
+
+New layout files use schema 0.2 for explicit artwork scale. Dev7/dev8 schema 0.1
+files still load. Named composition objects are editable; individual plot marks,
+axis labels, connector segments and camera parameters remain outside this scope.
+
+## Local layout inspector retained from dev8
 
 The [local layout editor](layout-editor.md) turns saved composition choices into
 a browser workflow. Edit named placements and dimensions, preview the actual
@@ -45,7 +64,7 @@ remain consistent across repeated edits and resets.
 ![The local browser layout inspector](assets/guides/layout-editor.png)
 
 This inspector requires its local Python session. It covers composition layout;
-drag handles, label content, plot styling and cameras remain separate work.
+label content, individual plot marks and cameras remain separate work.
 The existing standalone viewers and linked-plot appearance editor retain their
 current scope.
 
@@ -162,7 +181,7 @@ The wheel contains the library. To obtain recipes and fixtures, use the matching
 release checkout or source archive:
 
 ```sh
-git clone --branch v4.0.0.dev8 https://github.com/Mapika/inklet.git
+git clone --branch v4.0.0.dev9 https://github.com/Mapika/inklet.git
 cd inklet
 python -m pip install -e '.[render]'
 python examples/v4/regional_report.py --renderer compiled --editor --output out/regional

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/installation.md

@@ -3,7 +3,7 @@
 Inklet requires Python 3.11 or later and an installed TrueType/OpenType font.
 The core Python dependencies are HarfBuzz bindings and fontTools.
 
-This page covers stable **Inklet 3.1** and the opt-in **4.0.0.dev8 preview**. See the
+This page covers stable **Inklet 3.1** and the opt-in **4.0.0.dev9 preview**. See the
 [compatibility matrix](compatibility.md) for tested platforms and Blender versions.
 
 ## From PyPI
@@ -24,9 +24,9 @@ Activate the environment or prefix commands with `.venv/bin/` on Linux/macOS.
 ## 4.0 development preview
 
 ```sh
-python -m pip install "inklet==4.0.0.dev8"
+python -m pip install "inklet==4.0.0.dev9"
 # Optional rendering and DataFrame adapters:
-python -m pip install "inklet[render,pandas,polars]==4.0.0.dev8"
+python -m pip install "inklet[render,pandas,polars]==4.0.0.dev9"
 ```
 
 Use a separate virtual environment when trying the preview. Experimental APIs

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/layout-editor.md

@@ -1,11 +1,11 @@
 # Local layout editor
 
-Available in **4.0.0.dev8**, under `inklet.experimental.layout_editor`. Adjust
+Available since **4.0.0.dev8**, with mouse gestures in **4.0.0.dev9**, under `inklet.experimental.layout_editor`. Adjust
 named placements and dimensions in a browser while Python recompiles the
 actual composition. The preview and downloaded SVG/PDF come from the same
 compiled figure, including plots, nested diagrams and native 3D content.
 
-![The local layout inspector editing a mixed-content report](assets/guides/layout-editor.png)
+![Mouse selection and proportional scaling handles on a native 3D object](assets/guides/layout-editor-gestures.png)
 
 The [complete example](../examples/layout_editor.py) opens the reusable report
 from [composition recipes](composition-recipes.md). From the checkout, run:
@@ -45,12 +45,42 @@ width and height, including its coordinate unit. Optional `width=` and
 `height=` arguments fix the containing document's dimensions in millimetres;
 those dimensions remain authoritative when the authored page size changes.
 
+## Move and scale with the mouse
+
+Click a named object in the preview and drag it to move. Corner handles scale
+its complete artwork proportionally, keeping the opposite corner fixed. This
+works for plots, modules, text, images, native 3D components and nested
+compositions. A dashed outline follows the pointer; release to compile the
+result and update dependent links. Escape or a cancelled pointer gesture leaves
+the figure unchanged. A simple click selects without making an edit.
+
+Use Alt-click to select a containing group, or choose its path in **Content**.
+Drag a selected group's outline to move the group. With the canvas focused,
+arrow keys move the selected object by 1 mm in figure space; Shift changes that
+to 10 mm. Mouse and pointer gestures use the same coordinates even inside
+scaled groups or compositions with different coordinate units.
+
+Each completed edit is one undo step. Movements add offsets to measured
+positions instead of discarding their relationships. Repeated offsets are
+combined, so a long editing session does not grow ever-deeper expressions.
+Saved layout files retain movement and scaling for Python reconstruction.
+
+**Scaling artwork also scales its text and strokes.** To resize a plot's data
+region while retaining physical typography, use the width/height controls
+below. The **Uniform scale** field gives an exact artwork scale factor; Reset
+target restores the original factor and placement.
+
+The selectable units are named composition children and groups. Individual
+marks, ticks, axis labels and connector segments remain part of their owning
+plot or diagram. Scaling and movement do not remove authored constraints or
+top-fitting behavior; dependent content can reflow when the compiler rebuilds.
+
 ## Edit and review
 
 Choose a named path in **Content**, enter the fields you want to change, then
 select **Apply layout**. Other fields retain their definitions.
 
-- Child placement fields are X, Y, anchor, width and height. Numbers use the
+- Child placement fields are X, Y, anchor, width, height and uniform scale. Numbers use the
   containing composition's coordinate unit. For plots, width and height describe
   the data region; changing them does not scale text or strokes.
 - A field marked **Measured** still follows its layout expression. Entering a
@@ -91,6 +121,7 @@ import json
 from pathlib import Path
 
 editor.command('edit', {'path': '/chart', 'placement': {'height': 35}})
+editor.command('gesture', {'path': '/chart', 'dx': 2, 'dy': 1})
 Path('layout-overrides.json').write_text(json.dumps(editor.overrides(), indent=2))
 editor.figure.save('edited.svg', 'edited.pdf')
 restored, report = recipe.with_layout_overrides(editor.overrides())
@@ -100,8 +131,10 @@ assert report['orphaned_targets'] == []
 `editor.figure` is the last successful compiled snapshot and supports the normal
 [export APIs](export-review.md), including PNG when render dependencies are
 installed. `overrides()` and `snapshot()` return independently owned data.
-Programmatic `command()` accepts `edit`, `reset`, `load`, `undo`, `redo` and
-`refresh`; an optional `revision=` rejects stale callers.
+Programmatic `command()` accepts `gesture`, `edit`, `reset`, `load`, `undo`,
+`redo` and `refresh`; an optional `revision=` rejects stale callers. A gesture
+uses figure-space `dx`/`dy` in millimetres. Optional `factor` and `corner`
+(`nw`, `ne`, `sw`, `se`) scale from the opposite corner.
 
 ## Refresh changed source content
 
@@ -130,8 +163,8 @@ remain accessible in Python. The `with LayoutEditor(recipe) as editor:` form
 starts and closes the server automatically; keep that context alive during
 browser use.
 
-This first inspector edits composition layout. Drag handles, label content,
-plot styling, camera controls, and file watching are not part of this interface.
+The inspector edits named composition layout and artwork scale. Label content,
+individual plot marks, camera controls, and file watching are not part of this interface.
 The separate [linked-plot appearance editor](visual-editing.md) retains its
 existing scope. Broader authoring and identity work remains on the
 [4.0 roadmap](roadmap.md).

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/layout-overrides.md

@@ -1,6 +1,6 @@
 # Save and restore layout choices
 
-Available in **4.0.0.dev7**. Save placement and dimension edits separately from
+Available since **4.0.0.dev7**; uniform artwork scale is added in **dev9**. Save placement and dimension edits separately from
 a [composition recipe](composition-recipes.md), then restore those choices
 when its data, labels or content change. The saved JSON records only differences
 from a reference recipe. Unedited source decisions remain in control.
@@ -41,7 +41,7 @@ Path('layout.json').write_text(json.dumps(state, indent=2, allow_nan=False))
 ```
 
 `layout_overrides(reference)` captures changed `x`, `y`, `anchor`, `width` and
-`height` fields on children, plus `width`, `height`, `unit` and `fit_top` on
+`height` and uniform `scale` fields on children, plus `width`, `height`, `unit` and `fit_top` on
 compositions. It visits nested compositions through their named children.
 Measured expressions remain expressions, so page resizing and dependent
 content measurements still work after reopening.
@@ -123,8 +123,10 @@ of 32 operations. Malformed files, nonfinite numbers, invalid properties and
 contradictory edits to a shared nested definition are rejected, including when
 `missing='drop'` is used.
 
-The schema identifier is `inklet.composition-layout/0.1`. Unknown schemas are
-rejected. The file is a JSON object with `schema` and `targets`; each target has
+New files use `inklet.composition-layout/0.2`, which adds a positive uniform
+artwork scale. The loader also accepts `inklet.composition-layout/0.1` files
+from dev7/dev8; those cannot contain scale fields. Unknown schemas are rejected.
+Upgrade older readers before opening a new 0.2 file. The file is a JSON object with `schema` and `targets`; each target has
 changed `placement` and/or `page` fields. It is a development-preview format,
 not a general Python object serializer or an asset manifest.
 

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/docs/roadmap.md

@@ -58,8 +58,10 @@ Dev7 adds [saved layout overrides](layout-overrides.md) keyed by named paths,
 with measured expressions, independent restoration and explicit orphan reports.
 Dev8 adds a [local layout inspector](layout-editor.md) backed by Python
 compilation, with saved choices, undo/redo and explicit source refresh.
-Serialized project templates, asset manifests, shared selection relationships,
-label/camera editing and direct manipulation remain open. Subsequent work
+Dev9 adds mouse movement, proportional artwork scaling and keyboard nudges
+for named composition children, with preserved measured positions and saved
+choices. Serialized project templates, asset manifests, shared selection
+relationships, label/camera editing and finer-grained manipulation remain open. Subsequent work
 should extend authoring and cross-content identity beyond this bounded inspector.
 
 ## Who this should serve

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "inklet"
-version = "4.0.0.dev8"
+version = "4.0.0.dev9"
 description = "Scientific figures with live data, measured layout, and consistent vector exports."
 readme = "README.md"
 authors = [{name = "Mark Marosi"}]

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/src/inklet/__init__.py

@@ -470,4 +470,4 @@ __all__ = [
     "mm", "pt", "COLUMN_SINGLE", "COLUMN_DOUBLE",
 ]
 
-__version__ = "4.0.0.dev8"
+__version__ = "4.0.0.dev9"

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/src/inklet/document/composition.py

@@ -12,6 +12,12 @@ from .spec import BuildSpec, ComponentSpec, fingerprint, freeze, length
 from .compiler import LayoutError
 
 
+def _scale(value):
+    if type(value) not in (int,float) or not math.isfinite(value) or value<=0:
+        raise ValueError('component scale must be a finite positive number')
+    return float(value)
+
+
 @dataclass(frozen=True)
 class _Slot(BuildSpec):
     name: str
@@ -66,6 +72,7 @@ class _Part:
     anchor: str | None = None
     width: object = None
     height: object = None
+    scale: float = 1
 
 
 @dataclass(eq=False)
@@ -76,7 +83,8 @@ class Composition(BuildSpec):
     and height describe data regions. Other children retain their authored size
     unless explicit dimensions are provided. `anchor=None` preserves the local
     coordinate frame; `nw`, `center`, registered ports and `area-nw` align a
-    measured point to (x, y). Layout never scales text or strokes.
+    measured point to (x, y). Dimension fitting never scales text or strokes. Explicit scale uniformly
+    scales the complete child artwork, including typography and strokes.
     """
     width: float
     height: float
@@ -109,11 +117,11 @@ class Composition(BuildSpec):
         """Reference a placed child's compass point or registered port."""
         return tuple(LayoutValue('point', (name, anchor, axis)) for axis in ('x', 'y'))
 
-    def add(self, name, item, *, x=0, y=0, anchor=None, width=None, height=None):
+    def add(self, name, item, *, x=0, y=0, anchor=None, width=None, height=None, scale=1):
         if not isinstance(name, str) or not re.fullmatch(r'[A-Za-z][A-Za-z0-9_-]*', name):
             raise ValueError('component names start with a letter and contain letters, digits, underscores or hyphens')
         if any(part.name == name for part in self._parts): raise LayoutError(f'duplicate component {name!r}')
-        self._parts.append(_Part(name, item, x, y, anchor, width, height))
+        self._parts.append(_Part(name, item, x, y, anchor, width, height, _scale(scale)))
         return item
 
     def __getitem__(self, name):
@@ -171,12 +179,13 @@ class Composition(BuildSpec):
     def place(self, name, **placement):
         """Edit a child's placement without replacing its content or named links.
 
-        Accepts x, y, anchor, width and height as in add(). Expressions and
+        Accepts x, y, anchor, width, height and uniform scale as in add(). Expressions and
         resulting geometry are validated during compilation.
         """
         from dataclasses import replace
-        unknown = placement.keys() - {'x','y','anchor','width','height'}
+        unknown = placement.keys() - {'x','y','anchor','width','height','scale'}
         if unknown: raise TypeError(f'unknown placement options: {", ".join(sorted(unknown))}')
+        if 'scale' in placement: placement['scale'] = _scale(placement['scale'])
         for index,part in enumerate(self._parts):
             if part.name == name:
                 self._parts[index] = replace(part, **freeze(placement))
@@ -282,7 +291,15 @@ class Composition(BuildSpec):
                         item = ComponentSpec(item.factory, evaluate(item.args), evaluate(item.kwargs), item.responsive)
                     w = None if part.width is None else length(evaluate(part.width), 'child width')*self.unit
                     h = None if part.height is None else length(evaluate(part.height), 'child height')*self.unit
-                    return context.build(item, w, h).copy()
+                    node = context.build(item, w, h).copy()
+                    factor = _scale(part.scale)
+                    if factor != 1:
+                        scaled = node.scaled(factor)
+                        # Keep registered ports directly available to measured
+                        # placement; their coordinates precede the new scale.
+                        for key in node.anchors: scaled.anchors[key] = placed_anchor(node,key)
+                        node = scaled
+                    return node
                 built[name] = guarded('measure', name, perform)
             return built[name]
 

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/src/inklet/document/layout_overrides.py

@@ -7,8 +7,9 @@ import re
 from .compiler import LayoutError
 from .spec import length
 
-SCHEMA = 'inklet.composition-layout/0.1'
-_PLACEMENT = {'x', 'y', 'anchor', 'width', 'height'}
+SCHEMA = 'inklet.composition-layout/0.2'
+LEGACY_SCHEMA = 'inklet.composition-layout/0.1'
+_PLACEMENT = {'x', 'y', 'anchor', 'width', 'height', 'scale'}
 _PAGE = {'width', 'height', 'unit', 'fit_top'}
 _NAME = r'[A-Za-z][A-Za-z0-9_-]*'
 
@@ -58,7 +59,10 @@ def _placement(values, *, encode=False):
     if not isinstance(values,dict) or not values or not set(values)<=_PLACEMENT:
         raise ValueError('invalid placement override properties')
     for key,value in values.items():
-        if key=='anchor':
+        if key=='scale':
+            from .composition import _scale
+            result[key] = _scale(value)
+        elif key=='anchor':
             if value is not None and (not isinstance(value,str) or not value):
                 raise ValueError('placement anchors must be nonempty strings or null')
             result[key] = value
@@ -125,7 +129,7 @@ def apply(recipe, value, *, missing='error'):
     """Validate all edits, reconcile stable names, then edit an independent copy."""
     from .composition import Composition
     if missing not in ('error','drop'): raise ValueError('missing policy must be error or drop')
-    if (not isinstance(value,dict) or set(value)!={'schema','targets'} or value['schema']!=SCHEMA
+    if (not isinstance(value,dict) or set(value)!={'schema','targets'} or value['schema'] not in (SCHEMA,LEGACY_SCHEMA)
             or not isinstance(value['targets'],dict)):
         raise ValueError('invalid composition layout overrides')
     targets = _targets(recipe)
@@ -136,7 +140,10 @@ def apply(recipe, value, *, missing='error'):
         if not isinstance(entry,dict) or not entry or not set(entry)<={'placement','page'}:
             raise ValueError(f'invalid layout target properties: {path}')
         options = {}
-        if 'placement' in entry: options['placement'] = _placement(entry['placement'])
+        if 'placement' in entry:
+            options['placement'] = _placement(entry['placement'])
+            if value['schema']==LEGACY_SCHEMA and 'scale' in options['placement']:
+                raise ValueError('scale requires composition layout schema 0.2')
         if 'page' in entry: options['page'] = _page(entry['page'])
         target = targets.get(path)
         invalid = target is None

{inklet-4.0.0.dev8 → inklet-4.0.0.dev9}/src/inklet/experimental/layout_editor/__init__.py

@@ -3,6 +3,8 @@ from __future__ import annotations
 
 import copy
 import json
+import math
+import xml.etree.ElementTree as ET
 from pathlib import Path
 import secrets
 import threading
@@ -10,7 +12,7 @@ from urllib.parse import urlsplit, parse_qs
 from http.server import BaseHTTPRequestHandler, ThreadingHTTPServer
 
 from ...document import Composition, document
-from ...document.layout_overrides import SCHEMA, _targets, _placement
+from ...document.layout_overrides import SCHEMA, _targets, _placement, _expression
 
 
 class LayoutEditor:
@@ -57,6 +59,68 @@ class LayoutEditor:
         """Return independently owned JSON-compatible saved layout choices."""
         with self._lock:return copy.deepcopy(self._value)
 
+    def _geometry(self):
+        from ...core import Vec2
+        from ...draw.coords import placed_anchor, plot_area
+        root,resolved=self._figure.build()
+        targets=_targets(self._recipe)
+        geometry={}
+        def visit(node,path=''):
+            if node.kind=='composition-part' and node.name:
+                path=path+'/'+node.name
+                if path in targets:
+                    parent,part,_=targets[path]
+                    placement=resolved[node.id];box=placement.bbox
+                    child=node.children[0]
+                    if part.anchor=='area-nw':
+                        area=plot_area(child);point=Vec2(area.x0,area.y0)
+                    elif part.anchor is None:point=Vec2(0,0)
+                    else:point=placed_anchor(child,part.anchor)
+                    anchor=placement.world.apply(point)
+                    inverse=placement.world.inverse()
+                    if box is not None:
+                        geometry[path]=dict(box=[box.x0,box.y0,box.width,box.height],
+                            anchor=[anchor.x,anchor.y],
+                            inverse=[inverse.a/parent.unit,inverse.b/parent.unit,
+                                     inverse.c/parent.unit,inverse.d/parent.unit])
+            for child in node.children:visit(child,path)
+        visit(root)
+        return geometry
+
+    def _gesture(self,value):
+        from ...document.composition import LayoutValue, _scale
+        if (not isinstance(value,dict) or not {'path','dx','dy'}<=set(value) or
+                not set(value)<={'path','dx','dy','factor','corner'}):
+            raise ValueError('gesture needs path and finite figure-space dx/dy')
+        for key in ('dx','dy'):
+            if type(value[key]) not in (int,float) or not math.isfinite(value[key]):
+                raise ValueError('gesture displacement must be finite')
+        path=value['path'];geometry=self._geometry()
+        if not isinstance(path,str) or path not in geometry:raise ValueError('unknown gesture target')
+        _,part,_=_targets(self._recipe)[path]
+        box=geometry[path]['box'];anchor=geometry[path]['anchor']
+        dx,dy=value['dx'],value['dy'];fields={}
+        if 'factor' in value:
+            factor=_scale(value['factor'])
+            corner=value.get('corner','se')
+            if corner not in ('nw','ne','sw','se'):raise ValueError('invalid scale corner')
+            # The opposite corner remains fixed even for custom placement ports.
+            px=box[0]+(box[2] if 'w' in corner else 0)
+            py=box[1]+(box[3] if 'n' in corner else 0)
+            dx+=(1-factor)*(px-anchor[0]);dy+=(1-factor)*(py-anchor[1])
+            fields['scale']=part.scale*factor
+        elif 'corner' in value:raise ValueError('scale corner requires a factor')
+        a,b,c,d=geometry[path]['inverse'];ux,uy=a*dx+c*dy,b*dx+d*dy
+        def offset(current,delta):
+            if type(current) in (int,float):return current+delta
+            # Fold repeated mouse offsets instead of growing expression depth.
+            if isinstance(current,LayoutValue) and current.operation=='+' and type(current.args[1]) in (int,float):
+                return LayoutValue('+',(current.args[0],current.args[1]+delta))
+            return LayoutValue('+',(current,delta))
+        for key,delta in (('x',ux),('y',uy)):
+            if abs(delta)>1e-10:fields[key]=_expression(offset(getattr(part,key),delta),encode=True)
+        return dict(path=path,placement=fields) if fields else None
+
     def snapshot(self):
         """Return current controls, revision and preview without rebuilding."""
         with self._lock:
@@ -64,13 +128,14 @@ class LayoutEditor:
             for path,(_,part,item) in _targets(self._recipe).items():
                 entry={}
                 if part is not None:
-                    entry['placement']=_placement({k:getattr(part,k) for k in ('x','y','anchor','width','height')},encode=True)
+                    entry['placement']=_placement({k:getattr(part,k) for k in ('x','y','anchor','width','height','scale')},encode=True)
                 if isinstance(item,Composition):
                     entry['page']={k:getattr(item,k) for k in ('width','height','unit','fit_top')}
                 targets[path]=entry
             return dict(revision=self._revision,targets=targets,overrides=self.overrides(),
                         undo=bool(self._undo),redo=bool(self._redo),report=copy.deepcopy(self._report),
-                        svg=self._figure.to_svg())
+                        svg=self._figure.to_svg(),geometry=self._geometry(),
+                        viewbox=[float(x) for x in ET.fromstring(self._figure.to_svg()).attrib['viewBox'].split()])
 
     def _aliases(self, path, group):
         targets=_targets(self._recipe)
@@ -83,13 +148,17 @@ class LayoutEditor:
     def command(self, action, value=None, *, revision=None, missing='error'):
         """Compile a command atomically; a stale revision or failed build changes nothing.
 
-        Actions: edit (path with placement/page fields), reset (one path), load
+        Actions: gesture (figure-space move/uniform scale), edit (placement/page), reset, load
         (override JSON), undo, redo and refresh (current source; clears history).
         Refresh may explicitly drop removed targets with missing='drop'.
         """
         with self._lock:
             if revision is not None and (type(revision) is not int or revision!=self._revision):
                 raise ValueError('stale editor revision; reload the current editor state')
+            if action=='gesture':
+                value=self._gesture(value)
+                if value is None:return self.snapshot()
+                action='edit'
             candidate=copy.deepcopy(self._value)
             if action=='edit':
                 if (not isinstance(value,dict) or 'path' not in value or
@@ -132,7 +201,8 @@ class LayoutEditor:
             return self.snapshot()
 
     def _html(self):
-        return Path(__file__).with_name('page.html').read_text().replace('__TOKEN__',self._token)
+        return (Path(__file__).with_name('page.html').read_text().replace('__TOKEN__',self._token)
+                .replace('<!--GESTURES-->',Path(__file__).with_name('gestures.js').read_text()))
 
     def start(self, *, port=0):
         """Start a loopback-only editor server; port=0 chooses a free local port."""