From 11e3a85cc2445a078fed7933b08814b5f0ad6c31 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 20 May 2026 22:59:59 +0200
Subject: [PATCH 1/5] feat(ellipse): toggle lockAspect from Properties Panel
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A user who wants to flip an ellipse into a circle (or back) had to
delete the object and pick the Circle palette entry — lockAspect was
write-once at creation time. The new checkbox in the ellipse
PropertiesPanel makes the constraint editable on existing objects:

- Enabling collapses width and height to min(width, height) so the
  resulting circle fits inside the prior bbox. max would push past
  the user's visual extent on one axis; min keeps the move inward
  and matches the intent of "sperren" — constrain, don't grow.
- Disabling drops the flag (undefined, matching the parser-emitted
  shape) without touching the dimensions, so width and height are
  immediately editable again with their previous values.

uniformScale already reads lockAspect via a predicate on props, so
the Konva transformer's enabled anchors recompute on the same render
as the flag flip — no extra wiring needed.
---
 src/locales/ar.ts        |  1 +
 src/locales/bg.ts        |  1 +
 src/locales/cs.ts        |  1 +
 src/locales/da.ts        |  1 +
 src/locales/de.ts        |  1 +
 src/locales/el.ts        |  1 +
 src/locales/en.ts        |  1 +
 src/locales/es.ts        |  1 +
 src/locales/et.ts        |  1 +
 src/locales/fa.ts        |  1 +
 src/locales/fi.ts        |  1 +
 src/locales/fr.ts        |  1 +
 src/locales/he.ts        |  1 +
 src/locales/hr.ts        |  1 +
 src/locales/hu.ts        |  1 +
 src/locales/it.ts        |  1 +
 src/locales/ja.ts        |  1 +
 src/locales/ko.ts        |  1 +
 src/locales/lt.ts        |  1 +
 src/locales/lv.ts        |  1 +
 src/locales/nl.ts        |  1 +
 src/locales/no.ts        |  1 +
 src/locales/pl.ts        |  1 +
 src/locales/pt.ts        |  1 +
 src/locales/ro.ts        |  1 +
 src/locales/sk.ts        |  1 +
 src/locales/sl.ts        |  1 +
 src/locales/sr.ts        |  1 +
 src/locales/sv.ts        |  1 +
 src/locales/tr.ts        |  1 +
 src/locales/zh-hans.ts   |  1 +
 src/locales/zh-hant.ts   |  1 +
 src/registry/ellipse.tsx | 26 ++++++++++++++++++++++++++
 33 files changed, 58 insertions(+)

diff --git a/src/locales/ar.ts b/src/locales/ar.ts
index 0d29468d..f289b20b 100644
--- a/src/locales/ar.ts
+++ b/src/locales/ar.ts
@@ -263,6 +263,7 @@ const ar = {
       height: 'الارتفاع (نقطة)',
       thickness: 'الحدود (نقطة)',
       filled: 'ممتلئ',
+      lockAspect: 'دائرة (تثبيت نسبة العرض إلى الارتفاع)',
       color: 'اللون',
       colorB: 'B — أسود',
       colorW: 'W — أبيض',
diff --git a/src/locales/bg.ts b/src/locales/bg.ts
index 3d92f752..b16222ba 100644
--- a/src/locales/bg.ts
+++ b/src/locales/bg.ts
@@ -263,6 +263,7 @@ const bg = {
       height: 'Височина (точки)',
       thickness: 'Рамка (точки)',
       filled: 'Запълнен',
+      lockAspect: 'Кръг (заключи съотношението)',
       color: 'Цвят',
       colorB: 'B — Черен',
       colorW: 'W — Бял',
diff --git a/src/locales/cs.ts b/src/locales/cs.ts
index d85150be..4bbd77ab 100644
--- a/src/locales/cs.ts
+++ b/src/locales/cs.ts
@@ -263,6 +263,7 @@ const cs = {
       height: 'Výška (body)',
       thickness: 'Rámeček (body)',
       filled: 'Vyplněný',
+      lockAspect: 'Kruh (uzamknout poměr stran)',
       color: 'Barva',
       colorB: 'B — Černá',
       colorW: 'W — Bílá',
diff --git a/src/locales/da.ts b/src/locales/da.ts
index 070c6ae0..a6d63896 100644
--- a/src/locales/da.ts
+++ b/src/locales/da.ts
@@ -263,6 +263,7 @@ const da = {
       height: 'Højde (punkter)',
       thickness: 'Kant (punkter)',
       filled: 'Udfyldt',
+      lockAspect: 'Cirkel (lås formatforhold)',
       color: 'Farve',
       colorB: 'B — Sort',
       colorW: 'W — Hvid',
diff --git a/src/locales/de.ts b/src/locales/de.ts
index 4f93f7ea..21934be2 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -284,6 +284,7 @@ const de = {
       height: 'Höhe (Punkte)',
       thickness: 'Rahmen (Punkte)',
       filled: 'Gefüllt',
+      lockAspect: 'Kreis (Seitenverhältnis sperren)',
       color: 'Farbe',
       colorB: 'B — Schwarz',
       colorW: 'W — Weiß',
diff --git a/src/locales/el.ts b/src/locales/el.ts
index 7c1af2a3..24eb3dd4 100644
--- a/src/locales/el.ts
+++ b/src/locales/el.ts
@@ -263,6 +263,7 @@ const el = {
       height: 'Ύψος (κουκκίδες)',
       thickness: 'Πλαίσιο (κουκκίδες)',
       filled: 'Γεμισμένο',
+      lockAspect: 'Κύκλος (κλείδωμα αναλογίας διαστάσεων)',
       color: 'Χρώμα',
       colorB: 'B — Μαύρο',
       colorW: 'W — Λευκό',
diff --git a/src/locales/en.ts b/src/locales/en.ts
index c801945d..a3474e7b 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -284,6 +284,7 @@ const en = {
       height: 'Height (dots)',
       thickness: 'Border (dots)',
       filled: 'Filled',
+      lockAspect: 'Circle (lock aspect ratio)',
       color: 'Color',
       colorB: 'B — Black',
       colorW: 'W — White',
diff --git a/src/locales/es.ts b/src/locales/es.ts
index eefc0492..6163e846 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -263,6 +263,7 @@ const es = {
       height: 'Alto (puntos)',
       thickness: 'Borde (puntos)',
       filled: 'Relleno',
+      lockAspect: 'Círculo (bloquear relación de aspecto)',
       color: 'Color',
       colorB: 'B — Negro',
       colorW: 'W — Blanco',
diff --git a/src/locales/et.ts b/src/locales/et.ts
index 9abebbb4..408df9a6 100644
--- a/src/locales/et.ts
+++ b/src/locales/et.ts
@@ -263,6 +263,7 @@ const et = {
       height: 'Kõrgus (punkti)',
       thickness: 'Ääris (punkti)',
       filled: 'Täidetud',
+      lockAspect: 'Ring (lukusta kuvasuhe)',
       color: 'Värvus',
       colorB: 'B — Must',
       colorW: 'W — Valge',
diff --git a/src/locales/fa.ts b/src/locales/fa.ts
index ffd5b2fa..ca99b0da 100644
--- a/src/locales/fa.ts
+++ b/src/locales/fa.ts
@@ -263,6 +263,7 @@ const fa = {
       height: 'ارتفاع (نقطه)',
       thickness: 'حاشیه (نقطه)',
       filled: 'پر شده',
+      lockAspect: 'دایره (قفل کردن نسبت ابعاد)',
       color: 'رنگ',
       colorB: 'B — مشکی',
       colorW: 'W — سفید',
diff --git a/src/locales/fi.ts b/src/locales/fi.ts
index 435ef73d..aaa2cd54 100644
--- a/src/locales/fi.ts
+++ b/src/locales/fi.ts
@@ -263,6 +263,7 @@ const fi = {
       height: 'Korkeus (pistettä)',
       thickness: 'Reunus (pistettä)',
       filled: 'Täytetty',
+      lockAspect: 'Ympyrä (lukitse kuvasuhde)',
       color: 'Väri',
       colorB: 'B — Musta',
       colorW: 'W — Valkoinen',
diff --git a/src/locales/fr.ts b/src/locales/fr.ts
index 52f1736b..12c42d3f 100644
--- a/src/locales/fr.ts
+++ b/src/locales/fr.ts
@@ -263,6 +263,7 @@ const fr = {
       height: 'Hauteur (points)',
       thickness: 'Bordure (points)',
       filled: 'Rempli',
+      lockAspect: 'Cercle (verrouiller le rapport d\'aspect)',
       color: 'Couleur',
       colorB: 'B — Noir',
       colorW: 'W — Blanc',
diff --git a/src/locales/he.ts b/src/locales/he.ts
index 5f2388e6..2d28db26 100644
--- a/src/locales/he.ts
+++ b/src/locales/he.ts
@@ -263,6 +263,7 @@ const he = {
       height: 'גובה (נקודות)',
       thickness: 'גבול (נקודות)',
       filled: 'מלא',
+      lockAspect: 'עיגול (נעל יחס גובה-רוחב)',
       color: 'צבע',
       colorB: 'B — שחור',
       colorW: 'W — לבן',
diff --git a/src/locales/hr.ts b/src/locales/hr.ts
index 71db443a..600f473a 100644
--- a/src/locales/hr.ts
+++ b/src/locales/hr.ts
@@ -263,6 +263,7 @@ const hr = {
       height: 'Visina (točke)',
       thickness: 'Okvir (točke)',
       filled: 'Ispunjen',
+      lockAspect: 'Krug (zaključaj omjer stranica)',
       color: 'Boja',
       colorB: 'B — Crna',
       colorW: 'W — Bijela',
diff --git a/src/locales/hu.ts b/src/locales/hu.ts
index 857de47f..317499bb 100644
--- a/src/locales/hu.ts
+++ b/src/locales/hu.ts
@@ -263,6 +263,7 @@ const hu = {
       height: 'Magasság (pont)',
       thickness: 'Keret (pont)',
       filled: 'Kitöltött',
+      lockAspect: 'Kör (oldalarány rögzítése)',
       color: 'Szín',
       colorB: 'B — Fekete',
       colorW: 'W — Fehér',
diff --git a/src/locales/it.ts b/src/locales/it.ts
index 5bf09103..3a8e3041 100644
--- a/src/locales/it.ts
+++ b/src/locales/it.ts
@@ -263,6 +263,7 @@ const it = {
       height: 'Altezza (punti)',
       thickness: 'Bordo (punti)',
       filled: 'Riempito',
+      lockAspect: 'Cerchio (blocca proporzioni)',
       color: 'Colore',
       colorB: 'B — Nero',
       colorW: 'W — Bianco',
diff --git a/src/locales/ja.ts b/src/locales/ja.ts
index 0eb26d0e..daa27380 100644
--- a/src/locales/ja.ts
+++ b/src/locales/ja.ts
@@ -263,6 +263,7 @@ const ja = {
       height: '高さ (ドット)',
       thickness: '枠線 (ドット)',
       filled: '塗りつぶし',
+      lockAspect: '円（アスペクト比を固定）',
       color: '色',
       colorB: 'B — 黒',
       colorW: 'W — 白',
diff --git a/src/locales/ko.ts b/src/locales/ko.ts
index 9880b511..f9a5d41e 100644
--- a/src/locales/ko.ts
+++ b/src/locales/ko.ts
@@ -263,6 +263,7 @@ const ko = {
       height: '높이 (점)',
       thickness: '테두리 (점)',
       filled: '채우기',
+      lockAspect: '원 (가로세로 비율 고정)',
       color: '색상',
       colorB: 'B — 검정',
       colorW: 'W — 흰색',
diff --git a/src/locales/lt.ts b/src/locales/lt.ts
index a7196bed..f07a3aba 100644
--- a/src/locales/lt.ts
+++ b/src/locales/lt.ts
@@ -263,6 +263,7 @@ const lt = {
       height: 'Aukštis (taškai)',
       thickness: 'Rėmelis (taškai)',
       filled: 'Užpildytas',
+      lockAspect: 'Apskritimas (užfiksuoti kraštinių santykį)',
       color: 'Spalva',
       colorB: 'B — Juoda',
       colorW: 'W — Balta',
diff --git a/src/locales/lv.ts b/src/locales/lv.ts
index c930c049..bbe2c84e 100644
--- a/src/locales/lv.ts
+++ b/src/locales/lv.ts
@@ -263,6 +263,7 @@ const lv = {
       height: 'Augstums (punkti)',
       thickness: 'Apmale (punkti)',
       filled: 'Aizpildīts',
+      lockAspect: 'Aplis (fiksēt malu attiecību)',
       color: 'Krāsa',
       colorB: 'B — Melna',
       colorW: 'W — Balta',
diff --git a/src/locales/nl.ts b/src/locales/nl.ts
index da274dbf..c5b462a0 100644
--- a/src/locales/nl.ts
+++ b/src/locales/nl.ts
@@ -263,6 +263,7 @@ const nl = {
       height: 'Hoogte (punten)',
       thickness: 'Rand (punten)',
       filled: 'Gevuld',
+      lockAspect: 'Cirkel (beeldverhouding vergrendelen)',
       color: 'Kleur',
       colorB: 'B — Zwart',
       colorW: 'W — Wit',
diff --git a/src/locales/no.ts b/src/locales/no.ts
index f5fb89ca..46c3e000 100644
--- a/src/locales/no.ts
+++ b/src/locales/no.ts
@@ -263,6 +263,7 @@ const no = {
       height: 'Høyde (punkter)',
       thickness: 'Kant (punkter)',
       filled: 'Fylt',
+      lockAspect: 'Sirkel (lås sideforhold)',
       color: 'Farge',
       colorB: 'B — Svart',
       colorW: 'W — Hvit',
diff --git a/src/locales/pl.ts b/src/locales/pl.ts
index cc75ff95..2ed73d71 100644
--- a/src/locales/pl.ts
+++ b/src/locales/pl.ts
@@ -263,6 +263,7 @@ const pl = {
       height: 'Wysokość (punkty)',
       thickness: 'Kontur (punkty)',
       filled: 'Wypełniony',
+      lockAspect: 'Okrąg (zablokuj proporcje)',
       color: 'Kolor',
       colorB: 'B — Czarny',
       colorW: 'W — Biały',
diff --git a/src/locales/pt.ts b/src/locales/pt.ts
index 17a9cddc..bf913146 100644
--- a/src/locales/pt.ts
+++ b/src/locales/pt.ts
@@ -263,6 +263,7 @@ const pt = {
       height: 'Altura (pontos)',
       thickness: 'Borda (pontos)',
       filled: 'Preenchido',
+      lockAspect: 'Círculo (bloquear proporção)',
       color: 'Cor',
       colorB: 'B — Preto',
       colorW: 'W — Branco',
diff --git a/src/locales/ro.ts b/src/locales/ro.ts
index c3f1932c..a3591e41 100644
--- a/src/locales/ro.ts
+++ b/src/locales/ro.ts
@@ -263,6 +263,7 @@ const ro = {
       height: 'Înălțime (puncte)',
       thickness: 'Chenar (puncte)',
       filled: 'Umplut',
+      lockAspect: 'Cerc (blochează raportul de aspect)',
       color: 'Culoare',
       colorB: 'B — Negru',
       colorW: 'W — Alb',
diff --git a/src/locales/sk.ts b/src/locales/sk.ts
index 78510bbd..e4b3ca4f 100644
--- a/src/locales/sk.ts
+++ b/src/locales/sk.ts
@@ -263,6 +263,7 @@ const sk = {
       height: 'Výška (body)',
       thickness: 'Rámček (body)',
       filled: 'Vyplnený',
+      lockAspect: 'Kruh (uzamknúť pomer strán)',
       color: 'Farba',
       colorB: 'B — Čierna',
       colorW: 'W — Biela',
diff --git a/src/locales/sl.ts b/src/locales/sl.ts
index c9c83298..a7044b8a 100644
--- a/src/locales/sl.ts
+++ b/src/locales/sl.ts
@@ -263,6 +263,7 @@ const sl = {
       height: 'Višina (točke)',
       thickness: 'Okvir (točke)',
       filled: 'Zapolnjen',
+      lockAspect: 'Krog (zakleni razmerje stranic)',
       color: 'Barva',
       colorB: 'B — Črna',
       colorW: 'W — Bela',
diff --git a/src/locales/sr.ts b/src/locales/sr.ts
index 4c131f76..7106e914 100644
--- a/src/locales/sr.ts
+++ b/src/locales/sr.ts
@@ -263,6 +263,7 @@ const sr = {
       height: 'Visina (tačke)',
       thickness: 'Okvir (tačke)',
       filled: 'Popunjen',
+      lockAspect: 'Круг (закључај однос страница)',
       color: 'Boja',
       colorB: 'B — Crna',
       colorW: 'W — Bela',
diff --git a/src/locales/sv.ts b/src/locales/sv.ts
index bd95a933..bc160a98 100644
--- a/src/locales/sv.ts
+++ b/src/locales/sv.ts
@@ -263,6 +263,7 @@ const sv = {
       height: 'Höjd (punkter)',
       thickness: 'Kant (punkter)',
       filled: 'Fylld',
+      lockAspect: 'Cirkel (lås sidförhållande)',
       color: 'Färg',
       colorB: 'B — Svart',
       colorW: 'W — Vit',
diff --git a/src/locales/tr.ts b/src/locales/tr.ts
index a9cd7fe6..ce6fe89f 100644
--- a/src/locales/tr.ts
+++ b/src/locales/tr.ts
@@ -263,6 +263,7 @@ const tr = {
       height: 'Yükseklik (nokta)',
       thickness: 'Kenarlık (nokta)',
       filled: 'Dolu',
+      lockAspect: 'Daire (en boy oranını kilitle)',
       color: 'Renk',
       colorB: 'B — Siyah',
       colorW: 'W — Beyaz',
diff --git a/src/locales/zh-hans.ts b/src/locales/zh-hans.ts
index ff637fca..375383de 100644
--- a/src/locales/zh-hans.ts
+++ b/src/locales/zh-hans.ts
@@ -263,6 +263,7 @@ const zhHans = {
       height: '高度 (点)',
       thickness: '边框 (点)',
       filled: '填充',
+      lockAspect: '圆形（锁定纵横比）',
       color: '颜色',
       colorB: 'B — 黑色',
       colorW: 'W — 白色',
diff --git a/src/locales/zh-hant.ts b/src/locales/zh-hant.ts
index b0a47096..e506ec73 100644
--- a/src/locales/zh-hant.ts
+++ b/src/locales/zh-hant.ts
@@ -263,6 +263,7 @@ const zhHant = {
       height: '高度 (點)',
       thickness: '框線 (點)',
       filled: '填滿',
+      lockAspect: '圓形（鎖定長寬比）',
       color: '顏色',
       colorB: 'B — 黑色',
       colorW: 'W — 白色',
diff --git a/src/registry/ellipse.tsx b/src/registry/ellipse.tsx
index eea03806..3930b29d 100644
--- a/src/registry/ellipse.tsx
+++ b/src/registry/ellipse.tsx
@@ -86,6 +86,32 @@ export const ellipse: ObjectTypeDefinition<EllipseProps> = {
           </div>
         )}
 
+        <label className="flex items-center gap-2 cursor-pointer">
+          <input
+            type="checkbox"
+            className="accent-accent"
+            checked={p.lockAspect ?? false}
+            onChange={(e) => {
+              if (e.target.checked) {
+                // Enabling lockAspect: collapse to the smaller axis so
+                // the resulting circle fits inside the current ellipse
+                // bbox. Picking max instead would push the shape past
+                // the user's prior visual extent on one axis, which is
+                // surprising; min keeps the move strictly inward.
+                const d = Math.min(p.width, p.height);
+                onChange({ lockAspect: true, width: d, height: d });
+              } else {
+                // Disabling: drop the flag (undefined keeps the model
+                // shape parser-emitted props share — they never carry
+                // an explicit `false`). Dimensions stay put so the
+                // user can adjust them independently from here.
+                onChange({ lockAspect: undefined });
+              }
+            }}
+          />
+          <span className={labelCls}>{t.registry.ellipse.lockAspect}</span>
+        </label>
+
         <label className="flex items-center gap-2 cursor-pointer">
           <input
             type="checkbox"

From b0512d7a164085c68d0274078f5b68c25714177d Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 20 May 2026 23:14:30 +0200
Subject: [PATCH 2/5] feat(palette): drop Circle entry now that lockAspect is
 editable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

With the new Properties-Panel toggle, the Circle palette entry was a
duplicate path to the same shape: ellipse with lockAspect=true. Drops
the virtual-entries layer entirely (it had only the circle case) and
removes the unused t.types.circle label across all 32 locales.

t.registry.circle.diameter stays — it labels the Properties-Panel
diameter input when an ellipse is locked. The v2→v3 store migration
also stays so old saves with type:'circle' still rewrite cleanly to
ellipse + lockAspect on load.
---
 src/components/Palette/ObjectPalette.tsx | 14 +-------
 src/components/Palette/virtualEntries.ts | 44 ------------------------
 src/locales/ar.ts                        |  1 -
 src/locales/bg.ts                        |  1 -
 src/locales/cs.ts                        |  1 -
 src/locales/da.ts                        |  1 -
 src/locales/de.ts                        |  1 -
 src/locales/el.ts                        |  1 -
 src/locales/en.ts                        |  1 -
 src/locales/es.ts                        |  1 -
 src/locales/et.ts                        |  1 -
 src/locales/fa.ts                        |  1 -
 src/locales/fi.ts                        |  1 -
 src/locales/fr.ts                        |  1 -
 src/locales/he.ts                        |  1 -
 src/locales/hr.ts                        |  1 -
 src/locales/hu.ts                        |  1 -
 src/locales/it.ts                        |  1 -
 src/locales/ja.ts                        |  1 -
 src/locales/ko.ts                        |  1 -
 src/locales/lt.ts                        |  1 -
 src/locales/lv.ts                        |  1 -
 src/locales/nl.ts                        |  1 -
 src/locales/no.ts                        |  1 -
 src/locales/pl.ts                        |  1 -
 src/locales/pt.ts                        |  1 -
 src/locales/ro.ts                        |  1 -
 src/locales/sk.ts                        |  1 -
 src/locales/sl.ts                        |  1 -
 src/locales/sr.ts                        |  1 -
 src/locales/sv.ts                        |  1 -
 src/locales/tr.ts                        |  1 -
 src/locales/zh-hans.ts                   |  1 -
 src/locales/zh-hant.ts                   |  1 -
 34 files changed, 1 insertion(+), 89 deletions(-)
 delete mode 100644 src/components/Palette/virtualEntries.ts

diff --git a/src/components/Palette/ObjectPalette.tsx b/src/components/Palette/ObjectPalette.tsx
index 2e8ae2a7..d77b8285 100644
--- a/src/components/Palette/ObjectPalette.tsx
+++ b/src/components/Palette/ObjectPalette.tsx
@@ -1,7 +1,6 @@
 import { useDraggable } from '@dnd-kit/core';
 import { ObjectRegistry } from '../../registry';
 import { PALETTE_GROUPS } from './paletteGroups';
-import { VIRTUAL_PALETTE_ENTRIES, type VirtualPaletteEntry } from './virtualEntries';
 import type { ObjectGroup } from '../../types/ObjectType';
 import { useT } from '../../lib/useT';
 import { useLabelStore } from '../../store/labelStore';
@@ -76,7 +75,7 @@ function resolveEntries(
   group: ObjectGroup,
   types: Record<string, string>,
 ): ResolvedEntry[] {
-  const registry = Object.entries(ObjectRegistry)
+  return Object.entries(ObjectRegistry)
     .filter(([, def]) => def.group === group)
     .map(([type, def]): ResolvedEntry => ({
       id: type,
@@ -85,17 +84,6 @@ function resolveEntries(
       label: types[type] ?? def.label,
       defaultSize: def.defaultSize,
     }));
-  const virtual = VIRTUAL_PALETTE_ENTRIES
-    .filter((v) => v.group === group)
-    .map((v: VirtualPaletteEntry): ResolvedEntry => ({
-      id: v.id,
-      type: v.type,
-      icon: v.icon,
-      label: types[v.labelKey] ?? v.fallbackLabel,
-      defaultSize: v.defaultSize,
-      propsOverride: v.propsOverride,
-    }));
-  return [...registry, ...virtual];
 }
 
 export function ObjectPalette() {
diff --git a/src/components/Palette/virtualEntries.ts b/src/components/Palette/virtualEntries.ts
deleted file mode 100644
index eb3dbcee..00000000
--- a/src/components/Palette/virtualEntries.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-import type { ObjectGroup } from '../../types/ObjectType';
-import type { EllipseProps } from '../../registry/ellipse';
-
-/**
- * Palette-only sugar entries: surface alternative starting configs for a
- * registry type without inflating the type union. The "Circle" entry
- * instantiates an `ellipse` with `lockAspect: true` so the transformer
- * keeps it square; round-trips through ^GC on export and ^GC on import
- * preserve the flag, so the file format stays canonical.
- */
-export interface VirtualPaletteEntry {
-  /** Unique key inside the palette ("circle"). Does NOT collide with
-   *  registry types — those use their own key directly. */
-  id: string;
-  /** Registry type to instantiate. */
-  type: string;
-  group: ObjectGroup;
-  icon: string;
-  /** Key into `t.types` for the visible label. */
-  labelKey: string;
-  /** Display label fallback when the locale is missing the key. */
-  fallbackLabel: string;
-  /** Default size used by the drop-on-canvas position centring math. */
-  defaultSize: { width: number; height: number };
-  /** Merged on top of the registry type's `defaultProps` at creation. */
-  propsOverride: object;
-}
-
-export const VIRTUAL_PALETTE_ENTRIES: VirtualPaletteEntry[] = [
-  {
-    id: 'circle',
-    type: 'ellipse',
-    group: 'shape',
-    icon: '●',
-    labelKey: 'circle',
-    fallbackLabel: 'Circle',
-    defaultSize: { width: 100, height: 100 },
-    propsOverride: {
-      width: 100,
-      height: 100,
-      lockAspect: true,
-    } satisfies Partial<EllipseProps>,
-  },
-];
diff --git a/src/locales/ar.ts b/src/locales/ar.ts
index f289b20b..c8153ec3 100644
--- a/src/locales/ar.ts
+++ b/src/locales/ar.ts
@@ -19,7 +19,6 @@ const ar = {
     datamatrix: 'DataMatrix',
     box: 'مستطيل',
     ellipse: 'قطع ناقص',
-    circle: 'دائرة',
     line: 'خط',
     serial: 'رقم تسلسلي',
     image: 'صورة',
diff --git a/src/locales/bg.ts b/src/locales/bg.ts
index b16222ba..ea5da832 100644
--- a/src/locales/bg.ts
+++ b/src/locales/bg.ts
@@ -19,7 +19,6 @@ const bg = {
     datamatrix: 'DataMatrix',
     box: 'Правоъгълник',
     ellipse: 'Елипса',
-    circle: 'Кръг',
     line: 'Линия',
     serial: 'Сериен №',
     image: 'Изображение',
diff --git a/src/locales/cs.ts b/src/locales/cs.ts
index 4bbd77ab..fd9721eb 100644
--- a/src/locales/cs.ts
+++ b/src/locales/cs.ts
@@ -19,7 +19,6 @@ const cs = {
     datamatrix: 'DataMatrix',
     box: 'Obdélník',
     ellipse: 'Elipsa',
-    circle: 'Kruh',
     line: 'Čára',
     serial: 'Sériové číslo',
     image: 'Obrázek',
diff --git a/src/locales/da.ts b/src/locales/da.ts
index a6d63896..ef1c7024 100644
--- a/src/locales/da.ts
+++ b/src/locales/da.ts
@@ -19,7 +19,6 @@ const da = {
     datamatrix: 'DataMatrix',
     box: 'Rektangel',
     ellipse: 'Ellipse',
-    circle: 'Cirkel',
     line: 'Linje',
     serial: 'Serienr.',
     image: 'Billede',
diff --git a/src/locales/de.ts b/src/locales/de.ts
index 21934be2..c92d0a52 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -19,7 +19,6 @@ const de = {
     datamatrix: 'DataMatrix',
     box: 'Box',
     ellipse: 'Ellipse',
-    circle: 'Kreis',
     line: 'Linie',
     serial: 'Seriennummer',
     image: 'Bild',
diff --git a/src/locales/el.ts b/src/locales/el.ts
index 24eb3dd4..b73c05f0 100644
--- a/src/locales/el.ts
+++ b/src/locales/el.ts
@@ -19,7 +19,6 @@ const el = {
     datamatrix: 'DataMatrix',
     box: 'Ορθογώνιο',
     ellipse: 'Έλλειψη',
-    circle: 'Κύκλος',
     line: 'Γραμμή',
     serial: 'Σειριακός αρ.',
     image: 'Εικόνα',
diff --git a/src/locales/en.ts b/src/locales/en.ts
index a3474e7b..a818ac49 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -19,7 +19,6 @@ const en = {
     datamatrix: 'DataMatrix',
     box: 'Box',
     ellipse: 'Ellipse',
-    circle: 'Circle',
     line: 'Line',
     serial: 'Serial',
     image: 'Image',
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 6163e846..70036a24 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -19,7 +19,6 @@ const es = {
     datamatrix: 'DataMatrix',
     box: 'Rectángulo',
     ellipse: 'Elipse',
-    circle: 'Círculo',
     line: 'Línea',
     serial: 'Serie',
     image: 'Imagen',
diff --git a/src/locales/et.ts b/src/locales/et.ts
index 408df9a6..19151c44 100644
--- a/src/locales/et.ts
+++ b/src/locales/et.ts
@@ -19,7 +19,6 @@ const et = {
     datamatrix: 'DataMatrix',
     box: 'Ristkülik',
     ellipse: 'Ellips',
-    circle: 'Ring',
     line: 'Joon',
     serial: 'Seerianr',
     image: 'Pilt',
diff --git a/src/locales/fa.ts b/src/locales/fa.ts
index ca99b0da..041b0773 100644
--- a/src/locales/fa.ts
+++ b/src/locales/fa.ts
@@ -19,7 +19,6 @@ const fa = {
     datamatrix: 'DataMatrix',
     box: 'مستطیل',
     ellipse: 'بیضی',
-    circle: 'دایره',
     line: 'خط',
     serial: 'شماره سریال',
     image: 'تصویر',
diff --git a/src/locales/fi.ts b/src/locales/fi.ts
index aaa2cd54..c616b3aa 100644
--- a/src/locales/fi.ts
+++ b/src/locales/fi.ts
@@ -19,7 +19,6 @@ const fi = {
     datamatrix: 'DataMatrix',
     box: 'Suorakulmio',
     ellipse: 'Ellipsi',
-    circle: 'Ympyrä',
     line: 'Viiva',
     serial: 'Sarjanro',
     image: 'Kuva',
diff --git a/src/locales/fr.ts b/src/locales/fr.ts
index 12c42d3f..5b36106d 100644
--- a/src/locales/fr.ts
+++ b/src/locales/fr.ts
@@ -19,7 +19,6 @@ const fr = {
     datamatrix: 'DataMatrix',
     box: 'Rectangle',
     ellipse: 'Ellipse',
-    circle: 'Cercle',
     line: 'Ligne',
     serial: 'Série',
     image: 'Image',
diff --git a/src/locales/he.ts b/src/locales/he.ts
index 2d28db26..211c0b8f 100644
--- a/src/locales/he.ts
+++ b/src/locales/he.ts
@@ -19,7 +19,6 @@ const he = {
     datamatrix: 'DataMatrix',
     box: 'מלבן',
     ellipse: 'אליפסה',
-    circle: 'עיגול',
     line: 'קו',
     serial: 'מס. סידורי',
     image: 'תמונה',
diff --git a/src/locales/hr.ts b/src/locales/hr.ts
index 600f473a..9727df63 100644
--- a/src/locales/hr.ts
+++ b/src/locales/hr.ts
@@ -19,7 +19,6 @@ const hr = {
     datamatrix: 'DataMatrix',
     box: 'Pravokutnik',
     ellipse: 'Elipsa',
-    circle: 'Krug',
     line: 'Linija',
     serial: 'Serijski br.',
     image: 'Slika',
diff --git a/src/locales/hu.ts b/src/locales/hu.ts
index 317499bb..a8e59c0d 100644
--- a/src/locales/hu.ts
+++ b/src/locales/hu.ts
@@ -19,7 +19,6 @@ const hu = {
     datamatrix: 'DataMatrix',
     box: 'Téglalap',
     ellipse: 'Ellipszis',
-    circle: 'Kör',
     line: 'Vonal',
     serial: 'Sorszám',
     image: 'Kép',
diff --git a/src/locales/it.ts b/src/locales/it.ts
index 3a8e3041..09277db2 100644
--- a/src/locales/it.ts
+++ b/src/locales/it.ts
@@ -19,7 +19,6 @@ const it = {
     datamatrix: 'DataMatrix',
     box: 'Rettangolo',
     ellipse: 'Ellisse',
-    circle: 'Cerchio',
     line: 'Linea',
     serial: 'Seriale',
     image: 'Immagine',
diff --git a/src/locales/ja.ts b/src/locales/ja.ts
index daa27380..2ca50031 100644
--- a/src/locales/ja.ts
+++ b/src/locales/ja.ts
@@ -19,7 +19,6 @@ const ja = {
     datamatrix: 'DataMatrix',
     box: '矩形',
     ellipse: '楕円',
-    circle: '円',
     line: '線',
     serial: 'シリアル',
     image: '画像',
diff --git a/src/locales/ko.ts b/src/locales/ko.ts
index f9a5d41e..9a2e8cc3 100644
--- a/src/locales/ko.ts
+++ b/src/locales/ko.ts
@@ -19,7 +19,6 @@ const ko = {
     datamatrix: 'DataMatrix',
     box: '사각형',
     ellipse: '타원',
-    circle: '원',
     line: '선',
     serial: '일련번호',
     image: '이미지',
diff --git a/src/locales/lt.ts b/src/locales/lt.ts
index f07a3aba..6f6152e8 100644
--- a/src/locales/lt.ts
+++ b/src/locales/lt.ts
@@ -19,7 +19,6 @@ const lt = {
     datamatrix: 'DataMatrix',
     box: 'Stačiakampis',
     ellipse: 'Elipsė',
-    circle: 'Apskritimas',
     line: 'Linija',
     serial: 'Serijinis nr.',
     image: 'Vaizdas',
diff --git a/src/locales/lv.ts b/src/locales/lv.ts
index bbe2c84e..33d908a1 100644
--- a/src/locales/lv.ts
+++ b/src/locales/lv.ts
@@ -19,7 +19,6 @@ const lv = {
     datamatrix: 'DataMatrix',
     box: 'Taisnstūris',
     ellipse: 'Elipse',
-    circle: 'Aplis',
     line: 'Līnija',
     serial: 'Sērijas nr.',
     image: 'Attēls',
diff --git a/src/locales/nl.ts b/src/locales/nl.ts
index c5b462a0..0e3b2dad 100644
--- a/src/locales/nl.ts
+++ b/src/locales/nl.ts
@@ -19,7 +19,6 @@ const nl = {
     datamatrix: 'DataMatrix',
     box: 'Rechthoek',
     ellipse: 'Ellips',
-    circle: 'Cirkel',
     line: 'Lijn',
     serial: 'Serienummer',
     image: 'Afbeelding',
diff --git a/src/locales/no.ts b/src/locales/no.ts
index 46c3e000..beddc15c 100644
--- a/src/locales/no.ts
+++ b/src/locales/no.ts
@@ -19,7 +19,6 @@ const no = {
     datamatrix: 'DataMatrix',
     box: 'Rektangel',
     ellipse: 'Ellipse',
-    circle: 'Sirkel',
     line: 'Linje',
     serial: 'Serienr.',
     image: 'Bilde',
diff --git a/src/locales/pl.ts b/src/locales/pl.ts
index 2ed73d71..dd0f6554 100644
--- a/src/locales/pl.ts
+++ b/src/locales/pl.ts
@@ -19,7 +19,6 @@ const pl = {
     datamatrix: 'DataMatrix',
     box: 'Prostokąt',
     ellipse: 'Elipsa',
-    circle: 'Okrąg',
     line: 'Linia',
     serial: 'Seria',
     image: 'Obraz',
diff --git a/src/locales/pt.ts b/src/locales/pt.ts
index bf913146..fcad8126 100644
--- a/src/locales/pt.ts
+++ b/src/locales/pt.ts
@@ -19,7 +19,6 @@ const pt = {
     datamatrix: 'DataMatrix',
     box: 'Retângulo',
     ellipse: 'Elipse',
-    circle: 'Círculo',
     line: 'Linha',
     serial: 'Série',
     image: 'Imagem',
diff --git a/src/locales/ro.ts b/src/locales/ro.ts
index a3591e41..e880a9ef 100644
--- a/src/locales/ro.ts
+++ b/src/locales/ro.ts
@@ -19,7 +19,6 @@ const ro = {
     datamatrix: 'DataMatrix',
     box: 'Dreptunghi',
     ellipse: 'Elipsă',
-    circle: 'Cerc',
     line: 'Linie',
     serial: 'Serie',
     image: 'Imagine',
diff --git a/src/locales/sk.ts b/src/locales/sk.ts
index e4b3ca4f..c240fae0 100644
--- a/src/locales/sk.ts
+++ b/src/locales/sk.ts
@@ -19,7 +19,6 @@ const sk = {
     datamatrix: 'DataMatrix',
     box: 'Obdĺžnik',
     ellipse: 'Elipsa',
-    circle: 'Kruh',
     line: 'Čiara',
     serial: 'Sériové číslo',
     image: 'Obrázok',
diff --git a/src/locales/sl.ts b/src/locales/sl.ts
index a7044b8a..8142bcaf 100644
--- a/src/locales/sl.ts
+++ b/src/locales/sl.ts
@@ -19,7 +19,6 @@ const sl = {
     datamatrix: 'DataMatrix',
     box: 'Pravokotnik',
     ellipse: 'Elipsa',
-    circle: 'Krog',
     line: 'Črta',
     serial: 'Zaporedna št.',
     image: 'Slika',
diff --git a/src/locales/sr.ts b/src/locales/sr.ts
index 7106e914..15cf33d7 100644
--- a/src/locales/sr.ts
+++ b/src/locales/sr.ts
@@ -19,7 +19,6 @@ const sr = {
     datamatrix: 'DataMatrix',
     box: 'Правоугаоник',
     ellipse: 'Елипса',
-    circle: 'Круг',
     line: 'Линија',
     serial: 'Серијски бр.',
     image: 'Слика',
diff --git a/src/locales/sv.ts b/src/locales/sv.ts
index bc160a98..92784b4a 100644
--- a/src/locales/sv.ts
+++ b/src/locales/sv.ts
@@ -19,7 +19,6 @@ const sv = {
     datamatrix: 'DataMatrix',
     box: 'Rektangel',
     ellipse: 'Ellips',
-    circle: 'Cirkel',
     line: 'Linje',
     serial: 'Serienr.',
     image: 'Bild',
diff --git a/src/locales/tr.ts b/src/locales/tr.ts
index ce6fe89f..b374b9a1 100644
--- a/src/locales/tr.ts
+++ b/src/locales/tr.ts
@@ -19,7 +19,6 @@ const tr = {
     datamatrix: 'DataMatrix',
     box: 'Dikdörtgen',
     ellipse: 'Elips',
-    circle: 'Daire',
     line: 'Çizgi',
     serial: 'Seri No',
     image: 'Görsel',
diff --git a/src/locales/zh-hans.ts b/src/locales/zh-hans.ts
index 375383de..552f710b 100644
--- a/src/locales/zh-hans.ts
+++ b/src/locales/zh-hans.ts
@@ -19,7 +19,6 @@ const zhHans = {
     datamatrix: 'DataMatrix',
     box: '矩形',
     ellipse: '椭圆',
-    circle: '圆',
     line: '线条',
     serial: '序列号',
     image: '图片',
diff --git a/src/locales/zh-hant.ts b/src/locales/zh-hant.ts
index e506ec73..657de2e4 100644
--- a/src/locales/zh-hant.ts
+++ b/src/locales/zh-hant.ts
@@ -19,7 +19,6 @@ const zhHant = {
     datamatrix: 'DataMatrix',
     box: '矩形',
     ellipse: '橢圓',
-    circle: '圓',
     line: '線條',
     serial: '序號',
     image: '圖片',

From a190b5ba74adc0f0144e416007b613e818a7112e Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 20 May 2026 23:18:02 +0200
Subject: [PATCH 3/5] feat(ellipse): add Invert toggle, same semantics as
 box/text

^GE / ^GC support field-level inversion via ^LR like every other
graphic field; the ellipse PropertiesPanel and emit just never wired
it through. EllipseProps gains reverse?: boolean, the emitter wraps
the ^GE/^GC command with ^LRY/^LRN when set, and the parser's GE/GC
handlers now collect getReverseFlag() so a round-trip through ^LR
keeps the checkbox state intact. Properties Panel checkbox sits at
the bottom of the panel, mirroring box.

New locale key registry.ellipse.reverse, reusing the box.reverse
translation across all 32 locales so the two checkboxes read
identically to the user.
---
 src/lib/zplParser.ts     |  2 ++
 src/locales/ar.ts        |  1 +
 src/locales/bg.ts        |  1 +
 src/locales/cs.ts        |  1 +
 src/locales/da.ts        |  1 +
 src/locales/de.ts        |  1 +
 src/locales/el.ts        |  1 +
 src/locales/en.ts        |  1 +
 src/locales/es.ts        |  1 +
 src/locales/et.ts        |  1 +
 src/locales/fa.ts        |  1 +
 src/locales/fi.ts        |  1 +
 src/locales/fr.ts        |  1 +
 src/locales/he.ts        |  1 +
 src/locales/hr.ts        |  1 +
 src/locales/hu.ts        |  1 +
 src/locales/it.ts        |  1 +
 src/locales/ja.ts        |  1 +
 src/locales/ko.ts        |  1 +
 src/locales/lt.ts        |  1 +
 src/locales/lv.ts        |  1 +
 src/locales/nl.ts        |  1 +
 src/locales/no.ts        |  1 +
 src/locales/pl.ts        |  1 +
 src/locales/pt.ts        |  1 +
 src/locales/ro.ts        |  1 +
 src/locales/sk.ts        |  1 +
 src/locales/sl.ts        |  1 +
 src/locales/sr.ts        |  1 +
 src/locales/sv.ts        |  1 +
 src/locales/tr.ts        |  1 +
 src/locales/zh-hans.ts   |  1 +
 src/locales/zh-hant.ts   |  1 +
 src/registry/ellipse.tsx | 29 +++++++++++++++++++++++++----
 34 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/src/lib/zplParser.ts b/src/lib/zplParser.ts
index 7872806c..da815e84 100644
--- a/src/lib/zplParser.ts
+++ b/src/lib/zplParser.ts
@@ -1220,6 +1220,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
             thickness: t,
             filled,
             color,
+            reverse: getReverseFlag(),
           } satisfies EllipseProps,
           undefined,
           takeComment(),
@@ -1244,6 +1245,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
             filled,
             color,
             lockAspect: true,
+            reverse: getReverseFlag(),
           } satisfies EllipseProps,
           undefined,
           takeComment(),
diff --git a/src/locales/ar.ts b/src/locales/ar.ts
index c8153ec3..12fd90b3 100644
--- a/src/locales/ar.ts
+++ b/src/locales/ar.ts
@@ -266,6 +266,7 @@ const ar = {
       color: 'اللون',
       colorB: 'B — أسود',
       colorW: 'W — أبيض',
+      reverse: 'عكس',
     },
     circle: {
       diameter: 'القطر (نقاط)',
diff --git a/src/locales/bg.ts b/src/locales/bg.ts
index ea5da832..77c02658 100644
--- a/src/locales/bg.ts
+++ b/src/locales/bg.ts
@@ -266,6 +266,7 @@ const bg = {
       color: 'Цвят',
       colorB: 'B — Черен',
       colorW: 'W — Бял',
+      reverse: 'Обърни',
     },
     circle: {
       diameter: 'Диаметър (точки)',
diff --git a/src/locales/cs.ts b/src/locales/cs.ts
index fd9721eb..87fe8a1e 100644
--- a/src/locales/cs.ts
+++ b/src/locales/cs.ts
@@ -266,6 +266,7 @@ const cs = {
       color: 'Barva',
       colorB: 'B — Černá',
       colorW: 'W — Bílá',
+      reverse: 'Invertovat',
     },
     circle: {
       diameter: 'Průměr (body)',
diff --git a/src/locales/da.ts b/src/locales/da.ts
index ef1c7024..d6ba9f5b 100644
--- a/src/locales/da.ts
+++ b/src/locales/da.ts
@@ -266,6 +266,7 @@ const da = {
       color: 'Farve',
       colorB: 'B — Sort',
       colorW: 'W — Hvid',
+      reverse: 'Invertere',
     },
     circle: {
       diameter: 'Diameter (punkter)',
diff --git a/src/locales/de.ts b/src/locales/de.ts
index c92d0a52..b58853bf 100644
--- a/src/locales/de.ts
+++ b/src/locales/de.ts
@@ -287,6 +287,7 @@ const de = {
       color: 'Farbe',
       colorB: 'B — Schwarz',
       colorW: 'W — Weiß',
+      reverse: 'Invertieren',
     },
     circle: {
       diameter: 'Durchmesser (Punkte)',
diff --git a/src/locales/el.ts b/src/locales/el.ts
index b73c05f0..89c93ea7 100644
--- a/src/locales/el.ts
+++ b/src/locales/el.ts
@@ -266,6 +266,7 @@ const el = {
       color: 'Χρώμα',
       colorB: 'B — Μαύρο',
       colorW: 'W — Λευκό',
+      reverse: 'Αντιστροφή',
     },
     circle: {
       diameter: 'Διάμετρος (κουκκίδες)',
diff --git a/src/locales/en.ts b/src/locales/en.ts
index a818ac49..d760ea61 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -287,6 +287,7 @@ const en = {
       color: 'Color',
       colorB: 'B — Black',
       colorW: 'W — White',
+      reverse: 'Invert',
     },
     circle: {
       diameter: 'Diameter (dots)',
diff --git a/src/locales/es.ts b/src/locales/es.ts
index 70036a24..0a76c2cd 100644
--- a/src/locales/es.ts
+++ b/src/locales/es.ts
@@ -266,6 +266,7 @@ const es = {
       color: 'Color',
       colorB: 'B — Negro',
       colorW: 'W — Blanco',
+      reverse: 'Invertir',
     },
     circle: {
       diameter: 'Diámetro (puntos)',
diff --git a/src/locales/et.ts b/src/locales/et.ts
index 19151c44..eb8cd0c4 100644
--- a/src/locales/et.ts
+++ b/src/locales/et.ts
@@ -266,6 +266,7 @@ const et = {
       color: 'Värvus',
       colorB: 'B — Must',
       colorW: 'W — Valge',
+      reverse: 'Pööra',
     },
     circle: {
       diameter: 'Läbimõõt (punktid)',
diff --git a/src/locales/fa.ts b/src/locales/fa.ts
index 041b0773..1a027f70 100644
--- a/src/locales/fa.ts
+++ b/src/locales/fa.ts
@@ -266,6 +266,7 @@ const fa = {
       color: 'رنگ',
       colorB: 'B — مشکی',
       colorW: 'W — سفید',
+      reverse: 'معکوس کردن',
     },
     circle: {
       diameter: 'قطر (نقطه)',
diff --git a/src/locales/fi.ts b/src/locales/fi.ts
index c616b3aa..9e788a07 100644
--- a/src/locales/fi.ts
+++ b/src/locales/fi.ts
@@ -266,6 +266,7 @@ const fi = {
       color: 'Väri',
       colorB: 'B — Musta',
       colorW: 'W — Valkoinen',
+      reverse: 'Käännä',
     },
     circle: {
       diameter: 'Halkaisija (pisteet)',
diff --git a/src/locales/fr.ts b/src/locales/fr.ts
index 5b36106d..936e6d7f 100644
--- a/src/locales/fr.ts
+++ b/src/locales/fr.ts
@@ -266,6 +266,7 @@ const fr = {
       color: 'Couleur',
       colorB: 'B — Noir',
       colorW: 'W — Blanc',
+      reverse: 'Inverser',
     },
     circle: {
       diameter: 'Diamètre (points)',
diff --git a/src/locales/he.ts b/src/locales/he.ts
index 211c0b8f..f9e9d06b 100644
--- a/src/locales/he.ts
+++ b/src/locales/he.ts
@@ -266,6 +266,7 @@ const he = {
       color: 'צבע',
       colorB: 'B — שחור',
       colorW: 'W — לבן',
+      reverse: 'הפוך',
     },
     circle: {
       diameter: 'קוטר (נקודות)',
diff --git a/src/locales/hr.ts b/src/locales/hr.ts
index 9727df63..99d602c6 100644
--- a/src/locales/hr.ts
+++ b/src/locales/hr.ts
@@ -266,6 +266,7 @@ const hr = {
       color: 'Boja',
       colorB: 'B — Crna',
       colorW: 'W — Bijela',
+      reverse: 'Invertiraj',
     },
     circle: {
       diameter: 'Promjer (točke)',
diff --git a/src/locales/hu.ts b/src/locales/hu.ts
index a8e59c0d..273ef35e 100644
--- a/src/locales/hu.ts
+++ b/src/locales/hu.ts
@@ -266,6 +266,7 @@ const hu = {
       color: 'Szín',
       colorB: 'B — Fekete',
       colorW: 'W — Fehér',
+      reverse: 'Invertálás',
     },
     circle: {
       diameter: 'Átmérő (pontok)',
diff --git a/src/locales/it.ts b/src/locales/it.ts
index 09277db2..96ebf328 100644
--- a/src/locales/it.ts
+++ b/src/locales/it.ts
@@ -266,6 +266,7 @@ const it = {
       color: 'Colore',
       colorB: 'B — Nero',
       colorW: 'W — Bianco',
+      reverse: 'Inverti',
     },
     circle: {
       diameter: 'Diametro (punti)',
diff --git a/src/locales/ja.ts b/src/locales/ja.ts
index 2ca50031..a67e90be 100644
--- a/src/locales/ja.ts
+++ b/src/locales/ja.ts
@@ -266,6 +266,7 @@ const ja = {
       color: '色',
       colorB: 'B — 黒',
       colorW: 'W — 白',
+      reverse: '反転',
     },
     circle: {
       diameter: '直径 (ドット)',
diff --git a/src/locales/ko.ts b/src/locales/ko.ts
index 9a2e8cc3..646286f4 100644
--- a/src/locales/ko.ts
+++ b/src/locales/ko.ts
@@ -266,6 +266,7 @@ const ko = {
       color: '색상',
       colorB: 'B — 검정',
       colorW: 'W — 흰색',
+      reverse: '반전',
     },
     circle: {
       diameter: '지름 (도트)',
diff --git a/src/locales/lt.ts b/src/locales/lt.ts
index 6f6152e8..6c829ae8 100644
--- a/src/locales/lt.ts
+++ b/src/locales/lt.ts
@@ -266,6 +266,7 @@ const lt = {
       color: 'Spalva',
       colorB: 'B — Juoda',
       colorW: 'W — Balta',
+      reverse: 'Apversti',
     },
     circle: {
       diameter: 'Skersmuo (taškai)',
diff --git a/src/locales/lv.ts b/src/locales/lv.ts
index 33d908a1..70e8e5e2 100644
--- a/src/locales/lv.ts
+++ b/src/locales/lv.ts
@@ -266,6 +266,7 @@ const lv = {
       color: 'Krāsa',
       colorB: 'B — Melna',
       colorW: 'W — Balta',
+      reverse: 'Apgriezt',
     },
     circle: {
       diameter: 'Diametrs (punkti)',
diff --git a/src/locales/nl.ts b/src/locales/nl.ts
index 0e3b2dad..7f5a71b6 100644
--- a/src/locales/nl.ts
+++ b/src/locales/nl.ts
@@ -266,6 +266,7 @@ const nl = {
       color: 'Kleur',
       colorB: 'B — Zwart',
       colorW: 'W — Wit',
+      reverse: 'Inverteren',
     },
     circle: {
       diameter: 'Diameter (dots)',
diff --git a/src/locales/no.ts b/src/locales/no.ts
index beddc15c..83262d4f 100644
--- a/src/locales/no.ts
+++ b/src/locales/no.ts
@@ -266,6 +266,7 @@ const no = {
       color: 'Farge',
       colorB: 'B — Svart',
       colorW: 'W — Hvit',
+      reverse: 'Inverter',
     },
     circle: {
       diameter: 'Diameter (punkter)',
diff --git a/src/locales/pl.ts b/src/locales/pl.ts
index dd0f6554..c7c36c38 100644
--- a/src/locales/pl.ts
+++ b/src/locales/pl.ts
@@ -266,6 +266,7 @@ const pl = {
       color: 'Kolor',
       colorB: 'B — Czarny',
       colorW: 'W — Biały',
+      reverse: 'Odwróć',
     },
     circle: {
       diameter: 'Średnica (punkty)',
diff --git a/src/locales/pt.ts b/src/locales/pt.ts
index fcad8126..98b178c1 100644
--- a/src/locales/pt.ts
+++ b/src/locales/pt.ts
@@ -266,6 +266,7 @@ const pt = {
       color: 'Cor',
       colorB: 'B — Preto',
       colorW: 'W — Branco',
+      reverse: 'Inverter',
     },
     circle: {
       diameter: 'Diâmetro (pontos)',
diff --git a/src/locales/ro.ts b/src/locales/ro.ts
index e880a9ef..8c885e90 100644
--- a/src/locales/ro.ts
+++ b/src/locales/ro.ts
@@ -266,6 +266,7 @@ const ro = {
       color: 'Culoare',
       colorB: 'B — Negru',
       colorW: 'W — Alb',
+      reverse: 'Inversează',
     },
     circle: {
       diameter: 'Diametru (puncte)',
diff --git a/src/locales/sk.ts b/src/locales/sk.ts
index c240fae0..20f7f339 100644
--- a/src/locales/sk.ts
+++ b/src/locales/sk.ts
@@ -266,6 +266,7 @@ const sk = {
       color: 'Farba',
       colorB: 'B — Čierna',
       colorW: 'W — Biela',
+      reverse: 'Invertovať',
     },
     circle: {
       diameter: 'Priemer (body)',
diff --git a/src/locales/sl.ts b/src/locales/sl.ts
index 8142bcaf..51cbc744 100644
--- a/src/locales/sl.ts
+++ b/src/locales/sl.ts
@@ -266,6 +266,7 @@ const sl = {
       color: 'Barva',
       colorB: 'B — Črna',
       colorW: 'W — Bela',
+      reverse: 'Obrni',
     },
     circle: {
       diameter: 'Premer (točke)',
diff --git a/src/locales/sr.ts b/src/locales/sr.ts
index 15cf33d7..ef4340d6 100644
--- a/src/locales/sr.ts
+++ b/src/locales/sr.ts
@@ -266,6 +266,7 @@ const sr = {
       color: 'Boja',
       colorB: 'B — Crna',
       colorW: 'W — Bela',
+      reverse: 'Инвертуј',
     },
     circle: {
       diameter: 'Пречник (тачке)',
diff --git a/src/locales/sv.ts b/src/locales/sv.ts
index 92784b4a..a993a888 100644
--- a/src/locales/sv.ts
+++ b/src/locales/sv.ts
@@ -266,6 +266,7 @@ const sv = {
       color: 'Färg',
       colorB: 'B — Svart',
       colorW: 'W — Vit',
+      reverse: 'Invertera',
     },
     circle: {
       diameter: 'Diameter (punkter)',
diff --git a/src/locales/tr.ts b/src/locales/tr.ts
index b374b9a1..8bc73384 100644
--- a/src/locales/tr.ts
+++ b/src/locales/tr.ts
@@ -266,6 +266,7 @@ const tr = {
       color: 'Renk',
       colorB: 'B — Siyah',
       colorW: 'W — Beyaz',
+      reverse: 'Tersine çevir',
     },
     circle: {
       diameter: 'Çap (nokta)',
diff --git a/src/locales/zh-hans.ts b/src/locales/zh-hans.ts
index 552f710b..46609ec0 100644
--- a/src/locales/zh-hans.ts
+++ b/src/locales/zh-hans.ts
@@ -266,6 +266,7 @@ const zhHans = {
       color: '颜色',
       colorB: 'B — 黑色',
       colorW: 'W — 白色',
+      reverse: '反转',
     },
     circle: {
       diameter: '直径 (点)',
diff --git a/src/locales/zh-hant.ts b/src/locales/zh-hant.ts
index 657de2e4..49d456c6 100644
--- a/src/locales/zh-hant.ts
+++ b/src/locales/zh-hant.ts
@@ -266,6 +266,7 @@ const zhHant = {
       color: '顏色',
       colorB: 'B — 黑色',
       colorW: 'W — 白色',
+      reverse: '反轉',
     },
     circle: {
       diameter: '直徑 (點)',
diff --git a/src/registry/ellipse.tsx b/src/registry/ellipse.tsx
index 3930b29d..3a987775 100644
--- a/src/registry/ellipse.tsx
+++ b/src/registry/ellipse.tsx
@@ -11,10 +11,15 @@ export interface EllipseProps {
   thickness: number;
   filled: boolean;
   color: 'B' | 'W';
-  /** When true, resize keeps width === height. Set by the "Circle"
-   *  palette entry and by the parser when an object round-trips through
-   *  ^GC. Used by the transformer to force uniform scale anchors. */
+  /** When true, resize keeps width === height. Set by the parser when
+   *  an object round-trips through ^GC, by the "Circle" Properties-
+   *  Panel toggle, or by the user. The transformer reads this to
+   *  force uniform scale anchors. */
   lockAspect?: boolean;
+  /** Field-level inversion via `^LRY`/`^LRN` wrap on emit. Round-trips
+   *  through the parser's `^LR` state and matches the box/line/text
+   *  reverse semantics. */
+  reverse?: boolean;
 }
 
 export const ellipse: ObjectTypeDefinition<EllipseProps> = {
@@ -54,7 +59,13 @@ export const ellipse: ObjectTypeDefinition<EllipseProps> = {
       p.width === p.height
         ? `^GC${p.width},${thick},${p.color}`
         : `^GE${p.width},${p.height},${thick},${p.color}`;
-    return [fieldPos(obj), cmd, `^FS`].join('');
+    return [
+      p.reverse ? '^LRY' : '',
+      fieldPos(obj),
+      cmd,
+      '^FS',
+      p.reverse ? '^LRN' : '',
+    ].filter(Boolean).join('');
   },
 
   PropertiesPanel: ({ obj, onChange }) => {
@@ -142,6 +153,16 @@ export const ellipse: ObjectTypeDefinition<EllipseProps> = {
             <option value="W">{t.registry.ellipse.colorW}</option>
           </select>
         </div>
+
+        <label className="flex items-center gap-2 cursor-pointer">
+          <input
+            type="checkbox"
+            className="accent-accent"
+            checked={p.reverse ?? false}
+            onChange={(e) => onChange({ reverse: e.target.checked })}
+          />
+          <span className={labelCls}>{t.registry.ellipse.reverse}</span>
+        </label>
       </div>
     );
   },

From 432ec6b901990e2af89f6401e14b8c37823dfd4e Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 20 May 2026 23:19:44 +0200
Subject: [PATCH 4/5] feat(canvas): paint inverted ellipses with the same
 difference blend as box

The ellipse renderer never adopted the reverse-aware fill / stroke
swap and globalCompositeOperation='difference' that box uses. ZPL
output flipped correctly via ^LRY/^LRN but the canvas kept drawing
the original colours, so the editor and Labelary disagreed visually
for any reversed ellipse / circle. Pulls the same isReverse branch
into the ellipse path.
---
 src/components/Canvas/KonvaObject.tsx | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/src/components/Canvas/KonvaObject.tsx b/src/components/Canvas/KonvaObject.tsx
index 0468e9c0..d7f1cf05 100644
--- a/src/components/Canvas/KonvaObject.tsx
+++ b/src/components/Canvas/KonvaObject.tsx
@@ -403,7 +403,6 @@ function KonvaObjectInner({
     const h = dotsToPx(p.height, scale, dpmm);
     const rx = w / 2;
     const ry = h / 2;
-    const stroke = p.color === "B" ? "#000000" : "#cccccc";
     const strokeWidth = Math.max(dotsToPx(p.thickness, scale, dpmm), 0.5);
     // Option-A geometry — same outlineInset() definition as the box
     // path so the firmware's clamp-to-solid rule stays consistent
@@ -412,14 +411,25 @@ function KonvaObjectInner({
     const renderFilled = insetGeom.renderFilled;
     const insetRx = insetGeom.width / 2;
     const insetRy = insetGeom.height / 2;
-    const fill = renderFilled
-      ? p.color === "B"
-        ? "#000000"
+    // Reverse rendering mirrors the box path (see the long comment
+    // there). The difference-blend produces the print-correct knockout
+    // both on the white label and over any darker shape underneath;
+    // the fill / stroke swap keeps a thick outline ellipse from
+    // banding when filled + reverse coincide.
+    const isReverse = !!p.reverse;
+    const shapeColor = p.color === "B" ? "#000000" : "#cccccc";
+    const stroke = isReverse
+      ? renderFilled
+        ? "transparent"
         : "#ffffff"
-      : "transparent";
-    // Group-at-top-left wrapper mirrors the box path: keeps the body's
-    // own stroke + thickness while a separate EllipseSelectionOverlay
-    // traces the outer bbox in the selection colour.
+      : shapeColor;
+    const fill = isReverse
+      ? renderFilled
+        ? "#ffffff"
+        : "transparent"
+      : renderFilled
+        ? shapeColor
+        : "transparent";
     return (
       <Group
         id={obj.id}
@@ -439,6 +449,7 @@ function KonvaObjectInner({
           strokeWidth={renderFilled ? 0 : strokeWidth}
           strokeScaleEnabled={false}
           fill={fill}
+          globalCompositeOperation={isReverse ? "difference" : "source-over"}
         />
         {isSelected && (
           <EllipseSelectionOverlay rx={rx} ry={ry} color={colors.selection} />

From bb09efc5251020ba40d5b2525f1ea856aa3e20a7 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 20 May 2026 23:26:25 +0200
Subject: [PATCH 5/5] refactor(reverse): extract emit and paint helpers, drop
 duplication
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Two helpers replace the inline reverse-handling that had drifted into
four registry files and two canvas render paths:

- wrapReverse(reverse, body) in registry/zplHelpers wraps a field body
  in ^LRY/^LRN. Box, ellipse, line, and text emit through it instead
  of inlining the conditional pair. Line's previous lr[0]/lr[1] split
  collapses into one wrap per branch.
- reverseShapeStyle(reverse, color, renderFilled) in Canvas/ returns
  stroke / fill / globalCompositeOperation for the box and ellipse
  render paths. The colour table and the difference-blend stay in one
  place so a future tweak doesn't have to keep two render paths in
  sync. The long comment explaining the special-cases (filled +
  reverse banding, white-fill grey workaround) moves onto the helper.

Line's canvas path stays separate — it only needs a stroke colour, no
fill or blend, so factoring it into the same helper would dilute the
signature for no shared logic.
---
 src/components/Canvas/KonvaObject.tsx      | 74 +++++-----------------
 src/components/Canvas/reverseShapeStyle.ts | 47 ++++++++++++++
 src/registry/box.tsx                       | 13 ++--
 src/registry/ellipse.tsx                   | 10 +--
 src/registry/line.tsx                      | 17 +++--
 src/registry/text.tsx                      | 12 +---
 src/registry/zplHelpers.ts                 |  8 +++
 7 files changed, 95 insertions(+), 86 deletions(-)
 create mode 100644 src/components/Canvas/reverseShapeStyle.ts

diff --git a/src/components/Canvas/KonvaObject.tsx b/src/components/Canvas/KonvaObject.tsx
index d7f1cf05..19eab610 100644
--- a/src/components/Canvas/KonvaObject.tsx
+++ b/src/components/Canvas/KonvaObject.tsx
@@ -6,6 +6,7 @@ import { ImageObject } from "./ImageObject";
 import type Konva from "konva";
 import { dotsToPx, pxToDots } from "../../lib/coordinates";
 import { outlineInset } from "../../lib/shapeGeometry";
+import { reverseShapeStyle } from "./reverseShapeStyle";
 import { useColorScheme } from "../../lib/useColorScheme";
 import { useLabelStore } from "../../store/labelStore";
 import { ZPL_FONT_HEIGHT_TO_CSS_RATIO } from "./textPositionTransforms";
@@ -312,42 +313,15 @@ function KonvaObjectInner({
       ? cornerRadius
       : Math.max(0, cornerRadius - strokeWidth / 2);
 
-    // Inverted (^LRY) regions print as a knockout. The difference-blend
-    // body renders print-correctly: on the white label it produces black
-    // (white-on-white inverted = black ink in print), and over darker
-    // shapes it inverts those pixels — matching what Zebra firmware
-    // actually prints. The body keeps that mode even while selected so
-    // the inversion visualisation doesn't disappear and hide whatever
-    // is layered behind. The selection outline is rendered as a separate
-    // overlay rect with normal blending.
-    //
-    // Special-cases:
-    //  - reverse + filled drops the body stroke. Konva renders fill then
-    //    stroke; with the difference blend the fill flips the destination
-    //    to black and the (white) stroke then flips back to white inside
-    //    the rect, producing a b/w/b banding artefact. The stroke and
-    //    fill carry the same colour anyway so dropping it is visually
-    //    identical without the artefact.
-    //  - colour W filled (non-reverse) uses the light-grey shape colour
-    //    for the fill too, otherwise white-on-white would make filled
-    //    and outlined indistinguishable on canvas.
-    const isReverse = !!p.reverse;
-    const shapeColor = p.color === "B" ? "#000000" : "#cccccc";
-    // `renderFilled` includes the firmware clamp-to-solid case, so a
-    // very-thick outline picks the filled fill/stroke pair instead of
-    // collapsing into a degenerate inset rect.
-    const stroke = isReverse
-      ? renderFilled
-        ? "transparent"
-        : "#ffffff"
-      : shapeColor;
-    const fill = isReverse
-      ? renderFilled
-        ? "#ffffff"
-        : "transparent"
-      : renderFilled
-        ? shapeColor
-        : "transparent";
+    // Inverted (^LRY) paint is delegated to reverseShapeStyle so box
+    // and ellipse share the same colour rules — the helper covers the
+    // stroke/fill swap for filled outlines (banding workaround) and
+    // the difference-blend that produces the print-correct knockout.
+    const { stroke, fill, globalCompositeOperation } = reverseShapeStyle(
+      p.reverse,
+      p.color,
+      renderFilled,
+    );
     // Wrap body + selection overlay in a draggable Group so both move
     // together during a drag — without this the selection-stroke rect
     // stays at the start position while the body translates, leaving a
@@ -379,7 +353,7 @@ function KonvaObjectInner({
           strokeScaleEnabled={false}
           fill={fill}
           cornerRadius={insetCornerRadius}
-          globalCompositeOperation={isReverse ? "difference" : "source-over"}
+          globalCompositeOperation={globalCompositeOperation}
         />
         {isSelected && (
           <SelectionOverlay
@@ -411,25 +385,11 @@ function KonvaObjectInner({
     const renderFilled = insetGeom.renderFilled;
     const insetRx = insetGeom.width / 2;
     const insetRy = insetGeom.height / 2;
-    // Reverse rendering mirrors the box path (see the long comment
-    // there). The difference-blend produces the print-correct knockout
-    // both on the white label and over any darker shape underneath;
-    // the fill / stroke swap keeps a thick outline ellipse from
-    // banding when filled + reverse coincide.
-    const isReverse = !!p.reverse;
-    const shapeColor = p.color === "B" ? "#000000" : "#cccccc";
-    const stroke = isReverse
-      ? renderFilled
-        ? "transparent"
-        : "#ffffff"
-      : shapeColor;
-    const fill = isReverse
-      ? renderFilled
-        ? "#ffffff"
-        : "transparent"
-      : renderFilled
-        ? shapeColor
-        : "transparent";
+    const { stroke, fill, globalCompositeOperation } = reverseShapeStyle(
+      p.reverse,
+      p.color,
+      renderFilled,
+    );
     return (
       <Group
         id={obj.id}
@@ -449,7 +409,7 @@ function KonvaObjectInner({
           strokeWidth={renderFilled ? 0 : strokeWidth}
           strokeScaleEnabled={false}
           fill={fill}
-          globalCompositeOperation={isReverse ? "difference" : "source-over"}
+          globalCompositeOperation={globalCompositeOperation}
         />
         {isSelected && (
           <EllipseSelectionOverlay rx={rx} ry={ry} color={colors.selection} />
diff --git a/src/components/Canvas/reverseShapeStyle.ts b/src/components/Canvas/reverseShapeStyle.ts
new file mode 100644
index 00000000..2cb8cb6f
--- /dev/null
+++ b/src/components/Canvas/reverseShapeStyle.ts
@@ -0,0 +1,47 @@
+/**
+ * Per-shape paint values for the field-level `^LR` (reverse) state.
+ *
+ * Box and ellipse share the same paint rules — black/white knockout via
+ * a `difference` blend, with a fill/stroke swap so a filled outline
+ * doesn't band when the stroke flips to white and the fill flips back
+ * to black. The two render paths agreed in the editor by coincidence;
+ * pulling the colour table out of both call sites makes that agreement
+ * explicit and stops the two from drifting apart on the next colour
+ * tweak.
+ *
+ * Line has its own simpler variant (stroke-only, no fill) and stays
+ * separate.
+ */
+
+export interface ReverseShapeStyle {
+  stroke: string;
+  fill: string;
+  /** Konva's `globalCompositeOperation`. `difference` produces the
+   *  print-correct knockout on the white label and inverts darker
+   *  shapes underneath; `source-over` is the default upright paint. */
+  globalCompositeOperation: "difference" | "source-over";
+}
+
+export function reverseShapeStyle(
+  reverse: boolean | undefined,
+  color: "B" | "W",
+  renderFilled: boolean,
+): ReverseShapeStyle {
+  const isReverse = !!reverse;
+  const shapeColor = color === "B" ? "#000000" : "#cccccc";
+  return {
+    stroke: isReverse
+      ? renderFilled
+        ? "transparent"
+        : "#ffffff"
+      : shapeColor,
+    fill: isReverse
+      ? renderFilled
+        ? "#ffffff"
+        : "transparent"
+      : renderFilled
+        ? shapeColor
+        : "transparent",
+    globalCompositeOperation: isReverse ? "difference" : "source-over",
+  };
+}
diff --git a/src/registry/box.tsx b/src/registry/box.tsx
index a793ca83..4ac1c44f 100644
--- a/src/registry/box.tsx
+++ b/src/registry/box.tsx
@@ -1,7 +1,7 @@
 import type { ObjectTypeDefinition } from '../types/ObjectType';
 import { useT } from '../lib/useT';
 import { inputCls, labelCls } from '../components/Properties/styles';
-import { fieldPos } from './zplHelpers';
+import { fieldPos, wrapReverse } from './zplHelpers';
 import { commitWidthHeightTransform } from './transformHelpers';
 import { NumberInput } from '../components/Properties/NumberInput';
 
@@ -42,13 +42,10 @@ export const box: ObjectTypeDefinition<BoxProps> = {
     const t = p.filled
       ? Math.max(p.thickness, solidThreshold)
       : p.thickness;
-    return [
-      p.reverse ? '^LRY' : '',
-      fieldPos(obj),
-      `^GB${p.width},${p.height},${t},${p.color},${p.rounding}`,
-      '^FS',
-      p.reverse ? '^LRN' : '',
-    ].filter(Boolean).join('');
+    return wrapReverse(
+      p.reverse,
+      `${fieldPos(obj)}^GB${p.width},${p.height},${t},${p.color},${p.rounding}^FS`,
+    );
   },
 
   PropertiesPanel: ({ obj, onChange }) => {
diff --git a/src/registry/ellipse.tsx b/src/registry/ellipse.tsx
index 3a987775..4138e441 100644
--- a/src/registry/ellipse.tsx
+++ b/src/registry/ellipse.tsx
@@ -2,7 +2,7 @@ import type { ObjectTypeDefinition } from '../types/ObjectType';
 import { useT } from '../lib/useT';
 import { inputCls, labelCls } from '../components/Properties/styles';
 import { NumberInput } from '../components/Properties/NumberInput';
-import { fieldPos } from './zplHelpers';
+import { fieldPos, wrapReverse } from './zplHelpers';
 import { commitWidthHeightTransform } from './transformHelpers';
 
 export interface EllipseProps {
@@ -59,13 +59,7 @@ export const ellipse: ObjectTypeDefinition<EllipseProps> = {
       p.width === p.height
         ? `^GC${p.width},${thick},${p.color}`
         : `^GE${p.width},${p.height},${thick},${p.color}`;
-    return [
-      p.reverse ? '^LRY' : '',
-      fieldPos(obj),
-      cmd,
-      '^FS',
-      p.reverse ? '^LRN' : '',
-    ].filter(Boolean).join('');
+    return wrapReverse(p.reverse, `${fieldPos(obj)}${cmd}^FS`);
   },
 
   PropertiesPanel: ({ obj, onChange }) => {
diff --git a/src/registry/line.tsx b/src/registry/line.tsx
index 7f91e1e8..b1a98432 100644
--- a/src/registry/line.tsx
+++ b/src/registry/line.tsx
@@ -3,6 +3,7 @@ import { useT } from '../lib/useT';
 import { useLabelStore } from '../store/labelStore';
 import { inputCls, labelCls } from '../components/Properties/styles';
 import { NumberInput } from '../components/Properties/NumberInput';
+import { wrapReverse } from './zplHelpers';
 
 export interface LineProps {
   /** Angle in degrees, 0 = rightward horizontal, clockwise positive (screen coords). */
@@ -85,21 +86,26 @@ export const line: ObjectTypeDefinition<LineProps> = {
     const t = p.thickness;
     const l = p.length;
     const a = ((p.angle % 360) + 360) % 360; // normalise to [0, 360)
-    const lr = p.reverse ? ['^LRY', '^LRN'] : ['', ''];
 
     // Pure horizontal — angle 180 means the line extends LEFT from (obj.x, obj.y),
     // so the ^GB box must start at (obj.x - l) to overlap the same pixels.
     if (a === 0 || a === 180) {
       const bx = a === 180 ? obj.x - l : obj.x;
       const cmd = obj.positionType === 'FT' ? 'FT' : 'FO';
-      return `${lr[0]}^${cmd}${bx},${obj.y}^GB${l},${t},${t},${p.color},0^FS${lr[1]}`;
+      return wrapReverse(
+        p.reverse,
+        `^${cmd}${bx},${obj.y}^GB${l},${t},${t},${p.color},0^FS`,
+      );
     }
     // Pure vertical — angle 270 means the line extends UP from (obj.x, obj.y),
     // so the ^GB box must start at (obj.x, obj.y - l).
     if (a === 90 || a === 270) {
       const by = a === 270 ? obj.y - l : obj.y;
       const cmd = obj.positionType === 'FT' ? 'FT' : 'FO';
-      return `${lr[0]}^${cmd}${obj.x},${by}^GB${t},${l},${t},${p.color},0^FS${lr[1]}`;
+      return wrapReverse(
+        p.reverse,
+        `^${cmd}${obj.x},${by}^GB${t},${l},${t},${p.color},0^FS`,
+      );
     }
 
     // Diagonal — use ^GD (bounding-box diagonal command)
@@ -111,7 +117,10 @@ export const line: ObjectTypeDefinition<LineProps> = {
     const orientation = dx * dy >= 0 ? 'L' : 'R';
     const boxX = obj.x + (dx < 0 ? Math.round(dx) : 0);
     const boxY = obj.y + (dy < 0 ? Math.round(dy) : 0);
-    return `${lr[0]}^FO${boxX},${boxY}^GD${w},${h},${t},${p.color},${orientation}^FS${lr[1]}`;
+    return wrapReverse(
+      p.reverse,
+      `^FO${boxX},${boxY}^GD${w},${h},${t},${p.color},${orientation}^FS`,
+    );
   },
 
   PropertiesPanel: ({ obj, onChange }) => {
diff --git a/src/registry/text.tsx b/src/registry/text.tsx
index f2b47fe9..ca5c9b65 100644
--- a/src/registry/text.tsx
+++ b/src/registry/text.tsx
@@ -2,7 +2,7 @@ import { useRef, useState, useCallback } from "react";
 import type { ObjectTypeDefinition } from "../types/ObjectType";
 import { useT } from "../lib/useT";
 import { inputCls, labelCls } from "../components/Properties/styles";
-import { textFieldPos, fdField, resolveFontCmd } from "./zplHelpers";
+import { textFieldPos, fdField, resolveFontCmd, wrapReverse } from "./zplHelpers";
 import { effectiveScale } from "./transformHelpers";
 import { getFont, loadFontFile } from "../lib/fontCache";
 import { getAvailableFontIds, stripDrivePrefix } from "../lib/customFonts";
@@ -68,16 +68,10 @@ export const text: ObjectTypeDefinition<TextProps> = {
     const fbCmd = p.blockWidth
       ? `^FB${p.blockWidth},${p.blockLines ?? 1},${p.blockLineSpacing ?? 0},${p.blockJustify ?? "L"},0`
       : "";
-    return [
-      p.reverse ? "^LRY" : "",
-      textFieldPos(obj),
-      fontCmd,
-      fbCmd,
-      fdField(p.content),
-      p.reverse ? "^LRN" : "",
-    ]
+    const body = [textFieldPos(obj), fontCmd, fbCmd, fdField(p.content)]
       .filter(Boolean)
       .join("");
+    return wrapReverse(p.reverse, body);
   },
 
   PropertiesPanel: ({ obj, onChange }) => {
diff --git a/src/registry/zplHelpers.ts b/src/registry/zplHelpers.ts
index 4aeff298..70c5d4a7 100644
--- a/src/registry/zplHelpers.ts
+++ b/src/registry/zplHelpers.ts
@@ -9,6 +9,14 @@ export function fieldPos(obj: LabelObjectBase): string {
   return `^${cmd}${obj.x},${obj.y}`;
 }
 
+/** Wrap a field body in `^LRY` / `^LRN` when `reverse` is true. Field-
+ *  level inversion: every shape / text type that supports a `reverse`
+ *  prop emits via this helper so the wrap shape stays consistent and
+ *  parser-symmetric (the parser's ^LR state flips back at ^LRN). */
+export function wrapReverse(reverse: boolean | undefined, body: string): string {
+  return reverse ? `^LRY${body}^LRN` : body;
+}
+
 interface TextLikeObjForFieldPos extends LabelObjectBase {
   props: { fontHeight: number; rotation: "N" | "R" | "I" | "B" };
 }