inklet 4.0.0.dev12__tar.gz → 4.0.0.dev13__tar.gz

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

@@ -6,7 +6,7 @@ on:
       tag:
         description: Published GitHub release tag
         required: true
-        default: v4.0.0.dev12
+        default: v4.0.0.dev13
         type: string
       dry_run:
         description: Validate release files without uploading to PyPI
@@ -42,8 +42,8 @@ jobs:
           GH_REPO: ${{ github.repository }}
           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.dev12' >&2
+          [[ "$RELEASE_TAG" =~ ^v[0-9]+\.[0-9]+\.[0-9]+(\.dev[0-9]+|rc[0-9]+)?$ ]] || {
+            echo 'Expected a stable, development or RC tag such as v4.0.0, v4.0.0.dev13 or v4.0.0rc1' >&2
             exit 1
           }
           gh release view "$RELEASE_TAG" --json isDraft,isPrerelease > "$RUNNER_TEMP/release.json"
@@ -53,8 +53,8 @@ jobs:
           release = json.loads((Path(os.environ['RUNNER_TEMP']) / 'release.json').read_text())
           if release['isDraft']:
               raise SystemExit('Publish the GitHub release before uploading its assets')
-          if release['isPrerelease'] != ('.dev' in os.environ['RELEASE_TAG']):
-              raise SystemExit('Development tags must be GitHub prereleases; stable tags must not')
+          if release['isPrerelease'] != any(marker in os.environ['RELEASE_TAG'] for marker in ('.dev', 'rc')):
+              raise SystemExit('Development and RC tags must be GitHub prereleases; stable tags must not')
           PYCODE
           version="${RELEASE_TAG#v}"
           gh release download "$RELEASE_TAG" --dir dist \

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

@@ -2,6 +2,21 @@
 
 ## Unreleased
 
+## 4.0.0.dev13 — 2026-09-13
+
+Thirteenth development preview: native camera choices in the composition editor.
+The original 4.0 scope remains open; this is not a release candidate.
+
+- Add a Camera inspector for builtin native model/solid components, with orbit
+  angles, roll and projection mode. Preserve explicit look-at eye/target vectors.
+- Include camera edits in atomic layout transactions, undo/redo, shared instance
+  reconciliation, saved choices and matching SVG/PDF reconstruction.
+- Introduce composition schema 0.5, retaining readers for 0.1–0.4. Report changed
+  camera kinds and unsupported replacement renderers as orphaned camera choices.
+- Illustrate the camera workflow and document physical fitting limitations.
+- Accept RC tags in the publishing gate, with tested prerelease/draft checks;
+  update the compatibility matrix without claiming broader browser coverage.
+
 ## 4.0.0.dev12 — 2026-09-13
 
 Twelfth development preview: a redesigned local figure workspace.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: inklet
-Version: 4.0.0.dev12
+Version: 4.0.0.dev13
 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,15 @@ their signatures and report schemas may change.
 
 ## 4.0 development preview
 
-**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.
+**4.0.0.dev13** adds native 3D camera editing to the studio workspace, with
+shared undo/redo, saved choices and source revision reconciliation.
 ```sh
-python -m pip install "inklet==4.0.0.dev12"
+python -m pip install "inklet==4.0.0.dev13"
 ```
 
 [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.dev12)
+[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev13)
 
 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.dev12 → inklet-4.0.0.dev13}/README.md

@@ -31,16 +31,15 @@ their signatures and report schemas may change.
 
 ## 4.0 development preview
 
-**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.
+**4.0.0.dev13** adds native 3D camera editing to the studio workspace, with
+shared undo/redo, saved choices and source revision reconciliation.
 ```sh
-python -m pip install "inklet==4.0.0.dev12"
+python -m pip install "inklet==4.0.0.dev13"
 ```
 
 [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.dev12)
+[Release notes](https://github.com/Mapika/inklet/releases/tag/v4.0.0.dev13)
 
 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.dev12 → inklet-4.0.0.dev13}/docs/compatibility.md

@@ -1,6 +1,7 @@
 # Compatibility
 
-Inklet **3.1** supports the environments and rendering paths below.
+Stable Inklet **3.1** and the **4.0 development line** use the environments
+and rendering paths below. Preview-only capabilities are identified separately.
 The matrix distinguishes installed-package checks from full integration tests.
 
 ## Test coverage
@@ -48,12 +49,25 @@ 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.dev9 preview](development-preview.md), not in stable 3.1.0. Their `pandas` and `polars` extras are separate
+[4.0 development 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.
 The core wheel checks that neither integration is required or imported.
 
+### Browser workflows and local editor
+
+The 4.0 preview includes standalone linked HTML and a Python-backed composition
+editor. Automated browser integration uses Chromium on Linux. Firefox, Safari,
+mobile browsers and browser interaction on Windows/macOS are not covered by
+that integration matrix. Windows/macOS wheel checks verify installed editor
+assets and representative static exports; they are not browser certification.
+
+The composition editor requires a running local Python session and binds to
+loopback. Its saved choices are JSON overrides for an existing Python recipe,
+not a standalone project. Linked HTML has a separate saved-selection format.
+See [the editor](layout-editor.md) and [saved layouts](layout-overrides.md).
+
 ### Rendering
 
 The legacy vector line-art backend uses Blender's pre-4.3 Grease Pencil API.

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

@@ -1,6 +1,6 @@
-# Inklet 4.0.0.dev12
+# Inklet 4.0.0.dev13
 
-The twelfth 4.0 development release includes the linked plotting, mapping,
+The thirteenth 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.dev12"
+python -m pip install "inklet==4.0.0.dev13"
 ```
 
 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.dev12"
+python -m pip install "inklet[render,pandas,polars]==4.0.0.dev13"
 # Add calibrated volumes and TIFF workflows when needed:
-python -m pip install "inklet[volume,render]==4.0.0.dev12"
+python -m pip install "inklet[volume,render]==4.0.0.dev13"
 ```
 
 The core preview needs no browser server, NumPy, pandas, Polars or Blender.
@@ -29,7 +29,22 @@ 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).
 
-## Studio workspace in dev12
+## Native camera editing in dev13
+
+The [Camera tab](layout-editor.md#edit-a-native-3d-camera) edits native model and
+solid components: orbit angles, roll and projection mode, with undo/redo and
+matching saved SVG/PDF output. Explicit look-at views retain eye and target.
+Schema 0.5 adds camera choices; 0.1–0.4 still load. Source geometry can change
+without losing compatible camera edits. Incompatible camera kinds are reported.
+
+![Native camera editing](assets/guides/layout-editor-camera.png)
+
+This is another development increment, not RC1. The original 4.0 scope remains
+in force: asset manifests, shared object relationships and the other roadmap
+gates still need implementation and acceptance evidence. Publishing now supports
+RC tags when those gates are ready.
+
+## Studio workspace retained from 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
@@ -238,7 +253,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.dev12 https://github.com/Mapika/inklet.git
+git clone --branch v4.0.0.dev13 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.dev12 → inklet-4.0.0.dev13}/docs/layout-editor.md

@@ -22,7 +22,7 @@ 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
+an inspector with **Layout**, **Labels**, **Styles** and **Camera** 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
@@ -191,7 +191,7 @@ 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
+files use schema 0.5; 0.1 through 0.4 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
@@ -286,7 +286,51 @@ starts and closes the server automatically; keep that context alive during
 browser use.
 
 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.
+individual plot marks, camera dragging, 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).
+
+
+## Edit a native 3D camera
+
+Select a named `i.component(i.model, ...)` or `i.component(i.solid, ...)` and open
+**Camera**. Native orbit cameras expose azimuth, elevation and roll in degrees,
+and perspective. Apply recompiles the figure through Python;
+undo, saved choices and SVG/PDF exports include the same camera decision.
+Canvas zoom and pan remain view-only controls.
+
+![Native camera controls and the recompiled composition](assets/guides/layout-editor-camera.png)
+
+```python
+import inklet as i
+from inklet.experimental.layout_editor import LayoutEditor
+
+study = i.composition(100, 70)
+study.add('model', i.component(i.solid, 'cube', width=35, style='shaded'),
+          x=15, y=15)
+editor = LayoutEditor(study)
+editor.command('edit', {'path': '/model', 'cameras': {'view': {
+    'kind': 'native-orbit', 'azimuth': 15, 'elevation': 20,
+    'perspective': True,
+}}})
+choices = editor.overrides()
+reopened = LayoutEditor(study)
+reopened.command('load', choices)
+assert reopened.figure.to_svg() == editor.figure.to_svg()
+editor.figure.save('camera-study.svg', 'camera-study.pdf')
+```
+
+Only edited fields are saved. Replacing the source mesh keeps the camera edits;
+unedited source camera fields remain live. Explicit `Camera.look_at` views
+retain eye, target and up vectors and expose roll and perspective.
+Changing between orbit and look-at cameras reports incompatible saved camera
+choices. Review before explicitly discarding them on refresh.
+
+This inspector supports the builtin native model renderer. It does not edit
+Blender scene cameras, standalone linked-HTML cameras, arbitrary prebuilt
+Diagrams, or eye/target vectors. Camera dragging and depth-aware selection remain
+open work. Elevation is limited to −90 through 90 degrees.
+The native renderer fits models to their physical width/height, which cancels
+the focal scale of a field-of-view change at a fixed eye position. The inspector
+therefore preserves the source field of view without exposing an ineffective control.

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

@@ -66,7 +66,7 @@ A saved label entry includes its kind and only the fields that changed:
 {"schema":"inklet.composition-layout/0.4","targets":{"/caption":{"labels":{"label":{"kind":"module-label","text":"Reviewed response"}}}}}
 ```
 
-Readers accept legacy schemas 0.1, 0.2 and 0.3. New captures use 0.4; older readers
+Readers accept legacy schemas 0.1, 0.2, 0.3 and 0.4. New captures use 0.5; 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.
@@ -156,12 +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.4`, adding named appearance decisions.
+New files use `inklet.composition-layout/0.5`, adding named camera 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
+dev9 (without labels), 0.3 files from dev10 (without styles) and 0.4 files from
+dev11/dev12 (without cameras). Unknown schemas
+are rejected. Upgrade older readers before opening a 0.5 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
+`labels`, `styles` and/or `cameras` fields. This development-preview format is not a general
 Python object serializer or an asset manifest.
 
 ## Review revised content
@@ -176,3 +177,14 @@ in `out/composition-recipes/`. PNG generation requires the render extras.
 
 In dev8, the [local layout editor](layout-editor.md) provides browser controls,
 undo/redo and Python-compiled previews using this saved format.
+
+
+## Saved camera choices
+
+Schema 0.5 adds `cameras` alongside layout, labels and styles. The `view` key has
+kind `native-orbit` or `native-look-at`, and only changed fields are recorded.
+[Camera editing](layout-editor.md#edit-a-native-3d-camera) documents the supported
+native components and controls. Orbit/look-at changes and unsupported replacement
+renderers report an orphan such as `/model#camera:view`. Explicitly dropping that
+orphan preserves compatible placement, label and style choices on the object.
+Schemas 0.1–0.4 remain readable but cannot contain camera edits.

{inklet-4.0.0.dev12 → inklet-4.0.0.dev13}/docs/release-checks.md

@@ -98,7 +98,8 @@ the wheel and source archive from an existing, published GitHub release.
 It verifies the release's `SHA256SUMS` and runs Twine's strict metadata checks.
 It does not rebuild the packages, so GitHub and PyPI receive identical files.
 The workflow accepts stable tags such as `v3.1.0` and developmental tags such as
-`v4.0.0.dev1`, and runs from `master`. Development tags must be marked as GitHub
+`v4.0.0.dev1`, and release candidates such as `v4.0.0rc1`, and runs from
+`master`. Development and RC tags must be marked as GitHub
 prereleases; stable tags must not. Both archives' package name/version metadata
 must match the tag.
 
@@ -139,9 +140,9 @@ publishing workflow. PyPI does not permit replacing an uploaded distribution;
 package changes require a new version.
 
 
-For a development snapshot, mark the GitHub release as a prerelease and keep it
+For a development snapshot or release candidate, mark the GitHub release as a prerelease and keep it
 out of GitHub's latest stable release slot (`gh release create --prerelease
---latest=false`). Use an exact PEP 440 version, for example `4.0.0.dev1`, in both
+--latest=false`). Use an exact PEP 440 version, for example `4.0.0.dev1` or `4.0.0rc1`, in both
 `pyproject.toml` and `inklet.__version__`. The same checksum, metadata and
 isolated-package checks apply; run the workflow first with `dry_run=true`, then
 publish the same attached files with `dry_run=false`. Users opt in with an exact

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

@@ -67,6 +67,8 @@ 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.
+The next increment adds native orbit/look-at camera choices to the same editor,
+saved schema and source reconciliation; general camera manipulation remains open.
 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.dev12 → inklet-4.0.0.dev13}/pyproject.toml

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

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

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

inklet-4.0.0.dev13/src/inklet/document/camera_overrides.py

@@ -0,0 +1,53 @@
+"""Saved native 3D camera choices without replacing source geometry."""
+from dataclasses import replace
+import math
+
+from .spec import ComponentSpec
+from ..three.camera import as_camera
+
+_FIELDS = {'azimuth', 'elevation', 'roll', 'perspective'}
+
+
+def targets(item):
+    from .. import model, solid
+    if not isinstance(item, ComponentSpec) or item.factory not in (model, solid):
+        return {}
+    if item.kwargs.get('backend', 'builtin') != 'builtin':
+        return {}
+    camera = as_camera(item.kwargs.get('view'))
+    # Explicit look-at cameras retain their eye, target and up vector. Angle
+    # fields would be ignored by that camera and must not appear editable.
+    fields = _FIELDS if camera.eye is None else _FIELDS - {'azimuth', 'elevation'}
+    kind = 'native-orbit' if camera.eye is None else 'native-look-at'
+    return {'view': ({'kind': kind, **{key: getattr(camera, key) for key in sorted(fields)}}, camera)}
+
+
+def validate(value):
+    if not isinstance(value, dict) or not value:
+        raise ValueError('cameras must be a nonempty object')
+    result = {}
+    for key, fields in value.items():
+        if key != 'view' or not isinstance(fields, dict):
+            raise ValueError('camera choices require a view field object')
+        kind = fields.get('kind')
+        allowed = _FIELDS if kind == 'native-orbit' else _FIELDS - {'azimuth', 'elevation'}
+        if kind not in ('native-orbit', 'native-look-at') or len(fields) < 2 or not set(fields) <= {'kind', *allowed}:
+            raise ValueError('invalid camera kind or fields')
+        for name, val in fields.items():
+            if name == 'kind':
+                continue
+            if name == 'perspective':
+                if type(val) is not bool:
+                    raise ValueError('camera perspective must be a boolean')
+            elif type(val) not in (int, float) or not math.isfinite(val):
+                raise ValueError('camera angles must be finite numbers')
+            elif name == 'elevation' and not -90 <= val <= 90:
+                raise ValueError('camera elevation must be between -90 and 90 degrees')
+        result[key] = dict(fields)
+    return result
+
+
+def apply(item, edits):
+    camera = as_camera(item.kwargs.get('view'))
+    changes = {key: val for key, val in edits['view'].items() if key != 'kind'}
+    item.kwargs = {**item.kwargs, 'view': replace(camera, **changes)}

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

@@ -1,4 +1,4 @@
-"""Portable layout, text and appearance decisions for named composition recipes."""
+"""Portable layout, text, appearance and camera decisions for named composition recipes."""
 from __future__ import annotations
 
 import math
@@ -6,10 +6,11 @@ import re
 
 from .compiler import LayoutError
 from .spec import length
-from . import label_overrides as labels, style_overrides as styles
-_EDITORS = {"labels":labels, "styles":styles}
+from . import label_overrides as labels, style_overrides as styles, camera_overrides as cameras
+_EDITORS = {"labels":labels, "styles":styles, "cameras":cameras}
 
-SCHEMA = 'inklet.composition-layout/0.4'
+SCHEMA = 'inklet.composition-layout/0.5'
+STYLE_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'
@@ -95,7 +96,7 @@ def _page(values):
 
 
 def capture(recipe, reference):
-    """Record changed layout and compatible named labels/styles; keep unedited fields live."""
+    """Record changed layout and compatible named labels/styles/cameras; 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)
@@ -141,7 +142,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,LABEL_SCHEMA,SCALE_SCHEMA,LEGACY_SCHEMA)
+    if (not isinstance(value,dict) or set(value)!={'schema','targets'} or value['schema'] not in (SCHEMA,STYLE_SCHEMA,LABEL_SCHEMA,SCALE_SCHEMA,LEGACY_SCHEMA)
             or not isinstance(value['targets'],dict)):
         raise ValueError('invalid composition layout overrides')
     targets = _targets(recipe)
@@ -149,7 +150,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','styles'}:
+        if not isinstance(entry,dict) or not entry or not set(entry)<={'placement','page','labels','styles','cameras'}:
             raise ValueError(f'invalid layout target properties: {path}')
         options = {}
         if 'placement' in entry:
@@ -158,11 +159,14 @@ 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'] not in (SCHEMA,LABEL_SCHEMA): raise ValueError('labels require composition layout schema 0.3')
+            if value['schema'] not in (SCHEMA,STYLE_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')
+            if value['schema'] not in (SCHEMA,STYLE_SCHEMA): raise ValueError('styles require composition layout schema 0.4')
             options['styles'] = styles.validate(entry['styles'])
+        if 'cameras' in entry:
+            if value['schema']!=SCHEMA: raise ValueError('cameras require composition layout schema 0.5')
+            options['cameras'] = cameras.validate(entry['cameras'])
         target = targets.get(path)
         invalid = target is None
         if target is not None:
@@ -179,8 +183,8 @@ def apply(recipe, value, *, missing='error'):
                 compatible = {}
                 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)
+                            or (group in ('styles','cameras') and not (set(fields)-{'kind'})<=set(available[key][0]))):
+                        orphaned.append(path+({'styles':'#style:', 'cameras':'#camera:'}.get(group, '#'))+key)
                     else: compatible[key] = fields
                 if compatible: options[group] = compatible
                 else: options.pop(group)
@@ -193,7 +197,7 @@ 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','styles') else (id(parent),part.name)
+            owner = (id(item),None) if (group=='page' or group in _EDITORS) 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():

{inklet-4.0.0.dev12 → inklet-4.0.0.dev13}/src/inklet/experimental/layout_editor/__init__.py

@@ -1,4 +1,4 @@
-"""Local browser editing of composition layouts, labels and styles through Python."""
+"""Local browser editing of composition layouts, labels, styles and cameras through Python."""
 from __future__ import annotations
 
 import copy
@@ -17,7 +17,7 @@ from ...document.layout_overrides import SCHEMA, _targets, _placement, _expressi
 
 
 class LayoutEditor:
-    """Edit a live Composition layout, labels and styles with matching Python exports.
+    """Edit a live Composition layout, labels, styles and cameras with matching Python exports.
 
     Use as a context manager and open url while the context stays alive. The
     source recipe is retained but never edited. Refresh explicitly after source
@@ -145,14 +145,14 @@ class LayoutEditor:
         targets=_targets(self._recipe)
         if path not in targets:return [path]
         parent,part,item=targets[path]
-        if group in ('page','labels','styles'):return [name for name,(_,_,child) in targets.items() if child is item]
+        if (group=='page' or group in _EDITORS):return [name for name,(_,_,child) in targets.items() if child is item]
         return [name for name,(owner,other,_) in targets.items()
                 if owner is parent and other is not None and part is not None and other.name==part.name]
 
     def command(self, action, value=None, *, revision=None, missing='error'):
         """Compile a command atomically; a stale revision or failed build changes nothing.
 
-        Actions: gesture (figure-space move/uniform scale), edit (placement/page/labels/styles), reset, load
+        Actions: gesture (figure-space move/uniform scale), edit (placement/page/labels/styles/cameras), reset, load
         (override JSON), undo, redo and refresh (current source; clears history).
         Refresh may explicitly drop removed targets with missing='drop'.
         """
@@ -166,8 +166,8 @@ class LayoutEditor:
             candidate=copy.deepcopy(self._value)
             if action=='edit':
                 if (not isinstance(value,dict) or 'path' not in value or
-                        not set(value)<={'path','placement','page','labels','styles'} or len(value)<2):
-                    raise ValueError('edit needs a path and placement/page/labels/styles fields')
+                        not set(value)<={'path','placement','page',*_EDITORS} or len(value)<2):
+                    raise ValueError('edit needs a path and placement/page/labels/styles/cameras fields')
                 path=value['path']
                 if not isinstance(path,str):raise ValueError('edit path must be a string')
                 for group,fields in value.items():
@@ -181,7 +181,7 @@ class LayoutEditor:
                         else: destination.update(fields)
             elif action=='reset':
                 if not isinstance(value,str) or value not in _targets(self._recipe):raise ValueError('unknown reset target')
-                for group in ('placement','page','labels','styles'):
+                for group in ('placement','page',*_EDITORS):
                     for alias in self._aliases(value,group):
                         entry=candidate['targets'].get(alias,{})
                         entry.pop(group,None)