inklet 4.0.0.dev10__tar.gz → 4.0.0.dev12__tar.gz

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/.github/workflows/publish.yml

@@ -6,7 +6,7 @@ on:
       tag:
         description: Published GitHub release tag
         required: true
-        default: v4.0.0.dev10
+        default: v4.0.0.dev12
         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.dev10' >&2
+            echo 'Expected a stable or development tag such as v3.1.0 or v4.0.0.dev12' >&2
             exit 1
           }
           gh release view "$RELEASE_TAG" --json isDraft,isPrerelease > "$RUNNER_TEMP/release.json"

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/CHANGELOG.md

@@ -2,6 +2,38 @@
 
 ## Unreleased
 
+## 4.0.0.dev12 — 2026-09-13
+
+Twelfth development preview: a redesigned local figure workspace.
+3.1.0 remains the stable release.
+
+- Add searchable object navigation, a large canvas, focused inspector tabs,
+  fixed apply/discard controls, header exports and revision feedback.
+- Add fitted zoom, wheel zoom, pan tools and Space/middle-button dragging without
+  changing authored geometry. Preserve object gesture coordinates across zooms.
+- Add native colour pickers, exact-value fields, keyboard shortcuts and a help
+  dialog; retain native text undo and adapt the workspace to smaller screens.
+- Protect unapplied fields during selection and file/source actions; highlight
+  pending changes and offer explicit discard. Keep schema 0.4 and Python exports.
+- Review real pointer capture and mobile overflow, extend browser regressions,
+  and update the illustrated editor guide.
+
+## 4.0.0.dev11 — 2026-09-12
+
+Eleventh development preview: unified composition layout, labels and appearance.
+3.1.0 remains the stable release.
+
+- Add supported keyed line/marker styles, text/callout appearance and module box
+  styles to the local composition editor, using the same Python compiler.
+- Organize controls into Layout, Labels and Styles. Apply changes across sections
+  as one atomic edit with shared undo/redo, reset and saved-state reconstruction.
+- Save typed named appearance decisions in schema 0.4, accepting legacy 0.1–0.3
+  files. Explicit null style fields remove authored keywords for automatic styling.
+- Preserve data-driven marker sizes and colours; report incompatible style targets
+  after source revisions while retaining compatible label/layout edits on discard.
+- Cover combined browser edits, two-width SVG/PDF agreement, inherited styles,
+  text remeasurement, live data and alias reconciliation; update illustrated docs.
+
 ## 4.0.0.dev10 — 2026-09-12
 
 Tenth development preview: reproducible named label and callout editing.

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: inklet
-Version: 4.0.0.dev10
+Version: 4.0.0.dev12
 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.dev10** adds named label and callout editing to the local layout
-editor. Edit text and callout preferences, move and scale content, undo changes,
-and save choices that reproduce through the Python compiler.
+**4.0.0.dev12** redesigns the local editor as a figure workspace with object
+navigation, a larger canvas, focused inspector tabs, zoom/pan, colour pickers,
+keyboard shortcuts and protection for unapplied changes.
 ```sh
-python -m pip install "inklet==4.0.0.dev10"
+python -m pip install "inklet==4.0.0.dev12"
 ```
 
 [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.dev10)
+[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev12)
 
 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.dev10 → inklet-4.0.0.dev12}/README.md

@@ -31,16 +31,16 @@ their signatures and report schemas may change.
 
 ## 4.0 development preview
 
-**4.0.0.dev10** adds named label and callout editing to the local layout
-editor. Edit text and callout preferences, move and scale content, undo changes,
-and save choices that reproduce through the Python compiler.
+**4.0.0.dev12** redesigns the local editor as a figure workspace with object
+navigation, a larger canvas, focused inspector tabs, zoom/pan, colour pickers,
+keyboard shortcuts and protection for unapplied changes.
 ```sh
-python -m pip install "inklet==4.0.0.dev10"
+python -m pip install "inklet==4.0.0.dev12"
 ```
 
 [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.dev10)
+[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev12)
 
 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.dev10 → inklet-4.0.0.dev12}/docs/api.md

@@ -225,7 +225,7 @@ A figure assembled from named children and measured expressions.
 * `instantiate(**items)` -- Create an independent recipe, filling required slots and replacing defaults.
 * `configure(*, width=None, height=None, unit=None, fit_top=None)` -- Atomically update authored page dimensions or coordinate units.
 * `place(name, **placement)` -- Edit a child's placement without replacing its content or named links.
-* `layout_overrides(reference)` -- Capture changed layout and compatible named labels against a reference.
+* `layout_overrides(reference)` -- Capture changed layout, named labels and supported styles against a reference.
 * `with_layout_overrides(value, *, missing='error')` -- Return an independent edited recipe and a reconciliation report.
 * `port(name, target)` -- Expose a child's name:anchor as a reusable composition attachment point.
 * `constrain(value, *, minimum=0, message='composition needs more space')` -- Require an expression to meet a minimum; fail before drawing.

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/docs/development-preview.md

@@ -1,6 +1,6 @@
-# Inklet 4.0.0.dev10
+# Inklet 4.0.0.dev12
 
-The tenth 4.0 development release includes the linked plotting, mapping,
+The twelfth 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.dev10"
+python -m pip install "inklet==4.0.0.dev12"
 ```
 
 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.dev10"
+python -m pip install "inklet[render,pandas,polars]==4.0.0.dev12"
 # Add calibrated volumes and TIFF workflows when needed:
-python -m pip install "inklet[volume,render]==4.0.0.dev10"
+python -m pip install "inklet[volume,render]==4.0.0.dev12"
 ```
 
 The core preview needs no browser server, NumPy, pandas, Polars or Blender.
@@ -29,7 +29,45 @@ 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).
 
-## Named labels and callouts in dev10
+## Studio workspace in dev12
+
+The [composition editor](layout-editor.md) now has a searchable object navigator,
+a central figure canvas and a focused inspector. Layout, Labels and Styles use
+compact tabs, colour swatches and visible pending-change feedback. Apply/discard
+controls stay accessible; save/export and undo/redo move to the header.
+
+![Inklet studio workspace](assets/guides/editor-studio.png)
+
+Zoom, Fit and pan explore the canvas without changing the authored figure.
+Object gestures retain their figure coordinates at different zoom levels.
+Keyboard shortcuts cover apply, save and undo/redo; the help dialog lists the
+full set. Pending edits are protected during selection, source refresh and
+file actions. The layout adapts to tablet and phone screens.
+
+This is a UI change: existing schema 0.4 files and the Python compiler remain
+the source of saved choices and SVG/PDF exports.
+
+## Unified composition authoring retained from dev11
+
+The [composition editor](layout-editor.md#edit-appearance-alongside-layout) now
+combines Layout, Labels and Styles sections. Pending changes across sections
+compile together as one undo step, with one saved file and matching SVG/PDF
+exports. Supported appearance controls cover keyed lines and markers, text and
+callouts, and module boxes. Text sizes remeasure dependent layout and ports.
+
+![Named plot styles in the composition editor](assets/guides/layout-editor-styles.png)
+
+Only constant marker colours and diameters are editable; data-driven fields
+remain attached to their sources. A source revision that changes an edited
+constant into a data mapping reports an incompatible style target. Explicit
+discard retains compatible layout and labels on the same object.
+
+Schema 0.4 adds typed named style decisions and explicit removal of style
+keywords. Schemas 0.1, 0.2 and 0.3 still load. The separate linked-table editor
+keeps its own format; arbitrary paint editing and general cross-content object
+relationships remain open.
+
+## Named labels and callouts retained from dev10
 
 The [local layout editor](layout-editor.md#edit-labels-and-callouts) now edits
 string module captions, text components, keyed plot titles/text/callouts and
@@ -44,7 +82,7 @@ definitions share text decisions, while unedited source fields remain live.
 
 ![Named callout controls and the compiled figure](assets/guides/layout-editor-labels.png)
 
-New files use layout schema 0.3; schemas 0.1 and 0.2 still load. Undo/redo,
+Dev10 introduced layout schema 0.3 for labels; schemas 0.1 and 0.2 still load. Undo/redo,
 reopening and matching SVG/PDF export include text edits. Axis labels, individual
 callout dragging, camera editing and general object relationships remain open.
 
@@ -200,7 +238,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.dev10 https://github.com/Mapika/inklet.git
+git clone --branch v4.0.0.dev12 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.dev10 → inklet-4.0.0.dev12}/docs/layout-editor.md

@@ -1,11 +1,11 @@
 # Local layout editor
 
-Available since **4.0.0.dev8**, with mouse gestures in **4.0.0.dev9** and named label editing in **4.0.0.dev10**, 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.
+Available since **4.0.0.dev8**, with the redesigned studio workspace in
+**4.0.0.dev12**, under `inklet.experimental.layout_editor`. Arrange named
+content, edit labels and appearance, and review the actual Python-compiled
+figure. Downloaded SVG/PDF files use that same successful preview.
 
-![Mouse selection and proportional scaling handles on a native 3D object](assets/guides/layout-editor-gestures.png)
+![Inklet studio with object navigation, a large figure canvas and focused style controls](assets/guides/editor-studio.png)
 
 The [complete example](../examples/layout_editor.py) opens the reusable report
 from [composition recipes](composition-recipes.md). From the checkout, run:
@@ -19,6 +19,37 @@ press Ctrl+C to stop it. This is a local editor, not a standalone HTML editing
 file. Ordinary [figure viewers](compiled-viewer.md) remain available for
 sharing a finished document without a Python process.
 
+## A workspace for your figure
+
+The desktop workspace has a searchable object navigator, a central canvas and
+an inspector with **Layout**, **Labels** and **Styles** tabs. Select an object
+from the navigator or directly on the figure. Nested objects retain their
+hierarchy, and the inspector shows the exact source path. On smaller screens,
+a **Content** selector replaces the navigator; on phones the inspector sits
+below the canvas.
+
+Use **+**, **−** and **Fit** to explore the figure. The zoom percentage is
+relative to the fitted view, not a physical-size preview. Ctrl/Cmd + wheel also
+zooms. Use the pan tool, middle-button dragging, or hold Space and drag to move
+the viewport. View changes never resize the authored figure or enter its undo
+history. Object movements and corner scaling still use figure coordinates at
+any zoom level.
+
+Changed fields are highlighted and counted. Switch inspector tabs to combine
+edits, then **Apply changes** as one undo step. **Discard** clears unapplied
+fields. Selecting another object, refreshing, undoing, opening a file, saving
+or exporting asks you to apply or discard pending changes first; browser
+navigation also warns about pending edits. Applied changes still need **Save
+choices** to download a portable file.
+
+Colour swatches open the native picker, while the adjacent field accepts exact
+colour values. Automatic/transparent values use a muted swatch. Undo/redo and
+file actions stay in the header; **Export** offers SVG and PDF. The footer shows
+compile feedback and the current revision. The **Shortcuts** dialog documents
+all controls, including Ctrl/Cmd + Enter to apply, Ctrl/Cmd + Z to undo,
+Ctrl/Cmd + Shift + Z to redo and Ctrl/Cmd + S to save applied choices. Text inputs
+retain native text undo.
+
 ## Start with your composition
 
 ```python
@@ -79,7 +110,7 @@ top-fitting behavior; dependent content can reflow when the compiler rebuilds.
 
 ![Editing a named plot callout with text, side, clearance and leader controls](assets/guides/layout-editor-labels.png)
 
-Select a composition child, then edit its **Label** fields and choose **Apply
+Select a composition child, choose the **Labels** tab, then change its fields and choose **Apply
 changes**. The editor supports text components created with `component(i.text,
 ...)`, string module captions, and plot `title`, `text` and `annotate`
 instructions with an explicit string `key`. For composition callouts, supply a
@@ -115,9 +146,60 @@ coordinates, styling and other source choices remain live. Shared definitions
 share label edits; use an independent recipe copy for independent captions.
 Undo/redo, reset, saved JSON and SVG/PDF exports include the label edits.
 
+## Edit appearance alongside layout
+
+![Named line and marker styles edited in the composition inspector](assets/guides/layout-editor-styles.png)
+
+Choose the **Styles** tab. Layout, Labels and Styles retain their pending
+changes when switching sections; **Apply changes** compiles them together as
+one undo step. Apply or discard pending fields before selecting another content target.
+
+| Named content | Available appearance controls |
+| --- | --- |
+| Keyed plot `line` instructions | Stroke colour, physical line width, opacity |
+| Keyed plot `scatter` instructions | Constant colour and diameter, opacity |
+| Text components and string module captions | Fill colour and physical text size |
+| Module boxes | Fill, stroke colour and physical line width |
+| Keyed plot `text`/`annotate` and named composition callouts | Fill colour and physical text size |
+
+Colours accept the colour parser's hex, RGB and named CSS forms; `none` also
+works for fill and stroke. Opacity ranges from 0 to 1. Widths use millimetres;
+marker size is **diameter**, and text size must be positive. Blank style fields
+remove an explicit keyword and use the renderer's automatic/preset behaviour.
+That removal is saved as JSON `null`. **Reset target** instead restores the
+current source's layout, labels and styles together. Parent artwork scaling
+still scales the resulting text and strokes.
+
+```python
+editor.command('edit', {
+    'path': '/caption',
+    'placement': {'x': 18},
+    'labels': {'label': {'kind': 'module-label', 'text': 'Reviewed response'}},
+    'styles': {
+        'text': {'kind': 'module-text', 'size': 4, 'fill': '#203e53'},
+        'box': {'kind': 'module-box', 'fill': '#e9f0f4', 'stroke_width': 0.4},
+    },
+})
+```
+
+Larger text is remeasured, so connected modules and dependent layout update.
+Style edits retain live data, named instruction keys and unedited source choices.
+Data-driven marker colour/diameter controls are omitted, including ramped
+colours. If a source revision turns an edited constant into a data mapping,
+the saved style is reported as incompatible, such as `/chart#style:samples`.
+Explicit discard removes that style target's edits while preserving compatible
+labels and placements on the chart.
+
+Styles use the same named path, key and kind contracts as labels. New saved
+files use schema 0.4; 0.1, 0.2 and 0.3 files still load. This unifies authoring
+within the composition editor. The separate [linked-table style inspector](visual-editing.md)
+retains its own source-bound format; its files are not interchangeable. Plot
+titles, axes, bars, arbitrary factories, gradients and camera/material settings
+are outside this style-control subset.
+
 ## Edit and review
 
-Choose a named path in **Content**, enter the fields you want to change, then
+Choose a named path in **Content** and an inspector tab, enter the fields you want to change, then
 select **Apply changes**. Other fields retain their definitions.
 
 - Child placement fields are X, Y, anchor, width, height and uniform scale. Numbers use the
@@ -138,19 +220,19 @@ preview, saved choices and undo history remain available. The inspector does
 not automatically resolve overlap or add constraints: author the required
 measured relationships and minimum sizes in the Python recipe.
 
-**Undo** and **Redo** retain up to 100 successful layout edits. A new edit after
+**Undo** and **Redo** retain up to 100 successful authoring edits. A new edit after
 undo starts a new history branch. Shared nested definitions remain shared:
 editing or resetting one occurrence affects the same definition wherever it
 appears. Distinct placements of that shared content remain independently editable.
 
 ## Save, reopen and export
 
-**Save layout** downloads the versioned JSON described in
-[saved layout choices](layout-overrides.md). **Open layout choices** loads that
-same format. The file contains changed placements and dimensions, not the
-source content, styles, assets or undo history. Keep it alongside the recipe.
+**Save choices** downloads the versioned JSON described in
+[saved layout choices](layout-overrides.md). **Open** loads that
+same format. The file contains changed layout, label and supported style fields.
+Other source content, assets and undo history stay outside the file. Keep it alongside the recipe.
 
-**Download SVG** and **Download PDF** export the successful preview revision.
+**Export → SVG** and **Export → PDF** export the successful preview revision.
 If another editor tab changes the session first, stale commands and export
 links are rejected. Use **Reload editor** to obtain the current shared state.
 

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/docs/layout-overrides.md

@@ -1,6 +1,6 @@
 # Save and restore layout choices
 
-Available since **4.0.0.dev7**; uniform artwork scale is added in **dev9**, named text and callout decisions in **dev10**. Save placement and dimension edits separately from
+Available since **4.0.0.dev7**; uniform artwork scale is added in **dev9**, named text and callout decisions in **dev10**, and supported appearance fields in **dev11**. 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.
@@ -21,7 +21,7 @@ Python APIs below or the [local inspector](layout-editor.md) in dev8. This forma
 
 Keep a reference recipe, copy it, then edit placements. The reference and edited
 recipe must have the same named composition structure when capturing changes.
-Supported named label differences are captured too. Other content and styles are not serialized into the layout file.
+Supported named label differences are captured too. Supported named style differences are captured too; other content is not serialized into the layout file.
 
 ```python
 import json
@@ -63,14 +63,28 @@ matching label keys and kinds; they do not serialize added or removed content.
 A saved label entry includes its kind and only the fields that changed:
 
 ```json
-{"schema":"inklet.composition-layout/0.3","targets":{"/caption":{"labels":{"label":{"kind":"module-label","text":"Reviewed response"}}}}}
+{"schema":"inklet.composition-layout/0.4","targets":{"/caption":{"labels":{"label":{"kind":"module-label","text":"Reviewed response"}}}}}
 ```
 
-Readers accept legacy schemas 0.1 and 0.2. New captures use 0.3; older readers
+Readers accept legacy schemas 0.1, 0.2 and 0.3. New captures use 0.4; older readers
 must be upgraded before opening them. Label fields are rejected under older
 schema identifiers. Removed/incompatible labels appear as `path#key` in the
 orphan report. Explicit `missing='drop'` retains compatible edits on that path.
 
+## Named appearance decisions
+
+Schema 0.4 adds a `styles` group beside `placement`, `page` and `labels`.
+Each named style contains its `kind` and changed fields. The [appearance guide](layout-editor.md#edit-appearance-alongside-layout)
+lists supported controls, units, data-mapping exclusions and a combined edit.
+A `null` style value removes an explicit keyword; unedited source fields stay
+live. Capturing changes compares compatible named style keys and kinds, not
+arbitrary renderer nodes or paint objects.
+
+Source revisions that remove a style key, change its kind or replace a constant
+with a data mapping produce a `path#style:key` orphan. With explicit discard,
+compatible layout and label edits on the same path survive. The separate
+linked-table visual-override format is not converted by this loader.
+
 ## Restore on the current recipe
 
 ```python
@@ -104,7 +118,7 @@ updated_figure = render(updated)
 updated_figure.save('updated.svg')
 ```
 
-The file stores layout and supported label decisions, not datasets, plot styles,
+The file stores layout, supported labels and styles, not datasets,
 links, ports, constraints, factories or camera parameters. Keep the Python
 recipe and its assets alongside it. The containing document can supply its own
 render dimensions; restoring authored page dimensions does not override that
@@ -142,13 +156,13 @@ 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.
 
-New files use `inklet.composition-layout/0.3`, adding named label decisions to
-0.2's positive uniform artwork scale. The loader also accepts 0.1 files from
-dev7/dev8 (without scale) and 0.2 files from dev9 (without labels). Unknown
-schemas are rejected. Upgrade older readers before opening a 0.3 file.
-The JSON object contains `schema` and `targets`; each target has changed
-`placement`, `page` and/or `labels` fields. This development-preview format is
-not a general Python object serializer or an asset manifest.
+New files use `inklet.composition-layout/0.4`, adding named appearance decisions.
+The loader also accepts 0.1 files from dev7/dev8 (without scale), 0.2 files from
+dev9 (without labels) and 0.3 files from dev10 (without styles). Unknown schemas
+are rejected. Upgrade older readers before opening a 0.4 file. The JSON object
+contains `schema` and `targets`; each target has changed `placement`, `page`,
+`labels` and/or `styles` fields. This development-preview format is not a general
+Python object serializer or an asset manifest.
 
 ## Review revised content
 

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/docs/roadmap.md

@@ -62,7 +62,12 @@ Dev9 adds mouse movement, proportional artwork scaling and keyboard nudges
 for named composition children, with preserved measured positions and saved
 choices. Dev10 adds saved named text and callout editing across modules, text
 components, keyed plot instructions and composition annotations, including typed
-identity reconciliation. Serialized project templates, asset manifests, shared selection
+identity reconciliation. Dev11 connects supported plot, text and module styles
+to that same layout/label history, saved state and reconciliation workflow,
+with data-driven marker fields protected from constant overrides. Dev12 adds
+the studio workspace: object navigation, focused controls, zoom/pan, shortcuts
+and protection for pending edits.
+Serialized project templates, asset manifests, shared selection
 relationships, axis-label/camera editing and finer-grained manipulation remain open. Subsequent work
 should extend authoring and cross-content identity beyond this bounded inspector.
 

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/pyproject.toml

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

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/src/inklet/__init__.py

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

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/src/inklet/document/composition.py

@@ -193,10 +193,10 @@ class Composition(BuildSpec):
         raise KeyError(name)
 
     def layout_overrides(self, reference):
-        """Capture changed layout and compatible named labels against a reference.
+        """Capture changed layout, named labels and supported styles against a reference.
 
         Return JSON-compatible, versioned decisions keyed by named child paths.
-        Other content, styles, data, links and constraints remain in Python.
+        Other content, data, links and constraints remain in Python.
         """
         from .layout_overrides import capture
         return capture(self, reference)

{inklet-4.0.0.dev10 → inklet-4.0.0.dev12}/src/inklet/document/layout_overrides.py

@@ -1,4 +1,4 @@
-"""Portable layout and text decisions for named composition recipes."""
+"""Portable layout, text and appearance decisions for named composition recipes."""
 from __future__ import annotations
 
 import math
@@ -6,9 +6,11 @@ import re
 
 from .compiler import LayoutError
 from .spec import length
-from . import label_overrides as labels
+from . import label_overrides as labels, style_overrides as styles
+_EDITORS = {"labels":labels, "styles":styles}
 
-SCHEMA = 'inklet.composition-layout/0.3'
+SCHEMA = 'inklet.composition-layout/0.4'
+LABEL_SCHEMA = 'inklet.composition-layout/0.3'
 SCALE_SCHEMA = 'inklet.composition-layout/0.2'
 LEGACY_SCHEMA = 'inklet.composition-layout/0.1'
 _PLACEMENT = {'x', 'y', 'anchor', 'width', 'height', 'scale'}
@@ -93,7 +95,7 @@ def _page(values):
 
 
 def capture(recipe, reference):
-    """Record changed layout and compatible named labels; keep unedited fields live."""
+    """Record changed layout and compatible named labels/styles; keep unedited fields live."""
     from .composition import Composition
     if not isinstance(reference,Composition): raise TypeError('reference must be a Composition')
     current, before = _targets(recipe), _targets(reference)
@@ -115,13 +117,14 @@ def capture(recipe, reference):
             old = _page({k:getattr(old_item,k) for k in sorted(_PAGE)})
             changed = {k:v for k,v in now.items() if v!=old[k]}
             if changed: entry['page'] = changed
-        current_labels, old_labels = labels.targets(item), labels.targets(old_item)
-        changed_labels = {}
-        for key,(fields,_) in current_labels.items():
-            if key not in old_labels or fields['kind']!=old_labels[key][0]['kind']: continue
-            changed = {k:v for k,v in fields.items() if k!='kind' and v!=old_labels[key][0].get(k, object())}
-            if changed: changed_labels[key] = {'kind':fields['kind'], **changed}
-        if changed_labels: entry['labels'] = changed_labels
+        for group,adapter in _EDITORS.items():
+            current_fields, old_fields = adapter.targets(item), adapter.targets(old_item)
+            changes = {}
+            for key,(fields,_) in current_fields.items():
+                if key not in old_fields or fields['kind']!=old_fields[key][0]['kind']: continue
+                changed = {k:v for k,v in fields.items() if k!='kind' and v!=old_fields[key][0].get(k, object())}
+                if changed: changes[key] = {'kind':fields['kind'], **changed}
+            if changes: entry[group] = adapter.validate(changes)
         if entry: edits[path] = entry
     return {'schema':SCHEMA,'targets':edits}
 
@@ -138,7 +141,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'] not in (SCHEMA,SCALE_SCHEMA,LEGACY_SCHEMA)
+    if (not isinstance(value,dict) or set(value)!={'schema','targets'} or value['schema'] not in (SCHEMA,LABEL_SCHEMA,SCALE_SCHEMA,LEGACY_SCHEMA)
             or not isinstance(value['targets'],dict)):
         raise ValueError('invalid composition layout overrides')
     targets = _targets(recipe)
@@ -146,7 +149,7 @@ def apply(recipe, value, *, missing='error'):
     for path,entry in value['targets'].items():
         if not isinstance(path,str) or not re.fullmatch(r'/(?:'+_NAME+r'(?:/'+_NAME+r')*)?',path):
             raise ValueError('layout targets require absolute named composition paths')
-        if not isinstance(entry,dict) or not entry or not set(entry)<={'placement','page','labels'}:
+        if not isinstance(entry,dict) or not entry or not set(entry)<={'placement','page','labels','styles'}:
             raise ValueError(f'invalid layout target properties: {path}')
         options = {}
         if 'placement' in entry:
@@ -155,8 +158,11 @@ def apply(recipe, value, *, missing='error'):
                 raise ValueError('scale requires composition layout schema 0.2')
         if 'page' in entry: options['page'] = _page(entry['page'])
         if 'labels' in entry:
-            if value['schema']!=SCHEMA: raise ValueError('labels require composition layout schema 0.3')
+            if value['schema'] not in (SCHEMA,LABEL_SCHEMA): raise ValueError('labels require composition layout schema 0.3')
             options['labels'] = labels.validate(entry['labels'])
+        if 'styles' in entry:
+            if value['schema']!=SCHEMA: raise ValueError('styles require composition layout schema 0.4')
+            options['styles'] = styles.validate(entry['styles'])
         target = targets.get(path)
         invalid = target is None
         if target is not None:
@@ -167,15 +173,17 @@ def apply(recipe, value, *, missing='error'):
                 invalid |= any(ref not in names for val in options['placement'].values() for ref in _references(val))
         if invalid: orphaned.append(path)
         else:
-            if 'labels' in options:
-                available = labels.targets(item)
+            for group,adapter in _EDITORS.items():
+                if group not in options: continue
+                available = adapter.targets(item)
                 compatible = {}
-                for key,fields in options['labels'].items():
-                    if key not in available or fields['kind']!=available[key][0]['kind']:
-                        orphaned.append(path+'#'+key)
+                for key,fields in options[group].items():
+                    if (key not in available or fields['kind']!=available[key][0]['kind']
+                            or (group=='styles' and not (set(fields)-{'kind'})<=set(available[key][0]))):
+                        orphaned.append(path+('#style:' if group=='styles' else '#')+key)
                     else: compatible[key] = fields
-                if compatible: options['labels'] = compatible
-                else: options.pop('labels')
+                if compatible: options[group] = compatible
+                else: options.pop(group)
             if options: prepared[path] = options
     orphaned.sort()
     if orphaned and missing=='error': raise LayoutError('orphaned layout targets: '+', '.join(orphaned))
@@ -185,8 +193,8 @@ def apply(recipe, value, *, missing='error'):
     for path,options in prepared.items():
         parent,part,item = targets[path]
         for group,fields in options.items():
-            owner = (id(item),None) if group in ('page','labels') else (id(parent),part.name)
-            if group=='labels':
+            owner = (id(item),None) if group in ('page','labels','styles') else (id(parent),part.name)
+            if group in _EDITORS:
                 fields = {(label,key):val for label,edits in fields.items() for key,val in edits.items()}
             for key,val in fields.items():
                 identity = (*owner,group,key)
@@ -197,7 +205,8 @@ def apply(recipe, value, *, missing='error'):
     copied = _targets(result)
     for path,options in prepared.items():
         parent,part,item = copied[path]
-        if 'labels' in options: labels.apply(item,options['labels'])
+        for group,adapter in _EDITORS.items():
+            if group in options: adapter.apply(item,options[group])
         if 'page' in options: item.configure(**options['page'])
         if 'placement' in options: parent.place(part.name,**options['placement'])
     return result, {'orphaned_targets':orphaned,'missing_policy':missing}