From db49d843680363a89812385a1153b732394ae79d Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:06:12 +0200
Subject: [PATCH 01/20] feat(registry): add rotation prop to all barcodes (1D +
 2D)

Every barcode symbology gains a rotation field of type 'N'|'R'|'I'|'B'
that maps directly to the orientation slot of its ZPL command (the
hardcoded N is replaced with p.rotation). Defaults to N so existing
labels behave unchanged.

The Properties panel exposes a shared RotationSelect that reuses the
text rotation i18n keys (rotationN/R/I/B), so no new locale strings.
Test fixtures and registry assertions are updated to carry rotation.
---
 .../Canvas/transformPosition.test.ts          |  2 +-
 src/components/Properties/RotationSelect.tsx  | 26 +++++++++++
 src/registry/aztec.tsx                        |  8 +++-
 src/registry/barcode1d.tsx                    |  9 ++++
 src/registry/codabar.tsx                      |  2 +-
 src/registry/codablock.tsx                    |  8 +++-
 src/registry/code11.tsx                       |  2 +-
 src/registry/code128.tsx                      |  8 +++-
 src/registry/code39.tsx                       |  8 +++-
 src/registry/code93.tsx                       |  2 +-
 src/registry/datamatrix.tsx                   |  8 +++-
 src/registry/ean13.tsx                        |  8 +++-
 src/registry/ean8.tsx                         |  2 +-
 src/registry/gs1databar.tsx                   |  2 +-
 src/registry/industrial2of5.tsx               |  2 +-
 src/registry/interleaved2of5.tsx              |  2 +-
 src/registry/logmars.tsx                      |  2 +-
 src/registry/micropdf417.tsx                  |  8 +++-
 src/registry/msi.tsx                          |  2 +-
 src/registry/pdf417.tsx                       |  8 +++-
 src/registry/planet.tsx                       |  2 +-
 src/registry/plessey.tsx                      |  2 +-
 src/registry/postal.tsx                       |  2 +-
 src/registry/qrcode.tsx                       |  8 +++-
 src/registry/registry.test.ts                 | 39 ++++++++++++----
 src/registry/rotation.ts                      | 12 +++++
 src/registry/standard2of5.tsx                 |  2 +-
 src/registry/upca.tsx                         |  2 +-
 src/registry/upce.tsx                         |  2 +-
 src/test/testModels.ts                        | 46 ++++++++++++-------
 30 files changed, 186 insertions(+), 50 deletions(-)
 create mode 100644 src/components/Properties/RotationSelect.tsx
 create mode 100644 src/registry/rotation.ts

diff --git a/src/components/Canvas/transformPosition.test.ts b/src/components/Canvas/transformPosition.test.ts
index bae49176..cfb78fd7 100644
--- a/src/components/Canvas/transformPosition.test.ts
+++ b/src/components/Canvas/transformPosition.test.ts
@@ -10,7 +10,7 @@ const qrFo: LabelObject = {
   y: 0,
   rotation: 0,
   positionType: "FO",
-  props: { content: "x", magnification: 4, errorCorrection: "Q" },
+  props: { content: "x", magnification: 4, errorCorrection: "Q", rotation: "N" },
 };
 
 const ellipse: LabelObject = {
diff --git a/src/components/Properties/RotationSelect.tsx b/src/components/Properties/RotationSelect.tsx
new file mode 100644
index 00000000..478dc9ea
--- /dev/null
+++ b/src/components/Properties/RotationSelect.tsx
@@ -0,0 +1,26 @@
+import { ZPL_ROTATIONS, isZplRotation, type ZplRotation } from '../../registry/rotation';
+import { useT } from '../../lib/useT';
+import { inputCls, labelCls } from './styles';
+
+interface Props {
+  value: ZplRotation;
+  onChange: (next: ZplRotation) => void;
+}
+
+export function RotationSelect({ value, onChange }: Props) {
+  const t = useT();
+  return (
+    <div className="flex flex-col gap-1">
+      <label className={labelCls}>{t.registry.text.rotation}</label>
+      <select
+        className={inputCls}
+        value={value}
+        onChange={(e) => isZplRotation(e.target.value) && onChange(e.target.value)}
+      >
+        {ZPL_ROTATIONS.map((r) => (
+          <option key={r} value={r}>{t.registry.text[`rotation${r}`]}</option>
+        ))}
+      </select>
+    </div>
+  );
+}
diff --git a/src/registry/aztec.tsx b/src/registry/aztec.tsx
index b759d4c7..e5751847 100644
--- a/src/registry/aztec.tsx
+++ b/src/registry/aztec.tsx
@@ -2,11 +2,14 @@ import type { ObjectTypeDefinition } from "../types/ObjectType";
 import { useT } from "../lib/useT";
 import { inputCls, labelCls } from "../components/Properties/styles";
 import { fieldPos, fdField } from "./zplHelpers";
+import { type ZplRotation } from "./rotation";
+import { RotationSelect } from "../components/Properties/RotationSelect";
 
 export interface AztecProps {
   content: string;
   magnification: number; // 1–10, module size in dots
   ecLevel: number; // 0 = auto, 1–99 error correction percentage, 201–232 for layers
+  rotation: ZplRotation;
 }
 
 export const aztec: ObjectTypeDefinition<AztecProps> = {
@@ -17,6 +20,7 @@ export const aztec: ObjectTypeDefinition<AztecProps> = {
     content: "1234567890",
     magnification: 4,
     ecLevel: 0,
+    rotation: 'N',
   },
   defaultSize: { width: 200, height: 200 },
 
@@ -26,7 +30,7 @@ export const aztec: ObjectTypeDefinition<AztecProps> = {
     // Also ^BO (alternate) — we use ^B0 as canonical
     return [
       fieldPos(obj),
-      `^B0N,${p.magnification},N,N,N,N`,
+      `^B0${p.rotation},${p.magnification},N,N,N,N`,
       fdField(p.content),
     ].join("");
   },
@@ -71,6 +75,8 @@ export const aztec: ObjectTypeDefinition<AztecProps> = {
             onChange={(e) => onChange({ ecLevel: Number(e.target.value) })}
           />
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/barcode1d.tsx b/src/registry/barcode1d.tsx
index 7c09932f..7d290913 100644
--- a/src/registry/barcode1d.tsx
+++ b/src/registry/barcode1d.tsx
@@ -4,6 +4,8 @@ import { inputCls, labelCls } from '../components/Properties/styles';
 import { fieldPos, fdField } from './zplHelpers';
 import { commitHeightTransform } from './transformHelpers';
 import { filterContent, type ContentSpec } from './contentSpec';
+import { type ZplRotation } from './rotation';
+import { RotationSelect } from '../components/Properties/RotationSelect';
 
 export interface Barcode1DProps {
   content: string;
@@ -11,6 +13,7 @@ export interface Barcode1DProps {
   moduleWidth: number;
   printInterpretation: boolean;
   checkDigit: boolean;
+  rotation: ZplRotation;
 }
 
 interface Barcode1DConfig {
@@ -58,6 +61,7 @@ export function createBarcode1D(config: Barcode1DConfig): ObjectTypeDefinition<B
       moduleWidth: 2,
       printInterpretation: !config.interpretationLocked,
       checkDigit: false,
+      rotation: 'N',
     },
     defaultSize: { width: 300, height: 120 },
     heightLocked: config.heightLocked,
@@ -148,6 +152,11 @@ export function createBarcode1D(config: Barcode1DConfig): ObjectTypeDefinition<B
               <span className={labelCls}>{loc.checkDigit}</span>
             </label>
           )}
+
+          <RotationSelect
+            value={p.rotation}
+            onChange={(rotation) => onChange({ rotation })}
+          />
         </div>
       );
     },
diff --git a/src/registry/codabar.tsx b/src/registry/codabar.tsx
index 7a3efefb..66e89674 100644
--- a/src/registry/codabar.tsx
+++ b/src/registry/codabar.tsx
@@ -12,6 +12,6 @@ export const codabar = createBarcode1D({
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
     const check = p.checkDigit ? "Y" : "N";
-    return `^BKN,${check},${p.height},${interp},N`;
+    return `^BK${p.rotation},${check},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/codablock.tsx b/src/registry/codablock.tsx
index 70af76dd..ec36ba2b 100644
--- a/src/registry/codablock.tsx
+++ b/src/registry/codablock.tsx
@@ -3,12 +3,15 @@ import { useT } from "../lib/useT";
 import { inputCls, labelCls } from "../components/Properties/styles";
 import { fieldPos, fdField } from "./zplHelpers";
 import { commitStacked2DTransform } from "./transformHelpers";
+import { type ZplRotation } from "./rotation";
+import { RotationSelect } from "../components/Properties/RotationSelect";
 
 export interface CodablockProps {
   content: string;
   moduleWidth: number; // bar width in dots
   rowHeight: number; // row height in dots
   securityLevel: "Y" | "N"; // security check
+  rotation: ZplRotation;
 }
 
 export const codablock: ObjectTypeDefinition<CodablockProps> = {
@@ -20,6 +23,7 @@ export const codablock: ObjectTypeDefinition<CodablockProps> = {
     moduleWidth: 2,
     rowHeight: 2,
     securityLevel: "Y",
+    rotation: 'N',
   },
   defaultSize: { width: 250, height: 120 },
 
@@ -31,7 +35,7 @@ export const codablock: ObjectTypeDefinition<CodablockProps> = {
     return [
       `^BY${p.moduleWidth}`,
       fieldPos(obj),
-      `^BBN,${p.rowHeight},${p.securityLevel}`,
+      `^BB${p.rotation},${p.rowHeight},${p.securityLevel}`,
       fdField(p.content),
     ]
       .filter(Boolean)
@@ -90,6 +94,8 @@ export const codablock: ObjectTypeDefinition<CodablockProps> = {
           />
           <span className={labelCls}>{loc.security}</span>
         </label>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/code11.tsx b/src/registry/code11.tsx
index 70d02f6c..218a816b 100644
--- a/src/registry/code11.tsx
+++ b/src/registry/code11.tsx
@@ -12,6 +12,6 @@ export const code11 = createBarcode1D({
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
     const check = p.checkDigit ? "Y" : "N";
-    return `^B1N,${check},${p.height},${interp},N`;
+    return `^B1${p.rotation},${check},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/code128.tsx b/src/registry/code128.tsx
index 4391724c..3225bfbe 100644
--- a/src/registry/code128.tsx
+++ b/src/registry/code128.tsx
@@ -3,6 +3,8 @@ import { useT } from '../lib/useT';
 import { inputCls, labelCls } from '../components/Properties/styles';
 import { fieldPos, fdField } from './zplHelpers';
 import { commitHeightTransform } from './transformHelpers';
+import { type ZplRotation } from './rotation';
+import { RotationSelect } from '../components/Properties/RotationSelect';
 
 export interface Code128Props {
   content: string;
@@ -10,6 +12,7 @@ export interface Code128Props {
   moduleWidth: number;
   printInterpretation: boolean;
   checkDigit: boolean;
+  rotation: ZplRotation;
 }
 
 export const code128: ObjectTypeDefinition<Code128Props> = {
@@ -22,6 +25,7 @@ export const code128: ObjectTypeDefinition<Code128Props> = {
     moduleWidth: 2,
     printInterpretation: true,
     checkDigit: false,
+    rotation: 'N',
   },
   defaultSize: { width: 300, height: 120 },
 
@@ -34,7 +38,7 @@ export const code128: ObjectTypeDefinition<Code128Props> = {
     return [
       `^BY${p.moduleWidth}`,
       fieldPos(obj),
-      `^BCN,${p.height},${interp},N,${check}`,
+      `^BC${p.rotation},${p.height},${interp},N,${check}`,
       fdField(p.content),
     ].filter(Boolean).join('');
   },
@@ -96,6 +100,8 @@ export const code128: ObjectTypeDefinition<Code128Props> = {
             <span className={labelCls}>{t.registry.code128.checkDigit}</span>
           </label>
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/code39.tsx b/src/registry/code39.tsx
index 114a5143..a57e0167 100644
--- a/src/registry/code39.tsx
+++ b/src/registry/code39.tsx
@@ -4,6 +4,8 @@ import { inputCls, labelCls } from '../components/Properties/styles';
 import { fieldPos, fdField } from './zplHelpers';
 import { commitHeightTransform } from './transformHelpers';
 import { filterContent, type ContentSpec } from './contentSpec';
+import { type ZplRotation } from './rotation';
+import { RotationSelect } from '../components/Properties/RotationSelect';
 
 const code39Spec: ContentSpec = { charset: '0-9A-Za-z\\-. $/+%' };
 
@@ -13,6 +15,7 @@ export interface Code39Props {
   moduleWidth: number;
   printInterpretation: boolean;
   checkDigit: boolean;
+  rotation: ZplRotation;
 }
 
 export const code39: ObjectTypeDefinition<Code39Props> = {
@@ -25,6 +28,7 @@ export const code39: ObjectTypeDefinition<Code39Props> = {
     moduleWidth: 2,
     printInterpretation: true,
     checkDigit: false,
+    rotation: 'N',
   },
   defaultSize: { width: 300, height: 120 },
 
@@ -37,7 +41,7 @@ export const code39: ObjectTypeDefinition<Code39Props> = {
     return [
       `^BY${p.moduleWidth}`,
       fieldPos(obj),
-      `^B3N,${check},${p.height},${interp},N`,
+      `^B3${p.rotation},${check},${p.height},${interp},N`,
       fdField(p.content),
     ].filter(Boolean).join('');
   },
@@ -99,6 +103,8 @@ export const code39: ObjectTypeDefinition<Code39Props> = {
             <span className={labelCls}>{t.registry.code39.checkDigit}</span>
           </label>
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/code93.tsx b/src/registry/code93.tsx
index 35c76b27..d815f1fa 100644
--- a/src/registry/code93.tsx
+++ b/src/registry/code93.tsx
@@ -11,6 +11,6 @@ export const code93 = createBarcode1D({
   zplCommand: (p) => {
     const interp = p.printInterpretation ? 'Y' : 'N';
     const check = p.checkDigit ? 'Y' : 'N';
-    return `^BAN,${p.height},${interp},N,${check}`;
+    return `^BA${p.rotation},${p.height},${interp},N,${check}`;
   },
 });
diff --git a/src/registry/datamatrix.tsx b/src/registry/datamatrix.tsx
index 3eb583f0..50232712 100644
--- a/src/registry/datamatrix.tsx
+++ b/src/registry/datamatrix.tsx
@@ -3,11 +3,14 @@ import { useT } from '../lib/useT';
 import { inputCls, labelCls } from '../components/Properties/styles';
 import { fieldPos, fdField } from './zplHelpers';
 import { clamp } from './transformHelpers';
+import { type ZplRotation } from './rotation';
+import { RotationSelect } from '../components/Properties/RotationSelect';
 
 export interface DataMatrixProps {
   content: string;
   dimension: number;   // module size in dots (1–12)
   quality: 0 | 50 | 80 | 140 | 200;  // 0 = auto
+  rotation: ZplRotation;
 }
 
 export const datamatrix: ObjectTypeDefinition<DataMatrixProps> = {
@@ -18,6 +21,7 @@ export const datamatrix: ObjectTypeDefinition<DataMatrixProps> = {
     content: '1234567890',
     dimension: 5,
     quality: 200,
+    rotation: 'N',
   },
   defaultSize: { width: 150, height: 150 },
 
@@ -29,7 +33,7 @@ export const datamatrix: ObjectTypeDefinition<DataMatrixProps> = {
     const p = obj.props;
     return [
       fieldPos(obj),
-      `^BXN,${p.dimension},${p.quality}`,
+      `^BX${p.rotation},${p.dimension},${p.quality}`,
       fdField(p.content),
     ].join('');
   },
@@ -74,6 +78,8 @@ export const datamatrix: ObjectTypeDefinition<DataMatrixProps> = {
             <option value={200}>{t.registry.datamatrix.quality200}</option>
           </select>
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/ean13.tsx b/src/registry/ean13.tsx
index e9244a8f..ea6894c8 100644
--- a/src/registry/ean13.tsx
+++ b/src/registry/ean13.tsx
@@ -4,6 +4,8 @@ import { inputCls, labelCls } from '../components/Properties/styles';
 import { fieldPos, fdField } from './zplHelpers';
 import { commitHeightTransform } from './transformHelpers';
 import { filterContent, type ContentSpec } from './contentSpec';
+import { type ZplRotation } from './rotation';
+import { RotationSelect } from '../components/Properties/RotationSelect';
 
 const ean13Spec: ContentSpec = { charset: '0-9', maxLength: 12 };
 
@@ -12,6 +14,7 @@ export interface Ean13Props {
   height: number;
   moduleWidth: number;
   printInterpretation: boolean;
+  rotation: ZplRotation;
 }
 
 export const ean13: ObjectTypeDefinition<Ean13Props> = {
@@ -23,6 +26,7 @@ export const ean13: ObjectTypeDefinition<Ean13Props> = {
     height: 100,
     moduleWidth: 2,
     printInterpretation: true,
+    rotation: 'N',
   },
   defaultSize: { width: 300, height: 120 },
 
@@ -34,7 +38,7 @@ export const ean13: ObjectTypeDefinition<Ean13Props> = {
     return [
       `^BY${p.moduleWidth}`,
       fieldPos(obj),
-      `^BEN,${p.height},${interp},N`,
+      `^BE${p.rotation},${p.height},${interp},N`,
       fdField(p.content),
     ].filter(Boolean).join('');
   },
@@ -87,6 +91,8 @@ export const ean13: ObjectTypeDefinition<Ean13Props> = {
           />
           <span className={labelCls}>{t.registry.ean13.printInterpretation}</span>
         </label>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/ean8.tsx b/src/registry/ean8.tsx
index 64a6b26e..91e51874 100644
--- a/src/registry/ean8.tsx
+++ b/src/registry/ean8.tsx
@@ -11,6 +11,6 @@ export const ean8 = createBarcode1D({
   contentSpec: { charset: '0-9', maxLength: 7 },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? 'Y' : 'N';
-    return `^B8N,${p.height},${interp},N`;
+    return `^B8${p.rotation},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/gs1databar.tsx b/src/registry/gs1databar.tsx
index 80a02376..022d53ba 100644
--- a/src/registry/gs1databar.tsx
+++ b/src/registry/gs1databar.tsx
@@ -18,6 +18,6 @@ export const gs1databar = createBarcode1D({
   zplCommand: (p) => {
     // ^BR{orientation},{symbology},{magnification},{separator},{height},{segments}
     // symbology 1 = omnidirectional
-    return `^BRN,1,${p.moduleWidth},2,${p.height},1`;
+    return `^BR${p.rotation},1,${p.moduleWidth},2,${p.height},1`;
   },
 });
diff --git a/src/registry/industrial2of5.tsx b/src/registry/industrial2of5.tsx
index 43647221..6fac1cda 100644
--- a/src/registry/industrial2of5.tsx
+++ b/src/registry/industrial2of5.tsx
@@ -11,6 +11,6 @@ export const industrial2of5 = createBarcode1D({
   contentSpec: { charset: '0-9' },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
-    return `^BIN,${p.height},${interp},N`;
+    return `^BI${p.rotation},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/interleaved2of5.tsx b/src/registry/interleaved2of5.tsx
index 8006a911..6310ebc3 100644
--- a/src/registry/interleaved2of5.tsx
+++ b/src/registry/interleaved2of5.tsx
@@ -12,6 +12,6 @@ export const interleaved2of5 = createBarcode1D({
   zplCommand: (p) => {
     const interp = p.printInterpretation ? 'Y' : 'N';
     const check = p.checkDigit ? 'Y' : 'N';
-    return `^B2N,${p.height},${interp},N,${check}`;
+    return `^B2${p.rotation},${p.height},${interp},N,${check}`;
   },
 });
diff --git a/src/registry/logmars.tsx b/src/registry/logmars.tsx
index 583ccef3..cb94e958 100644
--- a/src/registry/logmars.tsx
+++ b/src/registry/logmars.tsx
@@ -11,6 +11,6 @@ export const logmars = createBarcode1D({
   contentSpec: { charset: '0-9A-Za-z\\-. $/+%' },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
-    return `^BLN,${p.height},${interp}`;
+    return `^BL${p.rotation},${p.height},${interp}`;
   },
 });
diff --git a/src/registry/micropdf417.tsx b/src/registry/micropdf417.tsx
index c44214d2..9659a5dc 100644
--- a/src/registry/micropdf417.tsx
+++ b/src/registry/micropdf417.tsx
@@ -3,12 +3,15 @@ import { useT } from "../lib/useT";
 import { inputCls, labelCls } from "../components/Properties/styles";
 import { fieldPos, fdField } from "./zplHelpers";
 import { commitStacked2DTransform } from "./transformHelpers";
+import { type ZplRotation } from "./rotation";
+import { RotationSelect } from "../components/Properties/RotationSelect";
 
 export interface MicroPdf417Props {
   content: string;
   moduleWidth: number; // bar width in dots
   rowHeight: number; // row height in dots
   mode: number;
+  rotation: ZplRotation;
 }
 
 export const micropdf417: ObjectTypeDefinition<MicroPdf417Props> = {
@@ -20,6 +23,7 @@ export const micropdf417: ObjectTypeDefinition<MicroPdf417Props> = {
     moduleWidth: 2,
     rowHeight: 2,
     mode: 0,
+    rotation: 'N',
   },
   defaultSize: { width: 200, height: 100 },
 
@@ -31,7 +35,7 @@ export const micropdf417: ObjectTypeDefinition<MicroPdf417Props> = {
     return [
       `^BY${p.moduleWidth}`,
       fieldPos(obj),
-      `^BFN,${p.rowHeight},${p.mode}`,
+      `^BF${p.rotation},${p.rowHeight},${p.mode}`,
       fdField(p.content),
     ]
       .filter(Boolean)
@@ -90,6 +94,8 @@ export const micropdf417: ObjectTypeDefinition<MicroPdf417Props> = {
             onChange={(e) => onChange({ mode: Number(e.target.value) })}
           />
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/msi.tsx b/src/registry/msi.tsx
index f3f1f0e1..99876554 100644
--- a/src/registry/msi.tsx
+++ b/src/registry/msi.tsx
@@ -18,6 +18,6 @@ export const msi = createBarcode1D({
     // ^BM format: ^BM[o,e,h,f,g] — check digit (e) comes before height (h)
     // A=Mod10, B=Mod11, C=Mod10+Mod10, D=Mod11+Mod10, N=none
     const checkType = p.checkDigit ? "A" : "N";
-    return `^BMN,${checkType},${p.height},${interp},N`;
+    return `^BM${p.rotation},${checkType},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/pdf417.tsx b/src/registry/pdf417.tsx
index 9a22d7ef..cab3fad9 100644
--- a/src/registry/pdf417.tsx
+++ b/src/registry/pdf417.tsx
@@ -3,6 +3,8 @@ import { useT } from "../lib/useT";
 import { inputCls, labelCls } from "../components/Properties/styles";
 import { fieldPos, fdField } from "./zplHelpers";
 import { commitStacked2DTransform } from "./transformHelpers";
+import { type ZplRotation } from "./rotation";
+import { RotationSelect } from "../components/Properties/RotationSelect";
 
 export interface Pdf417Props {
   content: string;
@@ -10,6 +12,7 @@ export interface Pdf417Props {
   securityLevel: number; // 0–8
   columns: number; // 1–30, 0 = auto
   moduleWidth: number;
+  rotation: ZplRotation;
 }
 
 export const pdf417: ObjectTypeDefinition<Pdf417Props> = {
@@ -22,6 +25,7 @@ export const pdf417: ObjectTypeDefinition<Pdf417Props> = {
     securityLevel: 0,
     columns: 0,
     moduleWidth: 2,
+    rotation: 'N',
   },
   defaultSize: { width: 300, height: 150 },
 
@@ -32,7 +36,7 @@ export const pdf417: ObjectTypeDefinition<Pdf417Props> = {
     return [
       `^BY${p.moduleWidth}`,
       fieldPos(obj),
-      `^B7N,${p.rowHeight},${p.securityLevel},${p.columns},,,`,
+      `^B7${p.rotation},${p.rowHeight},${p.securityLevel},${p.columns},,,`,
       fdField(p.content),
     ]
       .filter(Boolean)
@@ -106,6 +110,8 @@ export const pdf417: ObjectTypeDefinition<Pdf417Props> = {
             />
           </div>
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/planet.tsx b/src/registry/planet.tsx
index f1c58520..01c4d57c 100644
--- a/src/registry/planet.tsx
+++ b/src/registry/planet.tsx
@@ -11,6 +11,6 @@ export const planet = createBarcode1D({
   contentSpec: { charset: '0-9' },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
-    return `^B5N,${p.height},${interp},N`;
+    return `^B5${p.rotation},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/plessey.tsx b/src/registry/plessey.tsx
index e592f98e..02659c79 100644
--- a/src/registry/plessey.tsx
+++ b/src/registry/plessey.tsx
@@ -14,6 +14,6 @@ export const plessey = createBarcode1D({
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
     const check = p.checkDigit ? "Y" : "N";
-    return `^BPN,${check},${p.height},${interp},N`;
+    return `^BP${p.rotation},${check},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/postal.tsx b/src/registry/postal.tsx
index 0179d435..b795a558 100644
--- a/src/registry/postal.tsx
+++ b/src/registry/postal.tsx
@@ -12,6 +12,6 @@ export const postal = createBarcode1D({
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
     // ^BZ{orientation},{height},{interp},{startStop}
-    return `^BZN,${p.height},${interp},N`;
+    return `^BZ${p.rotation},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/qrcode.tsx b/src/registry/qrcode.tsx
index 022ede6d..4d2fb81b 100644
--- a/src/registry/qrcode.tsx
+++ b/src/registry/qrcode.tsx
@@ -3,11 +3,14 @@ import { useT } from '../lib/useT';
 import { inputCls, labelCls } from '../components/Properties/styles';
 import { fieldPos, fdField } from './zplHelpers';
 import { clamp } from './transformHelpers';
+import { type ZplRotation } from './rotation';
+import { RotationSelect } from '../components/Properties/RotationSelect';
 
 export interface QrCodeProps {
   content: string;
   magnification: number;       // 1–10, dot size per module
   errorCorrection: 'H' | 'Q' | 'M' | 'L';
+  rotation: ZplRotation;
 }
 
 export const qrcode: ObjectTypeDefinition<QrCodeProps> = {
@@ -18,6 +21,7 @@ export const qrcode: ObjectTypeDefinition<QrCodeProps> = {
     content: 'https://example.com',
     magnification: 4,
     errorCorrection: 'Q',
+    rotation: 'N',
   },
   defaultSize: { width: 200, height: 200 },
 
@@ -29,7 +33,7 @@ export const qrcode: ObjectTypeDefinition<QrCodeProps> = {
     const p = obj.props;
     return [
       fieldPos(obj),
-      `^BQN,2,${p.magnification}`,
+      `^BQ${p.rotation},2,${p.magnification}`,
       fdField(`${p.errorCorrection}A,${p.content}`),
     ].join('');
   },
@@ -84,6 +88,8 @@ export const qrcode: ObjectTypeDefinition<QrCodeProps> = {
             <option value="H">{t.registry.qrcode.ecH}</option>
           </select>
         </div>
+
+        <RotationSelect value={p.rotation} onChange={(rotation) => onChange({ rotation })} />
       </div>
     );
   },
diff --git a/src/registry/registry.test.ts b/src/registry/registry.test.ts
index 6e693ed9..0574a576 100644
--- a/src/registry/registry.test.ts
+++ b/src/registry/registry.test.ts
@@ -178,7 +178,7 @@ describe('code128.toZPL', () => {
   it('emits ^BC and ^FD', () => {
     const zpl = def.toZPL(makeObj('code128', {
       content: 'ABCDEF', height: 100, moduleWidth: 2,
-      printInterpretation: true, checkDigit: false,
+      printInterpretation: true, checkDigit: false, rotation: 'N',
     }));
     expect(zpl).toContain('^BCN,100,Y,N,N');
     expect(zpl).toContain('^FDABCDEF^FS');
@@ -187,7 +187,7 @@ describe('code128.toZPL', () => {
   it('emits ^BY when moduleWidth is not 2', () => {
     const zpl = def.toZPL(makeObj('code128', {
       content: '123', height: 100, moduleWidth: 5,
-      printInterpretation: true, checkDigit: false,
+      printInterpretation: true, checkDigit: false, rotation: 'N',
     }));
     expect(zpl).toContain('^BY5');
   });
@@ -195,12 +195,33 @@ describe('code128.toZPL', () => {
   it('always emits ^BY to prevent ZPL state leaking to subsequent barcodes', () => {
     const zpl = def.toZPL(makeObj('code128', {
       content: '123', height: 100, moduleWidth: 2,
-      printInterpretation: true, checkDigit: false,
+      printInterpretation: true, checkDigit: false, rotation: 'N',
     }));
     expect(zpl).toContain('^BY2');
   });
 });
 
+// ── rotation ──────────────────────────────────────────────────────────────────
+
+describe('barcode rotation in ZPL output', () => {
+  type Rot = 'N' | 'R' | 'I' | 'B';
+  it.each<[string, string, Rot, Record<string, unknown>]>([
+    ['code128',    '^BCR,', 'R', { height: 100, moduleWidth: 2, printInterpretation: true, checkDigit: false }],
+    ['code39',     '^B3I,', 'I', { height: 100, moduleWidth: 2, printInterpretation: true, checkDigit: false }],
+    ['ean13',      '^BEB,', 'B', { height: 100, moduleWidth: 2, printInterpretation: true }],
+    ['qrcode',     '^BQR,', 'R', { magnification: 4, errorCorrection: 'Q' }],
+    ['datamatrix', '^BXI,', 'I', { dimension: 5, quality: 200 }],
+    ['pdf417',     '^B7B,', 'B', { rowHeight: 4, securityLevel: 0, columns: 0, moduleWidth: 2 }],
+    ['aztec',      '^B0R,', 'R', { magnification: 4, ecLevel: 0 }],
+    ['codabar',    '^BKR,', 'R', { height: 100, moduleWidth: 2, printInterpretation: true, checkDigit: false }],
+  ])('%s emits orientation in command param', (type, expected, rotation, baseProps) => {
+    const def = defined(ObjectRegistry[type]);
+    const content = type === 'ean13' ? '590123412345' : 'X';
+    const zpl = def.toZPL(makeObj(type, { content, ...baseProps, rotation }));
+    expect(zpl).toContain(expected);
+  });
+});
+
 // ── code39 ────────────────────────────────────────────────────────────────────
 
 describe('code39.toZPL', () => {
@@ -209,7 +230,7 @@ describe('code39.toZPL', () => {
   it('emits ^B3 barcode command', () => {
     const zpl = def.toZPL(makeObj('code39', {
       content: 'ABC', height: 100, moduleWidth: 2,
-      printInterpretation: true, checkDigit: false,
+      printInterpretation: true, checkDigit: false, rotation: 'N',
     }));
     expect(zpl).toContain('^B3');
     expect(zpl).toContain('^FDABC^FS');
@@ -223,7 +244,7 @@ describe('qrcode.toZPL', () => {
 
   it('emits ^BQ with magnification and ^FD with error correction prefix', () => {
     const zpl = def.toZPL(makeObj('qrcode', {
-      content: 'https://example.com', magnification: 6, errorCorrection: 'Q',
+      content: 'https://example.com', magnification: 6, errorCorrection: 'Q', rotation: 'N',
     }));
     expect(zpl).toContain('^BQN,2,6');
     expect(zpl).toContain('^FDQA,https://example.com^FS');
@@ -234,7 +255,7 @@ describe('qrcode.normalizeChanges', () => {
   const def = defined(ObjectRegistry['qrcode']);
   const normalize = defined(def.normalizeChanges);
   const baseObj = makeObj('qrcode', {
-    content: 'x', magnification: 4, errorCorrection: 'Q',
+    content: 'x', magnification: 4, errorCorrection: 'Q', rotation: 'N',
   });
 
   it('clamps negative y to 0 for ^FO', () => {
@@ -275,7 +296,7 @@ describe('datamatrix.toZPL', () => {
 
   it('emits ^BX with dimension and quality', () => {
     const zpl = def.toZPL(makeObj('datamatrix', {
-      content: 'DM123', dimension: 8, quality: 200,
+      content: 'DM123', dimension: 8, quality: 200, rotation: 'N',
     }));
     expect(zpl).toContain('^BXN,8,200');
     expect(zpl).toContain('^FDDM123^FS');
@@ -289,7 +310,7 @@ describe('pdf417.toZPL', () => {
 
   it('emits ^B7 with row height, security, and columns', () => {
     const zpl = def.toZPL(makeObj('pdf417', {
-      content: 'PDF', rowHeight: 10, securityLevel: 2, columns: 4, moduleWidth: 2,
+      content: 'PDF', rowHeight: 10, securityLevel: 2, columns: 4, moduleWidth: 2, rotation: 'N',
     }));
     expect(zpl).toContain('^B7N,10,2,4,,,');
     expect(zpl).toContain('^FDPDF^FS');
@@ -297,7 +318,7 @@ describe('pdf417.toZPL', () => {
 
   it('emits ^BY when moduleWidth is not 2', () => {
     const zpl = def.toZPL(makeObj('pdf417', {
-      content: 'X', rowHeight: 10, securityLevel: 0, columns: 0, moduleWidth: 3,
+      content: 'X', rowHeight: 10, securityLevel: 0, columns: 0, moduleWidth: 3, rotation: 'N',
     }));
     expect(zpl).toContain('^BY3');
   });
diff --git a/src/registry/rotation.ts b/src/registry/rotation.ts
new file mode 100644
index 00000000..0e20a4c3
--- /dev/null
+++ b/src/registry/rotation.ts
@@ -0,0 +1,12 @@
+/**
+ * ZPL field orientation. The single letter that follows a barcode/text
+ * command in ZPL: N (normal, 0°), R (rotated 90° CW), I (inverted 180°),
+ * B (bottom-up 270°).
+ */
+export type ZplRotation = 'N' | 'R' | 'I' | 'B';
+
+export const ZPL_ROTATIONS: readonly ZplRotation[] = ['N', 'R', 'I', 'B'] as const;
+
+export function isZplRotation(value: string): value is ZplRotation {
+  return value === 'N' || value === 'R' || value === 'I' || value === 'B';
+}
diff --git a/src/registry/standard2of5.tsx b/src/registry/standard2of5.tsx
index 67b95c12..2ed46b7b 100644
--- a/src/registry/standard2of5.tsx
+++ b/src/registry/standard2of5.tsx
@@ -11,6 +11,6 @@ export const standard2of5 = createBarcode1D({
   contentSpec: { charset: '0-9' },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? "Y" : "N";
-    return `^BJN,${p.height},${interp},N`;
+    return `^BJ${p.rotation},${p.height},${interp},N`;
   },
 });
diff --git a/src/registry/upca.tsx b/src/registry/upca.tsx
index fd6c7433..6b9f7674 100644
--- a/src/registry/upca.tsx
+++ b/src/registry/upca.tsx
@@ -11,6 +11,6 @@ export const upca = createBarcode1D({
   contentSpec: { charset: '0-9', maxLength: 11 },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? 'Y' : 'N';
-    return `^BUN,${p.height},${interp},N,N`;
+    return `^BU${p.rotation},${p.height},${interp},N,N`;
   },
 });
diff --git a/src/registry/upce.tsx b/src/registry/upce.tsx
index f1ea270b..2ec63868 100644
--- a/src/registry/upce.tsx
+++ b/src/registry/upce.tsx
@@ -11,6 +11,6 @@ export const upce = createBarcode1D({
   contentSpec: { charset: '0-9', maxLength: 6 },
   zplCommand: (p) => {
     const interp = p.printInterpretation ? 'Y' : 'N';
-    return `^B9N,${p.height},${interp},N`;
+    return `^B9${p.rotation},${p.height},${interp},N`;
   },
 });
diff --git a/src/test/testModels.ts b/src/test/testModels.ts
index 47542581..2eb9fc15 100644
--- a/src/test/testModels.ts
+++ b/src/test/testModels.ts
@@ -13,6 +13,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       printInterpretation: false,
       checkDigit: false,
+      rotation: "N",
     },
   },
   barcode_code128_small_no_text: {
@@ -27,6 +28,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 1,
       printInterpretation: false,
       checkDigit: false,
+      rotation: "N",
     },
   },
   barcode_code128_large_check_digit: {
@@ -41,6 +43,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 3,
       printInterpretation: false,
       checkDigit: true,
+      rotation: "N",
     },
   },
   barcode_qr_standard: {
@@ -49,7 +52,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "Hello World", magnification: 4, errorCorrection: "Q" },
+    props: { content: "Hello World", magnification: 4, errorCorrection: "Q", rotation: "N" },
   },
   barcode_qr_large_high_ec: {
     id: "5",
@@ -61,6 +64,7 @@ export const testModels: Record<string, LabelObject> = {
       content: "Zebra Print Lab QR Code Testing",
       magnification: 8,
       errorCorrection: "H",
+      rotation: "N",
     },
   },
   barcode_ean13_standard: {
@@ -74,6 +78,7 @@ export const testModels: Record<string, LabelObject> = {
       height: 100,
       moduleWidth: 2,
       printInterpretation: false,
+      rotation: "N",
     },
   },
   barcode_datamatrix_standard: {
@@ -82,7 +87,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "DataMatrixTest", dimension: 5, quality: 200 },
+    props: { content: "DataMatrixTest", dimension: 5, quality: 200, rotation: "N" },
   },
   barcode_code39_standard: {
     id: "8",
@@ -96,6 +101,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       printInterpretation: false,
       checkDigit: false,
+      rotation: "N",
     },
   },
   barcode_pdf417_standard: {
@@ -110,6 +116,7 @@ export const testModels: Record<string, LabelObject> = {
       securityLevel: 1,
       columns: 4,
       moduleWidth: 2,
+      rotation: "N",
     },
   },
   barcode_upca_standard: {
@@ -124,6 +131,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       printInterpretation: false,
       checkDigit: false,
+      rotation: "N",
     },
   },
   barcode_ean8_standard: {
@@ -138,6 +146,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       printInterpretation: false,
       checkDigit: false,
+      rotation: "N",
     },
   },
   barcode_aztec_standard: {
@@ -146,7 +155,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "Aztec123", magnification: 4, ecLevel: 0 },
+    props: { content: "Aztec123", magnification: 4, ecLevel: 0, rotation: "N" },
   },
   barcode_interleaved2of5_standard: {
     id: "13",
@@ -160,6 +169,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       printInterpretation: false,
       checkDigit: false,
+      rotation: "N",
     },
   },
   barcode_micropdf417_standard: {
@@ -173,6 +183,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       rowHeight: 2,
       mode: 0,
+      rotation: "N",
     },
   },
   barcode_codablock_standard: {
@@ -186,6 +197,7 @@ export const testModels: Record<string, LabelObject> = {
       moduleWidth: 2,
       rowHeight: 2,
       securityLevel: "Y",
+      rotation: "N",
     },
   },
   barcode_pdf417_auto: {
@@ -200,6 +212,7 @@ export const testModels: Record<string, LabelObject> = {
       securityLevel: 1,
       columns: 0,
       moduleWidth: 2,
+      rotation: "N",
     },
   },
   barcode_pdf417_auto_ecc: {
@@ -214,6 +227,7 @@ export const testModels: Record<string, LabelObject> = {
       securityLevel: 0,
       columns: 0,
       moduleWidth: 2,
+      rotation: "N",
     },
   },
   barcode_code93_standard: {
@@ -222,7 +236,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "CODE93", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "CODE93", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_code11_standard: {
     id: "19",
@@ -230,7 +244,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_industrial2of5_standard: {
     id: "20",
@@ -238,7 +252,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_standard2of5_standard: {
     id: "21",
@@ -246,7 +260,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_codabar_standard: {
     id: "22",
@@ -254,7 +268,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "A12345A", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "A12345A", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_logmars_standard: {
     id: "23",
@@ -262,7 +276,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "LOGMARS1", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "LOGMARS1", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_logmars_with_text: {
     id: "23b",
@@ -270,7 +284,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "LOGMARS1", height: 100, moduleWidth: 2, printInterpretation: true, checkDigit: false },
+    props: { content: "LOGMARS1", height: 100, moduleWidth: 2, printInterpretation: true, checkDigit: false, rotation: "N" },
   },
   barcode_msi_standard: {
     id: "24",
@@ -278,7 +292,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_plessey_standard: {
     id: "25",
@@ -286,7 +300,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345678", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_planet_standard: {
     id: "26",
@@ -294,7 +308,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345678901", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345678901", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_postal_standard: {
     id: "27",
@@ -302,7 +316,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "12345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "12345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_gs1databar_standard: {
     id: "28",
@@ -310,7 +324,7 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "0112345678901", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "0112345678901", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
   barcode_upce_standard: {
     id: "29",
@@ -318,6 +332,6 @@ export const testModels: Record<string, LabelObject> = {
     x: 50,
     y: 50,
     rotation: 0,
-    props: { content: "012345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false },
+    props: { content: "012345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
 };

From 95f3adab697bdf436d6f1377411adb270cd1ee2b Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:06:18 +0200
Subject: [PATCH 02/20] feat(parser): read rotation from imported barcode
 commands

mkBarcode and the inline barcode handlers (BM/BR/BQ/BX/B0/BB/BF/B7)
now capture the orientation parameter from p[0] instead of dropping
it. Unknown values fall back to N to keep imports resilient. Each
barcode's makeObj call carries rotation alongside the existing fields,
closing the round-trip with the generator.
---
 src/lib/zplParser.test.ts | 22 ++++++++++++++++++++++
 src/lib/zplParser.ts      | 29 ++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 1 deletion(-)

diff --git a/src/lib/zplParser.test.ts b/src/lib/zplParser.test.ts
index a72bb701..3bd09f60 100644
--- a/src/lib/zplParser.test.ts
+++ b/src/lib/zplParser.test.ts
@@ -227,6 +227,28 @@ describe('parseZPL — ^FX comment', () => {
   });
 });
 
+// ── barcode rotation ──────────────────────────────────────────────────────────
+
+describe('parseZPL — barcode rotation', () => {
+  it.each([
+    ['^XA^BY2^FO0,0^BCR,100,Y,N,N^FD123^FS^XZ', 'R'],
+    ['^XA^BY2^FO0,0^BCI,100,Y,N,N^FD123^FS^XZ', 'I'],
+    ['^XA^BY2^FO0,0^BCB,100,Y,N,N^FD123^FS^XZ', 'B'],
+    ['^XA^FO0,0^BQR,2,4^FDQA,X^FS^XZ', 'R'],
+    ['^XA^FO0,0^BXB,5,200^FDX^FS^XZ', 'B'],
+    ['^XA^FO0,0^B7I,4,0,0,,,^FDX^FS^XZ', 'I'],
+    ['^XA^FO0,0^B0R,4,N,N,N,N^FDX^FS^XZ', 'R'],
+  ])('reads orientation from %s', (zpl, expected) => {
+    const { objects } = parseZPL(zpl, 8);
+    expect((objects[0]?.props as { rotation?: string }).rotation).toBe(expected);
+  });
+
+  it('defaults to N when orientation is missing or unrecognised', () => {
+    const { objects } = parseZPL('^XA^BY2^FO0,0^BC,100,Y,N,N^FD123^FS^XZ', 8);
+    expect((objects[0]?.props as { rotation?: string }).rotation).toBe('N');
+  });
+});
+
 // ── ^FH hex encoding ──────────────────────────────────────────────────────────
 
 describe('parseZPL — ^FH hex escape', () => {
diff --git a/src/lib/zplParser.ts b/src/lib/zplParser.ts
index df5ba71d..9f5732a1 100644
--- a/src/lib/zplParser.ts
+++ b/src/lib/zplParser.ts
@@ -13,6 +13,7 @@ import type { ImageProps } from "../registry/image";
 import type { Barcode1DProps } from "../registry/barcode1d";
 import type { Pdf417Props } from "../registry/pdf417";
 import type { SerialProps } from "../registry/serial";
+import { isZplRotation, type ZplRotation } from "../registry/rotation";
 import type { AztecProps } from "../registry/aztec";
 import type { MicroPdf417Props } from "../registry/micropdf417";
 import type { CodablockProps } from "../registry/codablock";
@@ -213,6 +214,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
   let bcHeight = 100;
   let bcInterp = true;
   let bcCheck = false;
+  let bcRotation: ZplRotation = "N";
   // ^BY barcode defaults
   let byModuleWidth = 2;
   let byHeight = 0; // 0 = no ^BY height; barcode handlers use ||100 as sentinel
@@ -344,6 +346,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               moduleWidth: byModuleWidth,
               printInterpretation: bcInterp,
               checkDigit: bcCheck,
+              rotation: bcRotation,
             } satisfies Code128Props,
             posType,
             comment,
@@ -362,6 +365,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               moduleWidth: byModuleWidth,
               printInterpretation: bcInterp,
               checkDigit: bcCheck,
+              rotation: bcRotation,
             } satisfies Code39Props,
             posType,
             comment,
@@ -379,6 +383,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               height: bcHeight,
               moduleWidth: byModuleWidth,
               printInterpretation: bcInterp,
+              rotation: bcRotation,
             } satisfies Ean13Props,
             posType,
             comment,
@@ -398,6 +403,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               content: data,
               magnification: qrMag,
               errorCorrection: ec,
+              rotation: bcRotation,
             } satisfies QrCodeProps,
             posType,
             comment,
@@ -415,6 +421,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               content,
               dimension: dmDim,
               quality: dmQuality,
+              rotation: bcRotation,
             } satisfies DataMatrixProps,
             posType,
             comment,
@@ -447,6 +454,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               moduleWidth: byModuleWidth,
               printInterpretation: bcInterp,
               checkDigit: bcCheck,
+              rotation: bcRotation,
             } satisfies Barcode1DProps,
             posType,
             comment,
@@ -465,6 +473,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               securityLevel: pdfSecurity,
               columns: pdfColumns,
               moduleWidth: byModuleWidth,
+              rotation: bcRotation,
             } satisfies Pdf417Props,
             posType,
             comment,
@@ -481,6 +490,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               content,
               magnification: aztecMag,
               ecLevel: 0,
+              rotation: bcRotation,
             } satisfies AztecProps,
             posType,
             comment,
@@ -498,6 +508,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               moduleWidth: byModuleWidth,
               rowHeight: mpdfRowHeight,
               mode: 0,
+              rotation: bcRotation,
             } satisfies MicroPdf417Props,
             posType,
             comment,
@@ -515,6 +526,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
               moduleWidth: byModuleWidth,
               rowHeight: cbRowHeight,
               securityLevel: cbSecurity,
+              rotation: bcRotation,
             } satisfies CodablockProps,
             posType,
             comment,
@@ -545,7 +557,14 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
     browserLimit.push(tok);
   };
 
-  const handleAztec: Handler = (p) => { fieldType = "aztec"; aztecMag = int(p[1], 4); };
+  const readRotation = (raw: string | undefined): ZplRotation =>
+    raw && isZplRotation(raw) ? raw : "N";
+
+  const handleAztec: Handler = (p) => {
+    fieldType = "aztec";
+    bcRotation = readRotation(p[0]);
+    aztecMag = int(p[1], 4);
+  };
 
   // Factory for standard 1D barcode commands that share the same state variables.
   // hIdx/iIdx/cIdx are the comma-split parameter indices for height/interp/check.
@@ -557,6 +576,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
     cIdx = -1,
   ): Handler => (p) => {
     fieldType = type;
+    bcRotation = readRotation(p[0]);
     bcHeight = int(p[hIdx], byHeight || 100);
     bcInterp = (p[iIdx] ?? iDefault) === "Y";
     if (cIdx >= 0) bcCheck = (p[cIdx] ?? "N") === "Y";
@@ -665,6 +685,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
     // ^BMN,{checkType},{height},{interp},N  (checkType: A/B/C/D=enabled, N=none)
     BM(p) {
       fieldType = "msi";
+      bcRotation = readRotation(p[0]);
       bcCheck = (p[1] ?? "N") !== "N";
       bcHeight = int(p[2], byHeight || 100);
       bcInterp = (p[3] ?? "Y") === "Y";
@@ -673,6 +694,7 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
     // ^BRN,{symbology},{magnification},{separator},{height},{segments}
     BR(p) {
       fieldType = "gs1databar";
+      bcRotation = readRotation(p[0]);
       bcHeight = int(p[4], byHeight || 100);
       byModuleWidth = int(p[2], byModuleWidth);
     },
@@ -680,17 +702,20 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
     // ^BQN,2,{magnification} — QR Code
     BQ(p) {
       fieldType = "qrcode";
+      bcRotation = readRotation(p[0]);
       qrMag = int(p[2], 4);
     },
     // ^BXN,{dimension},{quality} — DataMatrix
     BX(p) {
       fieldType = "datamatrix";
+      bcRotation = readRotation(p[0]);
       dmDim = int(p[1], 5);
       dmQuality = int(p[2], 200) as DataMatrixProps["quality"];
     },
     // ^B7N,{rowHeight},{securityLevel},{columns},,, — PDF417
     B7(p) {
       fieldType = "pdf417";
+      bcRotation = readRotation(p[0]);
       pdfRowHeight = int(p[1], 10);
       pdfSecurity = int(p[2], 0);
       pdfColumns = int(p[3], 0);
@@ -701,11 +726,13 @@ export function parseZPL(zpl: string, dpmm = 8): ParsedZPL {
     // ^BFN,{rowHeight} — MicroPDF417
     BF(p) {
       fieldType = "micropdf417";
+      bcRotation = readRotation(p[0]);
       mpdfRowHeight = int(p[1], 10);
     },
     // ^BBN,{rowHeight},{security},{numCharsPerRow},{numRows},{mode} — CODABLOCK
     BB(p) {
       fieldType = "codablock";
+      bcRotation = readRotation(p[0]);
       cbRowHeight = int(p[1], 10);
       cbSecurity = (p[2] ?? "Y") === "N" ? "N" : "Y";
     },

From c960994468018d34c9b00af8d7d474e8f2a2b53d Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:06:26 +0200
Subject: [PATCH 03/20] feat(canvas): rotate barcodes via bwip-js, gate manual
 HRI overlays

Pass the rotation through to bwip-js as the 'rotate' option so the
produced bitmap is already rotated; its width/height are post-rotation
and Konva can place it without extra rotation math.

The manual EAN/UPC and Code39-family text overlays in BarcodeObject
assume an upright bitmap, so they are skipped for non-N rotation.
bwip-js is told to includetext for those cases so the rotated barcode
still carries its HRI line.
---
 src/components/Canvas/BarcodeObject.tsx |  4 ++++
 src/components/Canvas/bwipHelpers.ts    | 16 ++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index d4af854e..03d74421 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -151,7 +151,11 @@ export function BarcodeObject({
     // Force-off when the symbology has no HRI in ZPL (e.g. GS1 Databar) — the
     // canvas must match the print output even if a legacy saved object still
     // carries printInterpretation: true.
+    // Manual HRI overlays only run for upright barcodes; when rotated, bwip-js
+    // bakes the text into the bitmap (see bwipHelpers).
+    const isUpright = ((obj.props as { rotation?: string }).rotation ?? "N") === "N";
     const printInterp =
+      isUpright &&
       !ObjectRegistry[obj.type]?.interpretationLocked &&
       !!(obj.props as { printInterpretation?: boolean }).printInterpretation;
     const moduleWidth =
diff --git a/src/components/Canvas/bwipHelpers.ts b/src/components/Canvas/bwipHelpers.ts
index aee1ab7e..2c8ce60e 100644
--- a/src/components/Canvas/bwipHelpers.ts
+++ b/src/components/Canvas/bwipHelpers.ts
@@ -164,6 +164,12 @@ export function buildBwipOptions(
       ? get1DBwipScale(mw, renderScale, renderDpmm)
       : BWIP_SCALE;
 
+  // bwip-js takes the same N/R/I/B letters ZPL does for symbol orientation;
+  // emitting it post-build means the produced bitmap is already rotated and
+  // its dimensions are the post-rotation extents — no Konva-side rotation math
+  // needed.
+  const rotation = (obj.props as { rotation?: string }).rotation ?? "N";
+
   let opts: Record<string, unknown> | null = null;
 
   switch (obj.type) {
@@ -336,6 +342,16 @@ export function buildBwipOptions(
       return null;
   }
 
+  if (opts && rotation !== "N") {
+    opts.rotate = rotation;
+    // When the symbol is rotated we delegate HRI text to bwip-js (so it gets
+    // rotated alongside the bars). The manual text overlays in BarcodeObject
+    // assume an upright bitmap and do not rotate; gating them out is paired
+    // with this flag. For 'N' we keep the previous behaviour: manual overlays
+    // give pixel-perfect EAN/UPC labels and the LOGMARS-above placement.
+    const printInterp = !!(obj.props as { printInterpretation?: boolean }).printInterpretation;
+    if (printInterp) opts.includetext = true;
+  }
   return opts;
 }
 

From 2b3d39bf309becc15bf60c2030b27b30a6fc730e Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:08:54 +0200
Subject: [PATCH 04/20] refactor(rotation): centralise prop access in
 objectRotation helper

The bwip-js options builder and the canvas overlay gating both pulled
rotation from obj.props with their own cast and 'N' fallback. Hoist
the access into registry/rotation.ts so the default lives in one
place and cannot drift between the render layer and the overlay
gate.
---
 src/components/Canvas/BarcodeObject.tsx |  3 ++-
 src/components/Canvas/bwipHelpers.ts    |  3 ++-
 src/registry/rotation.ts                | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index 03d74421..8804f30c 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -14,6 +14,7 @@ import {
   getEanUpcLayout,
   type EanUpcType,
 } from "./bwipHelpers";
+import { objectRotation } from "../../registry/rotation";
 import {
   QR_FO_Y_OFFSET_DOTS,
   QR_FT_MODULE_OFFSET,
@@ -153,7 +154,7 @@ export function BarcodeObject({
     // carries printInterpretation: true.
     // Manual HRI overlays only run for upright barcodes; when rotated, bwip-js
     // bakes the text into the bitmap (see bwipHelpers).
-    const isUpright = ((obj.props as { rotation?: string }).rotation ?? "N") === "N";
+    const isUpright = objectRotation(obj.props) === "N";
     const printInterp =
       isUpright &&
       !ObjectRegistry[obj.type]?.interpretationLocked &&
diff --git a/src/components/Canvas/bwipHelpers.ts b/src/components/Canvas/bwipHelpers.ts
index 2c8ce60e..669d88da 100644
--- a/src/components/Canvas/bwipHelpers.ts
+++ b/src/components/Canvas/bwipHelpers.ts
@@ -1,4 +1,5 @@
 import type { LabelObject } from "../../registry";
+import { objectRotation } from "../../registry/rotation";
 import { dotsToPx } from "../../lib/coordinates";
 import { MICROPDF417_QUIET_ZONE_ROWS } from "./bwipConstants";
 
@@ -168,7 +169,7 @@ export function buildBwipOptions(
   // emitting it post-build means the produced bitmap is already rotated and
   // its dimensions are the post-rotation extents — no Konva-side rotation math
   // needed.
-  const rotation = (obj.props as { rotation?: string }).rotation ?? "N";
+  const rotation = objectRotation(obj.props);
 
   let opts: Record<string, unknown> | null = null;
 
diff --git a/src/registry/rotation.ts b/src/registry/rotation.ts
index 0e20a4c3..095bf396 100644
--- a/src/registry/rotation.ts
+++ b/src/registry/rotation.ts
@@ -10,3 +10,13 @@ export const ZPL_ROTATIONS: readonly ZplRotation[] = ['N', 'R', 'I', 'B'] as con
 export function isZplRotation(value: string): value is ZplRotation {
   return value === 'N' || value === 'R' || value === 'I' || value === 'B';
 }
+
+/**
+ * Extract `rotation` from an object's props, falling back to `'N'`. Centralises
+ * the default so consumers in different layers (bwip-js opts, canvas overlay
+ * gating) cannot drift apart.
+ */
+export function objectRotation(props: object): ZplRotation {
+  const r = (props as { rotation?: string }).rotation;
+  return r !== undefined && isZplRotation(r) ? r : 'N';
+}

From 96388712e0cdc34ca3184cf01cef5aaec7f43f16 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:24:38 +0200
Subject: [PATCH 05/20] fix(canvas): map ZPL B to bwip L and swap display size
 for quarter rotations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

bwip-js exposes orientations as N/R/I/L (L = 90° CCW = 270° CW); ZPL
uses N/R/I/B for the same set. Translate B to L when forwarding the
option so 270° rotation actually rotates instead of silently rendering
upright.

After rotation the bitmap dimensions swap, but getDisplaySize was
deriving width/height from canvas.width assuming an upright bitmap.
Compute the upright result and swap once at the boundary so every
per-symbology formula stays unchanged.
---
 src/components/Canvas/bwipHelpers.ts | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/components/Canvas/bwipHelpers.ts b/src/components/Canvas/bwipHelpers.ts
index 669d88da..9582ec59 100644
--- a/src/components/Canvas/bwipHelpers.ts
+++ b/src/components/Canvas/bwipHelpers.ts
@@ -344,7 +344,9 @@ export function buildBwipOptions(
   }
 
   if (opts && rotation !== "N") {
-    opts.rotate = rotation;
+    // ZPL uses N/R/I/B (B = 270° CW). bwip-js uses N/R/I/L (L = 90° CCW =
+    // 270° CW). The other three letters mean the same thing in both.
+    opts.rotate = rotation === "B" ? "L" : rotation;
     // When the symbol is rotated we delegate HRI text to bwip-js (so it gets
     // rotated alongside the bars). The manual text overlays in BarcodeObject
     // assume an upright bitmap and do not rotate; gating them out is paired
@@ -364,6 +366,24 @@ export function getDisplaySize(
 ): { w: number; h: number } {
   if (!canvas) return { w: 0, h: 0 };
 
+  // For 90°/270° rotations, bwip-js produces a bitmap whose width and height
+  // are swapped relative to the upright form. Compute size as if upright (the
+  // existing per-symbology formulas all assume that), then swap at the end.
+  const rotation = objectRotation(obj.props);
+  const isQuarter = rotation === "R" || rotation === "B";
+  const uprightCanvas = isQuarter
+    ? ({ width: canvas.height, height: canvas.width } as HTMLCanvasElement)
+    : canvas;
+  const upright = getUprightDisplaySize(obj, uprightCanvas, scale, dpmm);
+  return isQuarter ? { w: upright.h, h: upright.w } : upright;
+}
+
+function getUprightDisplaySize(
+  obj: LabelObject,
+  canvas: HTMLCanvasElement,
+  scale: number,
+  dpmm: number,
+): { w: number; h: number } {
   // bwip-js at bwipSc=1 renders 1 extra pixel; at bwipSc>=2 it renders the exact module
   // count. The extraPx term corrects for this so formulas stay consistent across scales.
   switch (obj.type) {

From 0c5c6062084fa232eacf3617f2113427e55963f7 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:24:52 +0200
Subject: [PATCH 06/20] test(rotation): pixel-perfect Labelary fixtures for 1D,
 skip 2D encoder drift
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add Labelary reference renderings for code128 in N/R/I/B and for one
each of QR and DataMatrix rotated R. Bounds are measured from the PNGs
via tests/scripts/measure_bbox.mjs (added) — confirming code128 R/B
swap to 100x202 and QR keeps the +10 dot Y offset Zebra firmware adds
to ^FO QR codes regardless of rotation.

The 1D rotated cases match Labelary pixel-for-pixel under the existing
500-pixel tolerance. The 2D rotated cases are skipped in the visual
regression list because bwip-js and Zebra firmware diverge at the
encoding layer for QR/DataMatrix; the same divergence flagged for
the upright DataMatrix case carries through rotation.

labelarySync's bar-height assertion only holds for upright 1D codes;
gate it on the rotation prop so quarter-rotated bars do not trip it.
---
 src/test/labelarySync.test.ts                 |   7 ++-
 src/test/testModels.ts                        |  42 ++++++++++++++++++
 src/test/visualRegression.test.ts             |   7 +++
 .../labelary_images/barcode_code128_rot_B.png | Bin 0 -> 6662 bytes
 .../labelary_images/barcode_code128_rot_I.png | Bin 0 -> 6586 bytes
 .../labelary_images/barcode_code128_rot_R.png | Bin 0 -> 6662 bytes
 .../barcode_datamatrix_rot_R.png              | Bin 0 -> 6878 bytes
 .../labelary_images/barcode_qr_rot_R.png      | Bin 0 -> 6969 bytes
 tests/fixtures/labelary_images/fixtures.json  |  30 +++++++++++++
 tests/fixtures/testCases.ts                   |  35 +++++++++++++++
 tests/scripts/measure_bbox.mjs                |  24 ++++++++++
 11 files changed, 144 insertions(+), 1 deletion(-)
 create mode 100644 tests/fixtures/labelary_images/barcode_code128_rot_B.png
 create mode 100644 tests/fixtures/labelary_images/barcode_code128_rot_I.png
 create mode 100644 tests/fixtures/labelary_images/barcode_code128_rot_R.png
 create mode 100644 tests/fixtures/labelary_images/barcode_datamatrix_rot_R.png
 create mode 100644 tests/fixtures/labelary_images/barcode_qr_rot_R.png
 create mode 100644 tests/scripts/measure_bbox.mjs

diff --git a/src/test/labelarySync.test.ts b/src/test/labelarySync.test.ts
index 4a9e03d9..ac415a05 100644
--- a/src/test/labelarySync.test.ts
+++ b/src/test/labelarySync.test.ts
@@ -122,6 +122,11 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       const isStacked2D = ["pdf417", "micropdf417", "codablock"].includes(
         obj.type,
       );
+      // For 90°/270° rotated symbols the visible W and H are swapped, so the
+      // upright-shape assertions on bar height / module direction stop applying.
+      const rotation =
+        (obj.props as { rotation?: string }).rotation ?? "N";
+      const isQuarterRotated = rotation === "R" || rotation === "B";
       // LOGMARS spec places the human-readable line ABOVE the bars. Labelary's
       // bounding box for ^FO50,50 reports y=50 (bar top, not visual top), and
       // height includes the bar height plus a ~20 dot text-above zone reserved
@@ -145,7 +150,7 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
           tc.expected_bounds.height - EAN_TEXT_ZONE_DOTS,
           1,
         );
-      } else if (is1DCode) {
+      } else if (is1DCode && !isQuarterRotated) {
         expect(displaySize.h).toBe(
           (obj.props as { height: number }).height / 8,
         );
diff --git a/src/test/testModels.ts b/src/test/testModels.ts
index 2eb9fc15..3d101e0f 100644
--- a/src/test/testModels.ts
+++ b/src/test/testModels.ts
@@ -334,4 +334,46 @@ export const testModels: Record<string, LabelObject> = {
     rotation: 0,
     props: { content: "012345", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "N" },
   },
+
+  // ── Rotation coverage ───────────────────────────────────────────────────
+  barcode_code128_rot_R: {
+    id: "rot1",
+    type: "code128",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "123456", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "R" },
+  },
+  barcode_code128_rot_I: {
+    id: "rot2",
+    type: "code128",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "123456", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "I" },
+  },
+  barcode_code128_rot_B: {
+    id: "rot3",
+    type: "code128",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "123456", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "B" },
+  },
+  barcode_qr_rot_R: {
+    id: "rot4",
+    type: "qrcode",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "Hello World", magnification: 4, errorCorrection: "Q", rotation: "R" },
+  },
+  barcode_datamatrix_rot_R: {
+    id: "rot5",
+    type: "datamatrix",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "DataMatrixTest", dimension: 5, quality: 200, rotation: "R" },
+  },
 };
diff --git a/src/test/visualRegression.test.ts b/src/test/visualRegression.test.ts
index 6a93853d..397c0ee9 100644
--- a/src/test/visualRegression.test.ts
+++ b/src/test/visualRegression.test.ts
@@ -58,6 +58,13 @@ describe("Visual Regression - bwip-js vs Labelary", () => {
       "barcode_code11_standard",
       // bwip-js GS1 DataBar stacking/finder-pattern differs from Zebra firmware.
       "barcode_gs1databar_standard",
+      // 2D encoder discrepancies between bwip-js and Zebra firmware persist
+      // through rotation. For QR specifically the rotation appears to shift
+      // bwip's chosen mask, widening the diff vs. Labelary even though the
+      // upright QR matches. DataMatrix is the same root cause as the unrotated
+      // case above.
+      "barcode_qr_rot_R",
+      "barcode_datamatrix_rot_R",
     ];
 
     const testFn = failingTests.includes(tc.id) ? it.skip : it;
diff --git a/tests/fixtures/labelary_images/barcode_code128_rot_B.png b/tests/fixtures/labelary_images/barcode_code128_rot_B.png
new file mode 100644
index 0000000000000000000000000000000000000000..69de3befec8bd71b1edf95f375b4baac47e6575e
GIT binary patch
literal 6662
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtfVCRV1#3hurkuk&<M85ksUJzX3_D&{2ru;+3+sG-1RVA#_XXu#FMw0LH!
zNDq_J!HhIX*2N7T2D2hT@<Kgn(?HTJqtc_nG8~hG!}K$UJlGEyaJez|GR7L6){tO5
z%!rog84v#l<^eaxz=qC55ny(45Lw`zmbipDK?0aljy33ka!%7j28n<DkgVjxvp4~m
zmliR^8gVPjG8_h)X~I@=QU@r?!%iS$9r#cWu_7S}XnKN(0IQoZ$Wbm$7ta_0-7qo1
zWHZPKDiUWw<_U1Vm=r1Tl0gEPSr-@rodry#2^I}#Y7+?Mb}EJf0q0@_(gCyr=Yr~H
zgG-DCAU`Gpodxvs!2$-J|LzAtfxxKN28jt`LV=;}KQtbMK~b={L4z1?q8ES$f8-(Y
zFas3EKsPj^1uoXKfEEf35C214aNr0qA%V(W^dyEYsSr#Hz@*nYk*@)mD4C>~ccp+z
z>NaLr!a#EZEW|L=0x)IvlrVtO>;(y6=!5D58T44e2nEJnDPnF`44~-9-~pyVP}uOn
z?7-oK0SpBujI@BB4~Yo{^hhJKTtE+8tVtfN!o^Gr*fKt5lBbC`(c+hhn6!YA@rf!O
z$;$ZX#UHwJ$w~_h7?F);EUp3?nh&uC618#!wzPmA3YZxmEs3Egl~L)@Cf{&u@{OkR
z(JtL+Pj|G3KRU88I^Z)p(1q5gLGS*KN{<eUjt&Qp4ug-*4v;Y`!q8o{Eu-7UKpZ$-
O!{F)a=d#Wzp$PyVhSEI%

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_code128_rot_I.png b/tests/fixtures/labelary_images/barcode_code128_rot_I.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d908f3084900fc6801597ad5f0884e23018dbe3
GIT binary patch
literal 6586
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtfVCRV1#3hurkuk&<M85krLJzX3_D&{2ru;+3+sG-1RVA#_XXu#FMw0LH!
zNDq_J!HhIX*2N7T2D2hT@<Kgn(?HTJqtc_nG8~hG!}K$UI9PaidU}93;Q#|$kHY~5
z79erp00$e7!+{egfIO%iNEpm>0Lk&7DFVwS0QG^jfD8aLfM!CCV*wfmGm{l)CdhE0
zEi62X6IhscrGWBT8?(e&oy7?v0-SEfr!^#4U79YQG2(J#oS0y;8JJHUR7RyogJn1-
z2d1|Fz+~UUw1`3YFfiROZqOL5fJQ6c(e}t_J8ZQ5Iod2A?T(Cg!$y0jqrLLc(TLGO
xn$f|j(LuS<!N}3U$l*8`IXdPs@M9hfvl$}}?|eJq0C0+h!PC{xWt~$(699tm!72a%

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_code128_rot_R.png b/tests/fixtures/labelary_images/barcode_code128_rot_R.png
new file mode 100644
index 0000000000000000000000000000000000000000..3242a9aec6c09c6d3d2cc6426d6212d3527df2fe
GIT binary patch
literal 6662
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtfVCRV0K3hurk*Z5ejGB8Nydb&7<RLn{KVbA4uP(y*sz_6z&(15FhY4OZd
zksc<cgBfX(tcx2w3}!`w<b`_Drh%kcMx{rCWjH1Whv{byd9WWa;BsT^WsEgCts%jB
zm=P_}GamjA%mZ$WfeoFBBEan8AhN(aEpZ8Rf&?(99Ba@6<(#I63=;qPAz8_XXK?~B
zFD*KNmX|K5ZZ^2YXaF)H8ECH&Fb5Ve@cef_2(;9NQLPPPNrK5{kO~!vvpPUy1UTJ{
zL5^~1x(L$1I1yd?#iU4ymkbiX%(}o3=qz9=O|W2S`wwvegYaRX-o*_X=-IjCq)tx>
z1IV2hB!JEWl>sv7&LtQMXf9;hl_KV5#Q^d~1`p6#KqpD?p*t5NkQic(xRqrYK<+eQ
z13C-nBp!Bj=MoGgY@yJABgCKq%0yNmF%Xv)&?2qj;eSXx95@0@NT6~TJ#evw!hsL<
zkmQz-1dK#rT41G{H__9A!5?{u3ub^)8ZbFFq6ID$a|D5^1|uy1GhpjPz6M~{WRhau
zl>(}-+L+PPCPrivlkw3j!vPEh%(Q@>#E1w5^fDv?qZNRyT)<57=z)tZ<CB-<(K9|;
zTEGkiVsZqgH_?nGCM{rA0%)Ot9=KR@1X`q#S31%t6bOX<sPt${c(j8s+A$jK5RUef
zN5==y+VAKs#Zl?e(WKE)w9(PS(LvSG!Q|0FbhPgFi0Mf(tmoO5VaAgs0-Ua4@O1Ta
JS?83{1OTg~))xQ(

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_datamatrix_rot_R.png b/tests/fixtures/labelary_images/barcode_datamatrix_rot_R.png
new file mode 100644
index 0000000000000000000000000000000000000000..4fbeca1a825be7794106db23f011f5f045e8a4ee
GIT binary patch
literal 6878
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtfVCRV1V3hurkDS9`KGB8NFdb&7<RLn{KVbA4uP(y*sz_6z&(15FhY4OZd
zksc<cgBfX(tcx2w3}!`w<b`_Drh%kcMx{rCWjH1Whv{byc^Drs;BsTU%MfdHT0?^M
zFe9!+FEI0|J%>TVfqH=ihQ|K|2N>A@J2o(i{&8pJS)3qpftSYxlz9?7nl7F(0vb3m
z!DKTqcR8p?oYeu!3vf#OyUYmE9&&(z38GV72+02r%waFsW=H@toCK>&BM!|krbkKu
zZDWyed;oMr(}8-61P9ihii1GMNC0zeUPB!y2RAA5xfz3e;ezgn1@UP=`I&eM4sd|&
z*8joJ&ZF=_o<+i;L68Mx_X2645|H~lnsGP*?EV8F8-d<m0rELJBio(_|AE$hVf6up
zK@ZcS12{?$p8qcyBmzL19aur0=l%h74bTCiM27&_`UJ-R4;vW8p_+lN2ZaVS47mw~
zA<P3I2O7Bl9A^S)mVs#|7y)3-519TJGO`JPtS<lu9@zKH48+>J2N;9@ni-g7KtU()
zqn``t22l8wFcTGi8yZ02&JEHRa1fksi1YJ;rvD1iL<fv`CY~KcCOTMv#WXPTft;-c
zNj3GrgvQ7~l#3rg;s=~sK`{r6c2K$ln!vP+QLPP_^xYT((K8A(2{X0*FJXWrQgFg)
zXomP6RChTL(%jT|LI-4_s6i70vlu*~BT~CW2Pl^woPeut<B3R1WMO2p0LL{n*ML&I
z8#wkM89oA>VOHSEvl9RMA+;-^pc<`SN2}N2SiO!mBS)LhqrHmJ-qdI>a<p?jI;eoF
zUpYF~GCIaII`lT$Rvc|Bj<yv?+lr%Y#X;UyWMr^i67wW}vCSvoG!%oUtDnm{r-UW|
D3{f;D

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_qr_rot_R.png b/tests/fixtures/labelary_images/barcode_qr_rot_R.png
new file mode 100644
index 0000000000000000000000000000000000000000..7518e6dac4838b5daaf29946ff619f2c1690f9c3
GIT binary patch
literal 6969
zcmeI0Pe>F|9LL|x?2hX=;-B^~3AICRu*4?gu9^tpnCq&fq9vq6Fq`dG^hb~t^yIjb
z6%3RFl2Wkdp-x^r1f6Cnh|r==oq{|>e@@yZg=MGTZ+16i%7V^sVc#zM-uu1Z@B91w
z-g~pR`};b}g&KhnQr_JaIYkH;#J2~2Aoo5^w!z22WXDkQ^yv85NSyS<&d0CD#wO)(
zUARs;+IUO}jfBoOZ)M6>VB`@T**+GJB`=R&mj^Fji<2|)3qiR_?u|{#Atlr#*EhA)
zH?%Z1$eq1|!+l%hgw&+FBW;5d4@S0Ig=i)q3rf9_8c>8=?D9g~Yp{nhmlFHk%X*ix
zIE?+(Mq(bjU9_9ZLUH(486;l?jS0e4DvuaGpuONEsG)Q?eG+R*Yu4YbhlD6Ir!}lX
z(W(CQ*~HErx1wgIWR0XO)ztai2qP|QUXef_&UrH9oO2}+i?CvsUgeQ=XmT7=TdBxQ
z)Nd+K(S&(s7wl|EdL0Bqm8H?}T0n9~Qf>E!bM4G?_&(zm7txW7R^qJcKxhqoaj`r!
z=n$HextT-gui`Zwd&Aqt)of?p7jT2C%$Bfx!=|rP!O^O|f;&oTNi2F$h(y1>aHFbB
zQ#nI5i3=OIF+|WYj(nNNT}S#>RHzt)l&fH2u(hN!p4=U<?qT-fjAcFG+^CXk!C!`5
zMwiYA(lj=6n3faZrNY`OBzYK#Qja?=h}Kskr9ZZUtkV`4D95<`n?3=4v|!OB--9_a
z*hjw!a(Fd+ljQ^36>jiBccCiP+Z8TR-Sl~+B{YfB5WUWpW`j7T*=T(TZlb6#Ly+#8
zMKU0Ei~<dMvp$IXjea`@>JF&hqDBQ<?5vd}`RRHghJFOAI8)R2luoot7|mpJwG1!k
zy`F+47<R94mF#0qGr3>6$GF92(}DwoCwm<%>eKb_K1e@n*danx$S?+tKmc&eL*_#W
znQcGdIDD9M;j-Fln2K7ILRO;1x^YR<1##7j>U$gRe*Sm3%W9EPn584!0N*889q<4p
z*_N5MIU7E~2_N5)*nu4GF1bAGwn%ohO5Qx{e@N&7Oz2BivXeou)C-GSoj`iz?`fPc
zr~Jr$Q6(>;xH~sw@7w?-Q2*}xxCg-oFzwh#9N462H&&CM%91}WC=L{dUAG5{1I2;j
zKo80Mg9|+*=^?r6IhNu;aiBQRM~A{cP4uov?~3%UNbidOb5~@^kN)G|7DqpyBk=0(
L=!>kJ&{97E>6ZjG

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/fixtures.json b/tests/fixtures/labelary_images/fixtures.json
index 775d5441..0aa9576e 100644
--- a/tests/fixtures/labelary_images/fixtures.json
+++ b/tests/fixtures/labelary_images/fixtures.json
@@ -264,6 +264,36 @@
       "zpl_input": "^XA^BY2^FO50,50^B9N,100,N,N^FD012345^FS^XZ",
       "expected_bounds": { "x": 50, "y": 50, "width": 102, "height": 113 },
       "image_ref": "barcode_upce_standard.png"
+    },
+    {
+      "id": "barcode_code128_rot_R",
+      "zpl_input": "^XA^BY2^FO100,100^BCR,100,N,N,N^FD123456^FS^XZ",
+      "expected_bounds": { "x": 100, "y": 100, "width": 100, "height": 202 },
+      "image_ref": "barcode_code128_rot_R.png"
+    },
+    {
+      "id": "barcode_code128_rot_I",
+      "zpl_input": "^XA^BY2^FO100,100^BCI,100,N,N,N^FD123456^FS^XZ",
+      "expected_bounds": { "x": 100, "y": 100, "width": 202, "height": 100 },
+      "image_ref": "barcode_code128_rot_I.png"
+    },
+    {
+      "id": "barcode_code128_rot_B",
+      "zpl_input": "^XA^BY2^FO100,100^BCB,100,N,N,N^FD123456^FS^XZ",
+      "expected_bounds": { "x": 100, "y": 100, "width": 100, "height": 202 },
+      "image_ref": "barcode_code128_rot_B.png"
+    },
+    {
+      "id": "barcode_qr_rot_R",
+      "zpl_input": "^XA^FO100,100^BQR,2,4^FDQA,Hello World^FS^XZ",
+      "expected_bounds": { "x": 100, "y": 110, "width": 84, "height": 84 },
+      "image_ref": "barcode_qr_rot_R.png"
+    },
+    {
+      "id": "barcode_datamatrix_rot_R",
+      "zpl_input": "^XA^FO100,100^BXR,5,200^FDDataMatrixTest^FS^XZ",
+      "expected_bounds": { "x": 100, "y": 100, "width": 90, "height": 90 },
+      "image_ref": "barcode_datamatrix_rot_R.png"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/fixtures/testCases.ts b/tests/fixtures/testCases.ts
index 03f4963b..3186b3ef 100644
--- a/tests/fixtures/testCases.ts
+++ b/tests/fixtures/testCases.ts
@@ -194,4 +194,39 @@ export const testCases: TestCase[] = [
     expected_bounds: { x: 50, y: 50, width: 102, height: 113 },
     image_ref: "barcode_upce_standard.png",
   },
+
+  // ── Rotation coverage ─────────────────────────────────────────────────────
+  // Bounds measured from the Labelary PNG via tests/scripts/measure_bbox.mjs.
+  // R/B swap width and height of the unrotated symbol; the QR +10 dot Y offset
+  // applies to rotated QR codes too.
+  {
+    id: "barcode_code128_rot_R",
+    zpl_input: "^XA^BY2^FO100,100^BCR,100,N,N,N^FD123456^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 100, height: 202 },
+    image_ref: "barcode_code128_rot_R.png",
+  },
+  {
+    id: "barcode_code128_rot_I",
+    zpl_input: "^XA^BY2^FO100,100^BCI,100,N,N,N^FD123456^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 202, height: 100 },
+    image_ref: "barcode_code128_rot_I.png",
+  },
+  {
+    id: "barcode_code128_rot_B",
+    zpl_input: "^XA^BY2^FO100,100^BCB,100,N,N,N^FD123456^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 100, height: 202 },
+    image_ref: "barcode_code128_rot_B.png",
+  },
+  {
+    id: "barcode_qr_rot_R",
+    zpl_input: "^XA^FO100,100^BQR,2,4^FDQA,Hello World^FS^XZ",
+    expected_bounds: { x: 100, y: 110, width: 84, height: 84 },
+    image_ref: "barcode_qr_rot_R.png",
+  },
+  {
+    id: "barcode_datamatrix_rot_R",
+    zpl_input: "^XA^FO100,100^BXR,5,200^FDDataMatrixTest^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 90, height: 90 },
+    image_ref: "barcode_datamatrix_rot_R.png",
+  },
 ];
diff --git a/tests/scripts/measure_bbox.mjs b/tests/scripts/measure_bbox.mjs
new file mode 100644
index 00000000..ab78fb46
--- /dev/null
+++ b/tests/scripts/measure_bbox.mjs
@@ -0,0 +1,24 @@
+import * as fs from 'fs';
+import { PNG } from 'pngjs';
+import * as path from 'path';
+
+const FIXTURES_DIR = 'tests/fixtures/labelary_images';
+const ids = process.argv.slice(2);
+
+for (const id of ids) {
+  const png = PNG.sync.read(fs.readFileSync(path.join(FIXTURES_DIR, `${id}.png`)));
+  let minX = png.width, minY = png.height, maxX = 0, maxY = 0;
+  for (let y = 0; y < png.height; y++) {
+    for (let x = 0; x < png.width; x++) {
+      const i = (png.width * y + x) << 2;
+      const r = png.data[i], g = png.data[i+1], b = png.data[i+2];
+      if ((r + g + b) / 3 < 128) {
+        if (x < minX) minX = x;
+        if (y < minY) minY = y;
+        if (x > maxX) maxX = x;
+        if (y > maxY) maxY = y;
+      }
+    }
+  }
+  console.log(JSON.stringify({ id, x: minX, y: minY, width: maxX - minX + 1, height: maxY - minY + 1 }));
+}

From a5489872f1647e17ab3a61fb87dcaa546eab859f Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:30:28 +0200
Subject: [PATCH 07/20] refactor(canvas): pass upright dimensions as numbers,
 reuse objectRotation in tests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

getUprightDisplaySize previously took a fake-cast HTMLCanvasElement so
the rotation wrapper could swap width/height. Take two numbers (cw, ch)
instead — no type lie, clearer signature, and the wrapper expresses the
swap as plain destructuring.

labelarySync rebuilt the rotation default inline; route it through the
shared objectRotation helper so test and production read the prop the
same way.
---
 src/components/Canvas/bwipHelpers.ts | 46 ++++++++++++++--------------
 src/test/labelarySync.test.ts        |  4 +--
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/src/components/Canvas/bwipHelpers.ts b/src/components/Canvas/bwipHelpers.ts
index 9582ec59..01785359 100644
--- a/src/components/Canvas/bwipHelpers.ts
+++ b/src/components/Canvas/bwipHelpers.ts
@@ -371,16 +371,16 @@ export function getDisplaySize(
   // existing per-symbology formulas all assume that), then swap at the end.
   const rotation = objectRotation(obj.props);
   const isQuarter = rotation === "R" || rotation === "B";
-  const uprightCanvas = isQuarter
-    ? ({ width: canvas.height, height: canvas.width } as HTMLCanvasElement)
-    : canvas;
-  const upright = getUprightDisplaySize(obj, uprightCanvas, scale, dpmm);
+  const cw = isQuarter ? canvas.height : canvas.width;
+  const ch = isQuarter ? canvas.width : canvas.height;
+  const upright = getUprightDisplaySize(obj, cw, ch, scale, dpmm);
   return isQuarter ? { w: upright.h, h: upright.w } : upright;
 }
 
 function getUprightDisplaySize(
   obj: LabelObject,
-  canvas: HTMLCanvasElement,
+  cw: number,
+  ch: number,
   scale: number,
   dpmm: number,
 ): { w: number; h: number } {
@@ -393,7 +393,7 @@ function getUprightDisplaySize(
       // Correcting to the Labelary width would stretch bars; return the bwip-natural size.
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
-      const w = (canvas.width / bwipSc) * modulePx;
+      const w = (cw / bwipSc) * modulePx;
       const h = dotsToPx(obj.props.height, scale, dpmm);
       return { w, h };
     }
@@ -402,7 +402,7 @@ function getUprightDisplaySize(
       // Width is approximate; the visual regression is skipped for this type.
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
-      const w = (canvas.width / bwipSc) * modulePx;
+      const w = (cw / bwipSc) * modulePx;
       const h = dotsToPx(obj.props.height, scale, dpmm);
       return { w, h };
     }
@@ -412,7 +412,7 @@ function getUprightDisplaySize(
       // match with Labelary fixtures regardless of bwip canvas pixel rounding.
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
-      const rawPx = (canvas.width / bwipSc) * modulePx * POSTNET_PLANET_WIDTH_RATIO;
+      const rawPx = (cw / bwipSc) * modulePx * POSTNET_PLANET_WIDTH_RATIO;
       const wDots = Math.round((rawPx / scale) * dpmm);
       const w = dotsToPx(wDots, scale, dpmm);
       const h = dotsToPx(obj.props.height, scale, dpmm);
@@ -421,17 +421,17 @@ function getUprightDisplaySize(
     case "gs1databar": {
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
-      const w = (canvas.width / bwipSc) * modulePx;
+      const w = (cw / bwipSc) * modulePx;
       // Height is symbol-standard fixed (not the ZPL height param).
       // paddingheight:2 in buildBwipOptions adds the quiet-zone rows so
-      // canvas.height already reflects the correct total height.
-      const h = (canvas.height / bwipSc) * modulePx;
+      // ch already reflects the correct total height.
+      const h = (ch / bwipSc) * modulePx;
       return { w, h };
     }
     case "code128": {
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
-      const w = (canvas.width / bwipSc) * modulePx;
+      const w = (cw / bwipSc) * modulePx;
       const h = dotsToPx(obj.props.height, scale, dpmm);
       return { w, h };
     }
@@ -442,7 +442,7 @@ function getUprightDisplaySize(
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
       const extraPx = bwipSc === 1 ? 1 : 0;
-      const w = ((canvas.width - extraPx) / bwipSc) * modulePx;
+      const w = ((cw - extraPx) / bwipSc) * modulePx;
       const h = dotsToPx(obj.props.height, scale, dpmm);
       return { w, h };
     }
@@ -456,14 +456,14 @@ function getUprightDisplaySize(
       const modulePx = dotsToPx(obj.props.moduleWidth, scale, dpmm);
       const bwipSc = get1DBwipScale(obj.props.moduleWidth, scale, dpmm);
       const extraPx = bwipSc === 1 ? 1 : 0;
-      const w = ((canvas.width - extraPx) / bwipSc) * modulePx;
+      const w = ((cw - extraPx) / bwipSc) * modulePx;
       const h = dotsToPx(obj.props.height, scale, dpmm);
       return { w, h };
     }
     case "pdf417": {
       const p = obj.props;
       // bwip-js uses a fixed internal row height of 3 for pdf417
-      const numRows = canvas.height / (BWIP_PDF417_MIN_ROWHEIGHT * BWIP_SCALE);
+      const numRows = ch / (BWIP_PDF417_MIN_ROWHEIGHT * BWIP_SCALE);
 
       // Width check: bwip-js sometimes adds unexpected padding or uses
       // different column logic. We force the display width based on the
@@ -481,28 +481,28 @@ function getUprightDisplaySize(
     case "qrcode": {
       const modulePx = dotsToPx(obj.props.magnification, scale, dpmm);
       const size =
-        (canvas.width / (BWIP_SCALE * BWIP_2D_INTERNAL_SCALE)) * modulePx;
+        (cw / (BWIP_SCALE * BWIP_2D_INTERNAL_SCALE)) * modulePx;
       return { w: size, h: size };
     }
     case "datamatrix": {
       const modulePx = dotsToPx(obj.props.dimension, scale, dpmm);
       const size =
-        (canvas.width / (BWIP_SCALE * BWIP_2D_INTERNAL_SCALE)) * modulePx;
+        (cw / (BWIP_SCALE * BWIP_2D_INTERNAL_SCALE)) * modulePx;
       return { w: size, h: size };
     }
     case "aztec": {
       const modulePx = dotsToPx(obj.props.magnification, scale, dpmm);
       const size =
-        (canvas.width / (BWIP_SCALE * BWIP_2D_INTERNAL_SCALE)) * modulePx;
+        (cw / (BWIP_SCALE * BWIP_2D_INTERNAL_SCALE)) * modulePx;
       return { w: size, h: size };
     }
     case "micropdf417": {
       const p = obj.props;
       // bwip-js ignores rowheight for micropdf417 and always uses 2 internal pixels per row.
       // It also adds MICROPDF417_QUIET_ZONE_ROWS quiet-zone rows (top+bottom) to the canvas.
-      const numRows = Math.max(0, canvas.height / (BWIP_SCALE * 2) - MICROPDF417_QUIET_ZONE_ROWS);
+      const numRows = Math.max(0, ch / (BWIP_SCALE * 2) - MICROPDF417_QUIET_ZONE_ROWS);
       const w =
-        (canvas.width / BWIP_SCALE) * dotsToPx(p.moduleWidth, scale, dpmm);
+        (cw / BWIP_SCALE) * dotsToPx(p.moduleWidth, scale, dpmm);
       const h = numRows * dotsToPx(p.rowHeight, scale, dpmm);
       return { w, h };
     }
@@ -513,14 +513,14 @@ function getUprightDisplaySize(
         Math.round(p.rowHeight / Math.max(p.moduleWidth, 1)),
       );
       const w =
-        (canvas.width / BWIP_SCALE) * dotsToPx(p.moduleWidth, scale, dpmm);
+        (cw / BWIP_SCALE) * dotsToPx(p.moduleWidth, scale, dpmm);
       const h =
-        (canvas.height / BWIP_SCALE) *
+        (ch / BWIP_SCALE) *
         (dotsToPx(p.rowHeight, scale, dpmm) / specRowheight);
       return { w, h };
     }
     default: {
-      return { w: canvas.width, h: canvas.height };
+      return { w: cw, h: ch };
     }
   }
 }
diff --git a/src/test/labelarySync.test.ts b/src/test/labelarySync.test.ts
index ac415a05..430dc0f9 100644
--- a/src/test/labelarySync.test.ts
+++ b/src/test/labelarySync.test.ts
@@ -8,6 +8,7 @@ import {
 } from "../components/Canvas/bwipHelpers";
 import { EAN_TEXT_ZONE_DOTS } from "../components/Canvas/bwipConstants";
 import { ObjectRegistry } from "../registry";
+import { objectRotation } from "../registry/rotation";
 import { defined } from "./helpers";
 import { testModels } from "./testModels";
 
@@ -124,8 +125,7 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       );
       // For 90°/270° rotated symbols the visible W and H are swapped, so the
       // upright-shape assertions on bar height / module direction stop applying.
-      const rotation =
-        (obj.props as { rotation?: string }).rotation ?? "N";
+      const rotation = objectRotation(obj.props);
       const isQuarterRotated = rotation === "R" || rotation === "B";
       // LOGMARS spec places the human-readable line ABOVE the bars. Labelary's
       // bounding box for ^FO50,50 reports y=50 (bar top, not visual top), and

From 8934a377e2b6bdf1d9ac5177260c4954d9b60278 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:37:04 +0200
Subject: [PATCH 08/20] fix(test): merge instead of overwrite fixtures.json in
 fetch script

Previously the script wrote testCases.ts contents into fixtures.json
on every run. fixtures.json is the source of truth for Labelary-
measured bounds, so this clobbered hand-refined values whenever the
script was re-run for new test cases. Read fixtures.json first, only
append entries whose id is not already present.
---
 tests/scripts/fetch_labelary_fixtures.ts | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/tests/scripts/fetch_labelary_fixtures.ts b/tests/scripts/fetch_labelary_fixtures.ts
index c3bfbf0f..41ad85f5 100644
--- a/tests/scripts/fetch_labelary_fixtures.ts
+++ b/tests/scripts/fetch_labelary_fixtures.ts
@@ -35,10 +35,25 @@ async function main() {
   fs.mkdirSync(FIXTURES_DIR, { recursive: true });
 
   const mappingFile = path.join(FIXTURES_DIR, "fixtures.json");
-  const mappingData = { test_cases: testCases };
-
-  console.log("Writing mapping JSON (fixtures.json)...");
-  fs.writeFileSync(mappingFile, JSON.stringify(mappingData, null, 2), "utf8");
+  // fixtures.json is the source of truth for Labelary-measured bounds. Only
+  // append entries for new test cases — never overwrite existing ones, since
+  // testCases.ts may carry rounded/placeholder bounds that have been refined
+  // by hand or via tests/scripts/measure_bbox.mjs.
+  interface Existing { test_cases: typeof testCases }
+  const existing: Existing = fs.existsSync(mappingFile)
+    ? JSON.parse(fs.readFileSync(mappingFile, "utf8"))
+    : { test_cases: [] };
+  const knownIds = new Set(existing.test_cases.map((c) => c.id));
+  const additions = testCases.filter((c) => !knownIds.has(c.id));
+  if (additions.length > 0) {
+    const merged = { test_cases: [...existing.test_cases, ...additions] };
+    console.log(
+      `Adding ${additions.length} new entr${additions.length === 1 ? "y" : "ies"} to fixtures.json...`,
+    );
+    fs.writeFileSync(mappingFile, JSON.stringify(merged, null, 2), "utf8");
+  } else {
+    console.log("fixtures.json already covers every test case.");
+  }
 
   console.log("Fetching images from Labelary API...");
   for (const tc of testCases) {

From a4a03510db8405482207932b9863ba8991c18a66 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:37:09 +0200
Subject: [PATCH 09/20] test(rotation): cover code39 and ean13 rotations
 against Labelary

Add R/B variants for code39 (^B3 param order) and ean13 (^BE) so the
rotation pipeline is exercised on different ZPL command shapes than
code128's ^BC. All four match Labelary pixel-for-pixel under the
existing 500-pixel visual tolerance.

EAN13 reveals a wrinkle: extended guard bars rotate with the symbol
and end up LEFT of the FO anchor under R rotation (bbox.x = 87 with
FO=100). The labelarySync x-equality check is dropped for rotated
EAN/UPC, and the height/width text-zone adjustment moves to the
width axis under quarter rotation.
---
 src/test/labelarySync.test.ts                 |  31 +++-
 src/test/testModels.ts                        |  32 ++++
 .../labelary_images/barcode_code39_rot_B.png  | Bin 0 -> 6751 bytes
 .../labelary_images/barcode_code39_rot_R.png  | Bin 0 -> 6751 bytes
 .../labelary_images/barcode_ean13_rot_B.png   | Bin 0 -> 6677 bytes
 .../labelary_images/barcode_ean13_rot_R.png   | Bin 0 -> 6677 bytes
 tests/fixtures/labelary_images/fixtures.json  | 170 ++++++++++++++++--
 tests/fixtures/testCases.ts                   |  30 ++++
 8 files changed, 238 insertions(+), 25 deletions(-)
 create mode 100644 tests/fixtures/labelary_images/barcode_code39_rot_B.png
 create mode 100644 tests/fixtures/labelary_images/barcode_code39_rot_R.png
 create mode 100644 tests/fixtures/labelary_images/barcode_ean13_rot_B.png
 create mode 100644 tests/fixtures/labelary_images/barcode_ean13_rot_R.png

diff --git a/src/test/labelarySync.test.ts b/src/test/labelarySync.test.ts
index 430dc0f9..a34a6739 100644
--- a/src/test/labelarySync.test.ts
+++ b/src/test/labelarySync.test.ts
@@ -87,6 +87,11 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
         console.log(`[DEBUG] expectedBounds:`, tc.expected_bounds);
       }
 
+      // For 90°/270° rotated symbols the visible W and H are swapped, so the
+      // upright-shape assertions on bar height / module direction stop applying.
+      const rotation = objectRotation(obj.props);
+      const isQuarterRotated = rotation === "R" || rotation === "B";
+
       // Verify visual position (top-left of the rendered bounding box in dots).
       // This mimics the positioning logic in BarcodeObject.tsx.
       const visualX = obj.x;
@@ -107,7 +112,14 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
         }
       }
 
-      expect(visualX).toBe(tc.expected_bounds.x);
+      // EAN/UPC have extended guard bars whose visible extent rotates with the
+      // symbol. Under R rotation those guards sit LEFT of the FO anchor, so
+      // the bbox.x is below obj.x. The model still holds obj.x as FO, so the
+      // strict x-equality check is dropped for rotated EAN/UPC.
+      const isEanUpcType = ["ean13", "ean8", "upca", "upce"].includes(obj.type);
+      if (!(isEanUpcType && isQuarterRotated)) {
+        expect(visualX).toBe(tc.expected_bounds.x);
+      }
       expect(visualY).toBeCloseTo(tc.expected_bounds.y, 0);
 
       expect(displaySize.w).toBeGreaterThan(0);
@@ -123,10 +135,6 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       const isStacked2D = ["pdf417", "micropdf417", "codablock"].includes(
         obj.type,
       );
-      // For 90°/270° rotated symbols the visible W and H are swapped, so the
-      // upright-shape assertions on bar height / module direction stop applying.
-      const rotation = objectRotation(obj.props);
-      const isQuarterRotated = rotation === "R" || rotation === "B";
       // LOGMARS spec places the human-readable line ABOVE the bars. Labelary's
       // bounding box for ^FO50,50 reports y=50 (bar top, not visual top), and
       // height includes the bar height plus a ~20 dot text-above zone reserved
@@ -141,11 +149,13 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
         "plessey",                           // different bar encoding algorithm
       ].includes(obj.type);
 
-      if (isEanUpc) {
+      if (isEanUpc && !isQuarterRotated) {
         // Known discrepancy: Labelary reserves barHeight + EAN_TEXT_ZONE_DOTS (13 dots)
         // even with printInterpretation=N. getDisplaySize intentionally returns only the
         // bar height because the text zone is blank whitespace — bwip does not render it.
         // expected_bounds.height in fixtures reflects the true Labelary value (barHeight+13).
+        // Under quarter rotation the text zone rotates onto the horizontal axis, so the
+        // bbox height already equals the bar length; the subtraction would be wrong.
         expect(displaySize.h * 8).toBeCloseTo(
           tc.expected_bounds.height - EAN_TEXT_ZONE_DOTS,
           1,
@@ -175,7 +185,14 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       //   hasBwipSizeMismatch — bwip-natural size diverges from Labelary (see above).
       // EAN/UPC and logmars heights are excluded — see isEanUpc/hasLogmarsTextZone above.
       if (obj.type !== "codablock" && !hasBwipSizeMismatch) {
-        expect(displaySize.w * 8).toBeCloseTo(tc.expected_bounds.width, 1);
+        // Quarter-rotated EAN/UPC moves the EAN_TEXT_ZONE_DOTS guard extension
+        // onto the width axis instead of the height axis, mirroring the upright
+        // height adjustment.
+        const widthAdjust = isEanUpc && isQuarterRotated ? EAN_TEXT_ZONE_DOTS : 0;
+        expect(displaySize.w * 8).toBeCloseTo(
+          tc.expected_bounds.width - widthAdjust,
+          1,
+        );
         if (!isEanUpc && !hasLogmarsTextZone) {
           expect(displaySize.h * 8).toBeCloseTo(tc.expected_bounds.height, 1);
         }
diff --git a/src/test/testModels.ts b/src/test/testModels.ts
index 3d101e0f..06e94971 100644
--- a/src/test/testModels.ts
+++ b/src/test/testModels.ts
@@ -376,4 +376,36 @@ export const testModels: Record<string, LabelObject> = {
     rotation: 0,
     props: { content: "DataMatrixTest", dimension: 5, quality: 200, rotation: "R" },
   },
+  barcode_code39_rot_R: {
+    id: "rot6",
+    type: "code39",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "CODE39", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "R" },
+  },
+  barcode_code39_rot_B: {
+    id: "rot7",
+    type: "code39",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "CODE39", height: 100, moduleWidth: 2, printInterpretation: false, checkDigit: false, rotation: "B" },
+  },
+  barcode_ean13_rot_R: {
+    id: "rot8",
+    type: "ean13",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "123456789012", height: 100, moduleWidth: 2, printInterpretation: false, rotation: "R" },
+  },
+  barcode_ean13_rot_B: {
+    id: "rot9",
+    type: "ean13",
+    x: 100,
+    y: 100,
+    rotation: 0,
+    props: { content: "123456789012", height: 100, moduleWidth: 2, printInterpretation: false, rotation: "B" },
+  },
 };
diff --git a/tests/fixtures/labelary_images/barcode_code39_rot_B.png b/tests/fixtures/labelary_images/barcode_code39_rot_B.png
new file mode 100644
index 0000000000000000000000000000000000000000..9f1f80e27384b8b8f9980989b204b9af6c848632
GIT binary patch
literal 6751
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtgAhE_%<3hurkO0m!N85kswdAc};RLn{KVbA4uP(y*sz_6z&(15FhY4OZd
zksc<cgBfX(tcx2w3}!`w<b`_Drh%kcMx{rCWjH1Whv{byd9WWa;BsT^WsEgCts%jB
zn9<;mJnP~F5dqd262MF#!Ro@eD@DxBilGgd6*72UOaf&M3BClA&A`0lpdxWr2c($O
z%^0NHrRm}sBcN#$8y@}#au+vf95@0r9hBEDsBSj6#ApE0lnk^NsOn$=1A&ai^WPof
z0yU83Zj6BqdNW%m@--v^GpiKyt`t!2Y-3I!H9MD_)afZ<-~qb(f&|c6pfW&);qZT`
z6`erSfsPbe;GLGZggF7^i(^20fdxd<Lk5X|{g4vF2c*4+X%R!L5x24|!(pIrP1t}2
z14Vh*36viPKGZ|3NJs*j4hm{us7kzK0EPDgL!iCD+?HU$(Dol{g)qo;U|13`7He!0
zD8h(~Y$9Wm+~^`MK5(QoSVF`aU1+HirWR(@fW{`)=)#DPMrejYcRJK(Otj0J#Kk5o
zC~<@|X5PdW*$42~yNqP!O+v=fG3yc+*;q?j%*;n1Ph%}<=@^?t7Ns~+3@kwrmpAEI
zlw#yftkH!dqYjRWk#?DnMzKl2SgO>U1gh0h>CsNmXy0(OPdqvnFgipsIy6L}?Kvtv
tI*>RzfI2#GJUX5}I*&l3`4a{Pp_JuXH@B;c1LuJlJYD@<);T3K0RUBq>`edw

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_code39_rot_R.png b/tests/fixtures/labelary_images/barcode_code39_rot_R.png
new file mode 100644
index 0000000000000000000000000000000000000000..facfef2cfefe99c8083b5ffaafb6e8f54b4d183a
GIT binary patch
literal 6751
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtgAhE_%<3hurkO0m!N85kswdAc};RLn{KVbA4uP(y*sz_6z&(15FhY4OZd
zksc<cgBfX(tcx2w3}!`w<b`_Drh%kcMx{rCWjH1Whv{byd9WWa;BsT^WsEgCts%jB
zn9<;mJnP~F5dqd262MF#!Rpd@@r)5r#l!@Y&A{y9pdxWr2PDtwW(?Bc!n7+z%*~3S
z4VY6hcwS5b<s1pVhKK)wa*G=@4jciR4$5m6R5u%3Vl)7mkPNgJXyU;F1_Bw2=f6AH
z1&nGS)7=;Y8}w$jPULGy1ZGw#=3ObE+}XyA=AI@r=O$p}_L7r2JtYi0Ku=td06Gg)
z2FNfR{tvaH6KFcnks=Gc(-N03CxCo$3}`Q~fM|Ni0QEDv9WW<I{OgAlC_W(5dzcn6
z#2Rrc%Q74W28Ib6&|aV@4?BV4<-mt}hzk;ufR=+|0vM_iFBw45vA_`MEMR6#uwZEW
z54A!VWI8aY2^dRUWHSzQY!Vk;2k@8FjKswzMsyJ}7F%qR8(kE{2acQwOO=?Jk3dC+
zHE+@}^AQSmGGmiEnU6r0CoXT&GqSP9CaEPYp(KW_ASN#B5?Rt><V~!xNnGY@K&uj9
z#Wk!3qhnD@C|rrFH;K!enDId%6^zV^kwCpUDm~f>8tog7_K8Qw0!D{OMu&z7^dv^5
tM+Xu|2T(@`jz`DSN9Pe}G=IXtz*4tdOI$t%I1R+W;OXk;vd$@?2>?JH>m2|9

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_ean13_rot_B.png b/tests/fixtures/labelary_images/barcode_ean13_rot_B.png
new file mode 100644
index 0000000000000000000000000000000000000000..477dd1d9e221b115015ede858ad09c28168a7fed
GIT binary patch
literal 6677
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtgAhE_m^yKhLu+%5hL43agTE{-7;bCQ49bGaSVP~b8!>}d)#;ObynJTq0K
zhe_#RMw%q+;sy_cS&<-lp`Ns9AZeCS>Cs>rj>*Ac`k6x>`3DTR+!((y#u}a0kYGK`
zXz)j#b#a1-0P741U?z}Ybz$6<BIZ`b+y=}FEBIeb0%Z*ezJ`bYfpUu*G!7gAY6oQ|
z0-5E4>SlvWj0V6A=a3Av*9fSofPv?~JH!e#km+uWfe9v?K`K-v&gy{NzzMWY;w1yf
zAqxx_c!P3hf(1j{f1q3s(;^1p!w@&1=hu>xIz1%}JU~?!B!KpUGP%qFw7iYon^p`U
zhh*@;yov4}iGTf&62k{%I>-&NM%>D>3?PS?umSA_it@0dyN4`qHe3V+65~Xe6A~~=
zEo|OoIQ$<Hk`0}SBA}oYfd!?TF(`grm_V^f$eU2LO;9HgjBH@y!3>21AL=14NJs*v
z6i|x77MtkaM0YO1$VMxi!D*TuoThtmr|Cwtzy+qQ#3jrLpcH+qK@U_LG(BX%9@%>t
zL6Loh9TwR*yvYkrw05`?EqM+_4<2l>Nz3RWocYk=13fR0m1toJ5tbLQMi;?EOI#5I
zjQ-Y%d=0?d!z9JLD+Sa7Xk$hTc69e(=1sIvATF}OB`t}06BZ;e7h+GeG%2A7rv*@C
ze_;a^l>zdwf*7-e0>`E~IP?9&o%zrUa02zssPt%)cC;x!+JzbI*^TySM|<*U%@OoQ
z*{JmB0LO3~;22HkqXU?u<GQ2c*`wq513kUL$RMl4*?q>l;16*2hQZU-&t;ucLK6Ub
CVbvJ`

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/barcode_ean13_rot_R.png b/tests/fixtures/labelary_images/barcode_ean13_rot_R.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4018732e9a50cdc2c5f344475ca1b19296484f5
GIT binary patch
literal 6677
zcmeAS@N?(olHy`uVBq!ia0y~yVAcU)4xj+T<foO6KuWH}HKHUqzqBYhmBA-5DK#gt
zs8YdL&sfhu*VNp=DA_2<;^RT?bwHI`AeGKVsfi_-`FRQ<nYpP9;i)M)3T6tviIoaQ
z21aHIhGtgAhE_(V3hurk^0w#ZGcZWjc)B=-RLn{KVbA4uP(y*sz_6z&(15FhY4OZd
zksc<cgBfX(tcx2w3}!`w<b`_Drh%kcMx{rCWjH1Wht+2edE_53;BsT^Wn61?T0?^M
zFrUF6dDg`VA_A;4B!HPfg4KmFDpky_in$G#6*71-rh>ADL|Mbb|3JCL4H^fI0JVcM
z6Iy0rj5Xp`mSs2$RAs_ea#9CqBoF(65A`CzEaxDSkOb5Wvc%08WUEWl#WO}gS4?cs
zo7p;%uOShb8>N_crGT<u8?(e&kZu7^s9L7B|3GdJ(;^08km*1-I7|ongB|LRScpFu
z(cD8IZ!;eL546jTF|eT%XgSD<3%t`3moO)QEI0;q7O;S5ddML0uOCuk`0zm7Z~(2y
zxS+b(;1Z(&$b@8|vw)sDSinG_{NVZT4hd*AP#A;UfGrdfFiI_8sP>dFfE;o`0%$L&
zER#WZ4@PV@LPI*i1f;=11wC+grHHv%F+d{w#UyZK^AU_}LV-(MS^!!n@sa_Q>J}IR
zLmyb?Bv>$DL^gWij4c!xFk%zUo3Qi-3kBjLn_(?5P48udr0FfEz-ihVGfe~Yh{Q`?
zs6Rr%{<y)2;Sa2dmSA)d=TP)ifR-1q=1uf)MN71p-lSf15pph}*kmFu(Grt4F}+E*
z5{k$o2;Dt&EQm3SAhbk+o`!&Vq~{A8w1m<Emr!po^X7t3U`cBZEosBRC2b-*!IBm&
zO%o`BMx{raw4+V=(H_od&koqc9PQDfwc1DPlF{*x(Q%*A@vhNfz|rB)(P3W#ow`x!
h(a~^{N5dHz?l0u*E|anH2F~6vc)I$ztaD0e0svw(+pYir

literal 0
HcmV?d00001

diff --git a/tests/fixtures/labelary_images/fixtures.json b/tests/fixtures/labelary_images/fixtures.json
index 0aa9576e..391de5fe 100644
--- a/tests/fixtures/labelary_images/fixtures.json
+++ b/tests/fixtures/labelary_images/fixtures.json
@@ -190,110 +190,244 @@
     {
       "id": "barcode_code93_standard",
       "zpl_input": "^XA^BY2^FO50,50^BAN,100,N,N,N^FDCODE93^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 182, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 182,
+        "height": 100
+      },
       "image_ref": "barcode_code93_standard.png"
     },
     {
       "id": "barcode_code11_standard",
       "zpl_input": "^XA^BY2^FO50,50^B1N,N,100,N,N^FD12345^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 178, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 178,
+        "height": 100
+      },
       "image_ref": "barcode_code11_standard.png"
     },
     {
       "id": "barcode_industrial2of5_standard",
       "zpl_input": "^XA^BY2^FO50,50^BIN,100,N,N^FD12345678^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 262, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 262,
+        "height": 100
+      },
       "image_ref": "barcode_industrial2of5_standard.png"
     },
     {
       "id": "barcode_standard2of5_standard",
       "zpl_input": "^XA^BY2^FO50,50^BJN,100,N,N^FD12345678^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 242, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 242,
+        "height": 100
+      },
       "image_ref": "barcode_standard2of5_standard.png"
     },
     {
       "id": "barcode_codabar_standard",
       "zpl_input": "^XA^BY2^FO50,50^BKN,N,100,N,N^FDA12345A^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 174, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 174,
+        "height": 100
+      },
       "image_ref": "barcode_codabar_standard.png"
     },
     {
       "id": "barcode_logmars_standard",
       "zpl_input": "^XA^BY2^FO50,50^BLN,100,N^FDLOGMARS1^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 350, "height": 120 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 350,
+        "height": 120
+      },
       "image_ref": "barcode_logmars_standard.png"
     },
     {
       "id": "barcode_logmars_with_text",
       "zpl_input": "^XA^BY2^FO50,50^BLN,100,Y^FDLOGMARS1^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 350, "height": 120 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 350,
+        "height": 120
+      },
       "image_ref": "barcode_logmars_with_text.png"
     },
     {
       "id": "barcode_msi_standard",
       "zpl_input": "^XA^BY2,2^FO50,50^BMN,N,100,N,N^FD12345678^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 230, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 230,
+        "height": 100
+      },
       "image_ref": "barcode_msi_standard.png"
     },
     {
       "id": "barcode_plessey_standard",
       "zpl_input": "^XA^BY2,2^FO50,50^BPN,N,100,N,N^FD12345678^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 294, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 294,
+        "height": 100
+      },
       "image_ref": "barcode_plessey_standard.png"
     },
     {
       "id": "barcode_planet_standard",
       "zpl_input": "^XA^BY2^FO50,50^B5N,100,N,N^FD12345678901^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 307, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 307,
+        "height": 100
+      },
       "image_ref": "barcode_planet_standard.png"
     },
     {
       "id": "barcode_postal_standard",
       "zpl_input": "^XA^BY2^FO50,50^BZN,100,N,N^FD12345^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 157, "height": 100 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 157,
+        "height": 100
+      },
       "image_ref": "barcode_postal_standard.png"
     },
     {
       "id": "barcode_gs1databar_standard",
       "zpl_input": "^XA^BY2^FO50,50^BRN,1,2,2,100,1^FD0112345678901^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 192, "height": 66 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 192,
+        "height": 66
+      },
       "image_ref": "barcode_gs1databar_standard.png"
     },
     {
       "id": "barcode_upce_standard",
       "zpl_input": "^XA^BY2^FO50,50^B9N,100,N,N^FD012345^FS^XZ",
-      "expected_bounds": { "x": 50, "y": 50, "width": 102, "height": 113 },
+      "expected_bounds": {
+        "x": 50,
+        "y": 50,
+        "width": 102,
+        "height": 113
+      },
       "image_ref": "barcode_upce_standard.png"
     },
     {
       "id": "barcode_code128_rot_R",
       "zpl_input": "^XA^BY2^FO100,100^BCR,100,N,N,N^FD123456^FS^XZ",
-      "expected_bounds": { "x": 100, "y": 100, "width": 100, "height": 202 },
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 100,
+        "height": 202
+      },
       "image_ref": "barcode_code128_rot_R.png"
     },
     {
       "id": "barcode_code128_rot_I",
       "zpl_input": "^XA^BY2^FO100,100^BCI,100,N,N,N^FD123456^FS^XZ",
-      "expected_bounds": { "x": 100, "y": 100, "width": 202, "height": 100 },
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 202,
+        "height": 100
+      },
       "image_ref": "barcode_code128_rot_I.png"
     },
     {
       "id": "barcode_code128_rot_B",
       "zpl_input": "^XA^BY2^FO100,100^BCB,100,N,N,N^FD123456^FS^XZ",
-      "expected_bounds": { "x": 100, "y": 100, "width": 100, "height": 202 },
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 100,
+        "height": 202
+      },
       "image_ref": "barcode_code128_rot_B.png"
     },
     {
       "id": "barcode_qr_rot_R",
       "zpl_input": "^XA^FO100,100^BQR,2,4^FDQA,Hello World^FS^XZ",
-      "expected_bounds": { "x": 100, "y": 110, "width": 84, "height": 84 },
+      "expected_bounds": {
+        "x": 100,
+        "y": 110,
+        "width": 84,
+        "height": 84
+      },
       "image_ref": "barcode_qr_rot_R.png"
     },
     {
       "id": "barcode_datamatrix_rot_R",
       "zpl_input": "^XA^FO100,100^BXR,5,200^FDDataMatrixTest^FS^XZ",
-      "expected_bounds": { "x": 100, "y": 100, "width": 90, "height": 90 },
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 90,
+        "height": 90
+      },
       "image_ref": "barcode_datamatrix_rot_R.png"
+    },
+    {
+      "id": "barcode_code39_rot_R",
+      "zpl_input": "^XA^BY2^FO100,100^B3R,N,100,N,N^FDCODE39^FS^XZ",
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 100,
+        "height": 254
+      },
+      "image_ref": "barcode_code39_rot_R.png"
+    },
+    {
+      "id": "barcode_code39_rot_B",
+      "zpl_input": "^XA^BY2^FO100,100^B3B,N,100,N,N^FDCODE39^FS^XZ",
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 100,
+        "height": 254
+      },
+      "image_ref": "barcode_code39_rot_B.png"
+    },
+    {
+      "id": "barcode_ean13_rot_R",
+      "zpl_input": "^XA^BY2^FO100,100^BER,100,N,N^FD123456789012^FS^XZ",
+      "expected_bounds": {
+        "x": 87,
+        "y": 100,
+        "width": 113,
+        "height": 190
+      },
+      "image_ref": "barcode_ean13_rot_R.png"
+    },
+    {
+      "id": "barcode_ean13_rot_B",
+      "zpl_input": "^XA^BY2^FO100,100^BEB,100,N,N^FD123456789012^FS^XZ",
+      "expected_bounds": {
+        "x": 100,
+        "y": 100,
+        "width": 113,
+        "height": 190
+      },
+      "image_ref": "barcode_ean13_rot_B.png"
     }
   ]
 }
\ No newline at end of file
diff --git a/tests/fixtures/testCases.ts b/tests/fixtures/testCases.ts
index 3186b3ef..a88e99b2 100644
--- a/tests/fixtures/testCases.ts
+++ b/tests/fixtures/testCases.ts
@@ -229,4 +229,34 @@ export const testCases: TestCase[] = [
     expected_bounds: { x: 100, y: 100, width: 90, height: 90 },
     image_ref: "barcode_datamatrix_rot_R.png",
   },
+  // Code39 (^B3) and EAN13 (^BE) use different param orders than Code128's
+  // ^BC, so cover them too. Bounds populated via measure_bbox.mjs.
+  {
+    id: "barcode_code39_rot_R",
+    zpl_input: "^XA^BY2^FO100,100^B3R,N,100,N,N^FDCODE39^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 100, height: 254 },
+    image_ref: "barcode_code39_rot_R.png",
+  },
+  {
+    id: "barcode_code39_rot_B",
+    zpl_input: "^XA^BY2^FO100,100^B3B,N,100,N,N^FDCODE39^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 100, height: 254 },
+    image_ref: "barcode_code39_rot_B.png",
+  },
+  // EAN13 has extended guard bars that extend past the bar-height baseline.
+  // After R rotation those guards sit LEFT of the FO anchor (ink at x=87 with
+  // FO=100), so the bbox starts to the left of obj.x. The B rotation keeps the
+  // ink within the FO-anchored corner.
+  {
+    id: "barcode_ean13_rot_R",
+    zpl_input: "^XA^BY2^FO100,100^BER,100,N,N^FD123456789012^FS^XZ",
+    expected_bounds: { x: 87, y: 100, width: 113, height: 190 },
+    image_ref: "barcode_ean13_rot_R.png",
+  },
+  {
+    id: "barcode_ean13_rot_B",
+    zpl_input: "^XA^BY2^FO100,100^BEB,100,N,N^FD123456789012^FS^XZ",
+    expected_bounds: { x: 100, y: 100, width: 113, height: 190 },
+    image_ref: "barcode_ean13_rot_B.png",
+  },
 ];

From 6b212ad86171cafcd3235e4f446a11fe11cd2c55 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:39:00 +0200
Subject: [PATCH 10/20] refactor(test): dedupe EAN/UPC type check, hoist
 FixtureMapping interface
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

labelarySync had two parallel `includes` checks for the EAN/UPC type
list under different names (isEanUpcType / isEanUpc). Hoist the single
`isEanUpc` declaration up next to the rotation flags so all later
branches share one source.

The fetch script's local `Existing` interface lived inside main();
move it to module scope as FixtureMapping for the same reason — one
place to read the fixture file's shape.
---
 src/test/labelarySync.test.ts            | 5 ++---
 tests/scripts/fetch_labelary_fixtures.ts | 7 +++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/test/labelarySync.test.ts b/src/test/labelarySync.test.ts
index a34a6739..5cac8bfb 100644
--- a/src/test/labelarySync.test.ts
+++ b/src/test/labelarySync.test.ts
@@ -91,6 +91,7 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       // upright-shape assertions on bar height / module direction stop applying.
       const rotation = objectRotation(obj.props);
       const isQuarterRotated = rotation === "R" || rotation === "B";
+      const isEanUpc = ["ean13", "ean8", "upca", "upce"].includes(obj.type);
 
       // Verify visual position (top-left of the rendered bounding box in dots).
       // This mimics the positioning logic in BarcodeObject.tsx.
@@ -116,8 +117,7 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       // symbol. Under R rotation those guards sit LEFT of the FO anchor, so
       // the bbox.x is below obj.x. The model still holds obj.x as FO, so the
       // strict x-equality check is dropped for rotated EAN/UPC.
-      const isEanUpcType = ["ean13", "ean8", "upca", "upce"].includes(obj.type);
-      if (!(isEanUpcType && isQuarterRotated)) {
+      if (!(isEanUpc && isQuarterRotated)) {
         expect(visualX).toBe(tc.expected_bounds.x);
       }
       expect(visualY).toBeCloseTo(tc.expected_bounds.y, 0);
@@ -125,7 +125,6 @@ describe("Labelary Sync - Canvas Dimension Logic", () => {
       expect(displaySize.w).toBeGreaterThan(0);
       expect(displaySize.h).toBeGreaterThan(0);
 
-      const isEanUpc = ["ean13", "ean8", "upca", "upce"].includes(obj.type);
       const is1DCode = [
         "code128",
         "code39",
diff --git a/tests/scripts/fetch_labelary_fixtures.ts b/tests/scripts/fetch_labelary_fixtures.ts
index 41ad85f5..8b8bcb13 100644
--- a/tests/scripts/fetch_labelary_fixtures.ts
+++ b/tests/scripts/fetch_labelary_fixtures.ts
@@ -7,6 +7,10 @@ const FIXTURES_DIR = path.resolve(
   "tests/fixtures/labelary_images",
 );
 
+interface FixtureMapping {
+  test_cases: typeof testCases;
+}
+
 async function fetchLabelaryImage(zpl: string): Promise<Buffer> {
   // Use 8dpmm (203 dpi) and 4x4 inches as standard canvas dimensions
   const url = "http://api.labelary.com/v1/printers/8dpmm/labels/4x4/0/";
@@ -39,8 +43,7 @@ async function main() {
   // append entries for new test cases — never overwrite existing ones, since
   // testCases.ts may carry rounded/placeholder bounds that have been refined
   // by hand or via tests/scripts/measure_bbox.mjs.
-  interface Existing { test_cases: typeof testCases }
-  const existing: Existing = fs.existsSync(mappingFile)
+  const existing: FixtureMapping = fs.existsSync(mappingFile)
     ? JSON.parse(fs.readFileSync(mappingFile, "utf8"))
     : { test_cases: [] };
   const knownIds = new Set(existing.test_cases.map((c) => c.id));

From 2170986c0bb000bb9a746223cca1183a7787a6db Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 18:41:42 +0200
Subject: [PATCH 11/20] test(rotation): unit tests for helpers and bwip option
 translation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- isZplRotation: accepts ZPL N/R/I/B, rejects bwip's L and other strings
- objectRotation: returns valid prop, falls back to N for missing/garbage
- buildBwipOptions: rotate option absent for N, forwarded for R/I,
  translated B → L for bwip-js
- getDisplaySize: swaps W/H for R and B, leaves I unchanged

Locks the contract that previously broke silently when ZPL B was passed
to bwip-js as-is (treated as 'no rotation') and when getDisplaySize
read post-rotation canvas dimensions through upright formulas.
---
 src/components/Canvas/bwipHelpers.test.ts | 60 ++++++++++++++++++++++-
 src/registry/rotation.test.ts             | 31 ++++++++++++
 2 files changed, 90 insertions(+), 1 deletion(-)
 create mode 100644 src/registry/rotation.test.ts

diff --git a/src/components/Canvas/bwipHelpers.test.ts b/src/components/Canvas/bwipHelpers.test.ts
index 6e43414d..3657834a 100644
--- a/src/components/Canvas/bwipHelpers.test.ts
+++ b/src/components/Canvas/bwipHelpers.test.ts
@@ -1,5 +1,6 @@
 import { describe, it, expect } from "vitest";
-import { getEanUpcLayout } from "./bwipHelpers";
+import { buildBwipOptions, getDisplaySize, getEanUpcLayout } from "./bwipHelpers";
+import type { LabelObject } from "../../registry";
 
 describe("getEanUpcLayout", () => {
   // bwip-js native canvas widths (no quiet zones, scale=2):
@@ -67,3 +68,60 @@ describe("getEanUpcLayout", () => {
     });
   });
 });
+
+describe("rotation pipeline", () => {
+  // Minimal code128 fixture; only the props used by buildBwipOptions/
+  // getDisplaySize matter for these checks.
+  const baseCode128 = (rotation: "N" | "R" | "I" | "B"): LabelObject =>
+    ({
+      id: "1",
+      type: "code128",
+      x: 0,
+      y: 0,
+      rotation: 0,
+      props: {
+        content: "ABC",
+        height: 100,
+        moduleWidth: 2,
+        printInterpretation: false,
+        checkDigit: false,
+        rotation,
+      },
+    }) as LabelObject;
+
+  it("does not set rotate for N", () => {
+    const opts = buildBwipOptions(baseCode128("N"), 1, 8);
+    expect(opts?.rotate).toBeUndefined();
+  });
+
+  it("forwards R and I unchanged to bwip-js", () => {
+    expect(buildBwipOptions(baseCode128("R"), 1, 8)?.rotate).toBe("R");
+    expect(buildBwipOptions(baseCode128("I"), 1, 8)?.rotate).toBe("I");
+  });
+
+  it("translates ZPL B to bwip L (270° CW)", () => {
+    expect(buildBwipOptions(baseCode128("B"), 1, 8)?.rotate).toBe("L");
+  });
+
+  it("swaps display W and H for quarter rotations", () => {
+    // Pretend bwip produced an unrotated 200x100 bitmap.
+    const fakeCanvas = { width: 200, height: 100 } as HTMLCanvasElement;
+    const upright = getDisplaySize(baseCode128("N"), fakeCanvas, 1, 8);
+    // For R/B, bwip's bitmap is post-rotation (100x200). Pass that and check
+    // the upright dimensions are recovered then re-swapped to visible.
+    const rotatedCanvas = { width: 100, height: 200 } as HTMLCanvasElement;
+    const rotR = getDisplaySize(baseCode128("R"), rotatedCanvas, 1, 8);
+    const rotB = getDisplaySize(baseCode128("B"), rotatedCanvas, 1, 8);
+    expect(rotR.w).toBe(upright.h);
+    expect(rotR.h).toBe(upright.w);
+    expect(rotB.w).toBe(upright.h);
+    expect(rotB.h).toBe(upright.w);
+  });
+
+  it("leaves dimensions untouched for I (180°)", () => {
+    const fakeCanvas = { width: 200, height: 100 } as HTMLCanvasElement;
+    const upright = getDisplaySize(baseCode128("N"), fakeCanvas, 1, 8);
+    const inverted = getDisplaySize(baseCode128("I"), fakeCanvas, 1, 8);
+    expect(inverted).toEqual(upright);
+  });
+});
diff --git a/src/registry/rotation.test.ts b/src/registry/rotation.test.ts
new file mode 100644
index 00000000..ad5ad977
--- /dev/null
+++ b/src/registry/rotation.test.ts
@@ -0,0 +1,31 @@
+import { describe, it, expect } from "vitest";
+import { isZplRotation, objectRotation, ZPL_ROTATIONS } from "./rotation";
+
+describe("isZplRotation", () => {
+  it("accepts the four ZPL letters", () => {
+    for (const r of ZPL_ROTATIONS) {
+      expect(isZplRotation(r)).toBe(true);
+    }
+  });
+
+  it("rejects bwip-js's L (not a ZPL letter) and other strings", () => {
+    expect(isZplRotation("L")).toBe(false);
+    expect(isZplRotation("n")).toBe(false);
+    expect(isZplRotation("")).toBe(false);
+    expect(isZplRotation("RR")).toBe(false);
+  });
+});
+
+describe("objectRotation", () => {
+  it("returns the rotation when valid", () => {
+    expect(objectRotation({ rotation: "R" })).toBe("R");
+    expect(objectRotation({ rotation: "B" })).toBe("B");
+  });
+
+  it("falls back to N when missing or invalid", () => {
+    expect(objectRotation({})).toBe("N");
+    expect(objectRotation({ rotation: undefined })).toBe("N");
+    expect(objectRotation({ rotation: "L" })).toBe("N");
+    expect(objectRotation({ rotation: "garbage" })).toBe("N");
+  });
+});

From 1f21d20ab9129ad9f161c364b4000f9a689af4d0 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 19:01:56 +0200
Subject: [PATCH 12/20] fix(canvas): rotated barcode HRI text overlay instead
 of bwip includetext
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Using bwip includetext for rotated barcodes embedded the text into the
bitmap at bwip's internal scale, making the bitmap larger than what
getDisplaySize computed (bars only), so KImage stretched/squished the
pixel buffer — appearing blurry and distorted.

Fix: always render a bar-only bitmap (no includetext), then add a
rotated Konva Text node positioned at the correct edge for each rotation:
  R  → right of barcode, rotation=90
  I  → above barcode (upside-down), rotation=180
  B  → left of barcode, rotation=-90

EAN/UPC HRI on rotated symbols is intentionally skipped; the digit
layout requires per-rotation coordinate transforms that are out of scope.
---
 src/components/Canvas/BarcodeObject.tsx | 93 +++++++++++++++++++++++--
 src/components/Canvas/bwipHelpers.ts    | 12 ++--
 2 files changed, 93 insertions(+), 12 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index 8804f30c..aa773ed5 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -152,13 +152,12 @@ export function BarcodeObject({
     // Force-off when the symbology has no HRI in ZPL (e.g. GS1 Databar) — the
     // canvas must match the print output even if a legacy saved object still
     // carries printInterpretation: true.
-    // Manual HRI overlays only run for upright barcodes; when rotated, bwip-js
-    // bakes the text into the bitmap (see bwipHelpers).
-    const isUpright = objectRotation(obj.props) === "N";
-    const printInterp =
-      isUpright &&
+    const rotation = objectRotation(obj.props);
+    const isUpright = rotation === "N";
+    const printInterpEnabled =
       !ObjectRegistry[obj.type]?.interpretationLocked &&
       !!(obj.props as { printInterpretation?: boolean }).printInterpretation;
+    const printInterp = isUpright && printInterpEnabled;
     const moduleWidth =
       (obj.props as { moduleWidth?: number }).moduleWidth ?? 2;
     const textFontSize = Math.max(dotsToPx(moduleWidth * 10, scale, dpmm), 6);
@@ -449,6 +448,14 @@ export function BarcodeObject({
 
     // ── Other 1D: separate Konva Text below bars ──────────────────────────
     const showText = BARCODE_1D_TYPES.has(obj.type) && printInterp;
+    // Rotated 1D (non-EAN/UPC): text overlay rotated to match the barcode.
+    // EAN/UPC rotated HRI is skipped (the digit layout is too complex to
+    // position correctly without a per-rotation coordinate transform).
+    const showRotatedText =
+      !isUpright &&
+      printInterpEnabled &&
+      BARCODE_1D_TYPES.has(obj.type) &&
+      !EAN_UPC_TYPES.has(obj.type);
 
     let displayText = rawContent;
     if (obj.type === "code39") {
@@ -548,6 +555,82 @@ export function BarcodeObject({
       );
     }
 
+    // ── Rotated 1D: text overlay rotated alongside the bars ──────────────
+    if (showRotatedText) {
+      // Compute text anchor and rotation so that the HRI appears in the same
+      // relative position as Zebra firmware would render it. In each case,
+      // Konva rotation is in degrees CW; the anchor is the top-left of the
+      // unrotated element (= the rotation pivot).
+      //   R (90° CW):  text to the right, extending downward (rot=90)
+      //   I (180°):    text above the barcode, upside-down (rot=180)
+      //   B (270° CW): text to the left, extending downward (rot=-90)
+      let txtX: number;
+      let txtY: number;
+      let txtRot: number;
+      let txtWidth: number;
+
+      if (rotation === "R") {
+        txtX = w + textGap;
+        txtY = 0;
+        txtRot = 90;
+        txtWidth = h;
+      } else if (rotation === "I") {
+        // Anchor at right edge, text renders leftward (180° flips x and y).
+        txtX = w;
+        txtY = -textGap;
+        txtRot = 180;
+        txtWidth = w;
+      } else {
+        // B (270° CW): anchor at bottom-left, text extends upward.
+        txtX = -textGap;
+        txtY = h;
+        txtRot = -90;
+        txtWidth = h;
+      }
+
+      return (
+        <Group
+          id={obj.id}
+          x={x}
+          y={y}
+          draggable
+          onClick={(e) =>
+            onSelect(e.evt.shiftKey || e.evt.ctrlKey || e.evt.metaKey)
+          }
+          onTap={() => onSelect(false)}
+          onDragMove={(e) =>
+            e.target.position(snapPos(e.target.x(), e.target.y()))
+          }
+          onDragEnd={handleDragEnd}
+        >
+          <KImage
+            x={0}
+            y={0}
+            image={barcodeCanvas}
+            width={Math.max(w, 1)}
+            height={Math.max(h, 1)}
+            imageSmoothingEnabled={false}
+            stroke={isSelected ? "#6366f1" : undefined}
+            strokeWidth={isSelected ? 2 : 0}
+            strokeScaleEnabled={false}
+          />
+          <Text
+            x={txtX}
+            y={txtY}
+            rotation={txtRot}
+            width={Math.max(txtWidth, 1)}
+            text={displayText}
+            fontSize={textFontSize}
+            fontFamily="'Courier New', monospace"
+            align="center"
+            wrap="none"
+            fill="#000000"
+            listening={false}
+          />
+        </Group>
+      );
+    }
+
     return (
       <KImage
         id={obj.id}
diff --git a/src/components/Canvas/bwipHelpers.ts b/src/components/Canvas/bwipHelpers.ts
index 01785359..6b596449 100644
--- a/src/components/Canvas/bwipHelpers.ts
+++ b/src/components/Canvas/bwipHelpers.ts
@@ -347,13 +347,11 @@ export function buildBwipOptions(
     // ZPL uses N/R/I/B (B = 270° CW). bwip-js uses N/R/I/L (L = 90° CCW =
     // 270° CW). The other three letters mean the same thing in both.
     opts.rotate = rotation === "B" ? "L" : rotation;
-    // When the symbol is rotated we delegate HRI text to bwip-js (so it gets
-    // rotated alongside the bars). The manual text overlays in BarcodeObject
-    // assume an upright bitmap and do not rotate; gating them out is paired
-    // with this flag. For 'N' we keep the previous behaviour: manual overlays
-    // give pixel-perfect EAN/UPC labels and the LOGMARS-above placement.
-    const printInterp = !!(obj.props as { printInterpretation?: boolean }).printInterpretation;
-    if (printInterp) opts.includetext = true;
+    // HRI text is handled as a Konva overlay in BarcodeObject (same as for
+    // upright barcodes). Using bwip's includetext would embed text into the
+    // bitmap at bwip's internal scale, making the bitmap taller/wider than the
+    // bar-only dimensions that getDisplaySize computes — causing the KImage to
+    // stretch the bitmap incorrectly and appear blurry/distorted.
   }
   return opts;
 }

From d66a2ac8ed2525b298cf3fff09eacc527a4b2812 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 19:24:05 +0200
Subject: [PATCH 13/20] fix(canvas): correct rotated HRI text anchor math and
 include EAN/UPC
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Anchor offsets for R and B rotations were off by textFontSize because
Konva's rotation pivot means the font-height dimension extends *away*
from the anchor, not toward the bars. Fixed by deriving screen-space
bounding boxes from the full transform (rot=90: fh spans leftward,
width spans downward; rot=-90: fh spans rightward, width spans upward).

EAN/UPC types are now included in showRotatedText (the plain-text
overlay). LOGMARS text position is mirrored for quarter rotations
(text-above-bars upright → left for R, right for B) and mirrored for
180° (below instead of above).
---
 src/components/Canvas/BarcodeObject.tsx | 59 ++++++++++++++++++-------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index aa773ed5..00c89523 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -448,14 +448,11 @@ export function BarcodeObject({
 
     // ── Other 1D: separate Konva Text below bars ──────────────────────────
     const showText = BARCODE_1D_TYPES.has(obj.type) && printInterp;
-    // Rotated 1D (non-EAN/UPC): text overlay rotated to match the barcode.
-    // EAN/UPC rotated HRI is skipped (the digit layout is too complex to
-    // position correctly without a per-rotation coordinate transform).
+    // Rotated 1D: text overlay rotated to match the barcode orientation.
     const showRotatedText =
       !isUpright &&
       printInterpEnabled &&
-      BARCODE_1D_TYPES.has(obj.type) &&
-      !EAN_UPC_TYPES.has(obj.type);
+      BARCODE_1D_TYPES.has(obj.type);
 
     let displayText = rawContent;
     if (obj.type === "code39") {
@@ -557,32 +554,60 @@ export function BarcodeObject({
 
     // ── Rotated 1D: text overlay rotated alongside the bars ──────────────
     if (showRotatedText) {
-      // Compute text anchor and rotation so that the HRI appears in the same
-      // relative position as Zebra firmware would render it. In each case,
-      // Konva rotation is in degrees CW; the anchor is the top-left of the
-      // unrotated element (= the rotation pivot).
-      //   R (90° CW):  text to the right, extending downward (rot=90)
-      //   I (180°):    text above the barcode, upside-down (rot=180)
-      //   B (270° CW): text to the left, extending downward (rot=-90)
+      // Konva rotation=90 (CW): local (lx,ly) → screen (x0-ly, y0+lx).
+      //   Width (h) spans downward; height (fh) spans leftward.
+      //   → text RIGHT of barcode (x=[w+gap, w+gap+fh], y=[0,h]):
+      //     x0=w+gap+fh, y0=0
+      // Konva rotation=-90 (CCW): local (lx,ly) → screen (x0+ly, y0-lx).
+      //   Width (h) spans upward; height (fh) spans rightward.
+      //   → text LEFT of barcode (x=[-(gap+fh), -gap], y=[0,h]):
+      //     x0=-(gap+fh), y0=h
+      // Konva rotation=180: local (lx,ly) → screen (x0-lx, y0-ly).
+      //   Width (w) spans leftward; height (fh) spans upward.
+      //   → text ABOVE barcode (x=[0,w], y=[-(gap+fh), -gap]):
+      //     x0=w, y0=-gap
+      //
+      // LOGMARS places text ABOVE bars in upright, so for quarter rotations
+      // its side is mirrored (LEFT↔RIGHT); for 180° it goes BELOW.
+      const isTextAbove = obj.type === "logmars";
+
       let txtX: number;
       let txtY: number;
       let txtRot: number;
       let txtWidth: number;
 
       if (rotation === "R") {
-        txtX = w + textGap;
+        // rot=90: (x0-ly, y0+lx) — fh spans LEFT, W spans DOWN
+        // Standard: text RIGHT; LOGMARS: text LEFT
+        if (isTextAbove) {
+          txtX = -textGap;           // left edge at x=-gap, fh extends further left
+        } else {
+          txtX = w + textGap + textFontSize; // right edge at x=w+gap+fh, text to the right
+        }
         txtY = 0;
         txtRot = 90;
         txtWidth = h;
       } else if (rotation === "I") {
-        // Anchor at right edge, text renders leftward (180° flips x and y).
+        // rot=180: (x0-lx, y0-ly) — W spans LEFT, fh spans UP
+        // Standard: text ABOVE (y=[-(gap+fh), -gap])
+        // LOGMARS:  text BELOW (y=[h+gap, h+gap+fh])
         txtX = w;
-        txtY = -textGap;
+        if (isTextAbove) {
+          txtY = h + textGap + textFontSize;
+        } else {
+          txtY = -textGap;
+        }
         txtRot = 180;
         txtWidth = w;
       } else {
-        // B (270° CW): anchor at bottom-left, text extends upward.
-        txtX = -textGap;
+        // B (270° CW): rot=-90, (x0+ly, y0-lx) — fh spans RIGHT, W spans UP
+        // Standard: text LEFT (x=[-(gap+fh), -gap], y=[0,h]): x0=-(gap+fh), y0=h
+        // LOGMARS:  text RIGHT (x=[w+gap, w+gap+fh], y=[0,h]): x0=w+gap, y0=h
+        if (isTextAbove) {
+          txtX = w + textGap;
+        } else {
+          txtX = -(textGap + textFontSize);
+        }
         txtY = h;
         txtRot = -90;
         txtWidth = h;

From 1d5d1541361a3bf157fd554e7316fefa42a5538d Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:04:25 +0200
Subject: [PATCH 14/20] fix(canvas): correct rotated HRI text side and EAN/UPC
 display string
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

R (90°CW) renders text LEFT, B (270°CW) renders text RIGHT, matching
Zebra firmware and Labelary reference. LOGMARS is mirrored (text-above
upright → right for R, left for B). For rotated EAN/UPC the displayText
now includes the computed check digit instead of raw input content.
---
 src/components/Canvas/BarcodeObject.tsx | 38 +++++++++++++++++++------
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index 00c89523..dc418e0d 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -465,6 +465,28 @@ export function BarcodeObject({
         if (idx >= 0) sum += idx;
       }
       displayText = `${rawContent}${chars[sum % 43] ?? ""}`;
+    } else if (obj.type === "ean13") {
+      const d = rawContent.replace(/\D/g, "").slice(0, 12).padEnd(12, "0");
+      displayText = d + eanCheckDigit(d, 1, 3);
+    } else if (obj.type === "ean8") {
+      const d = rawContent.replace(/\D/g, "").slice(0, 7).padEnd(7, "0");
+      displayText = d + eanCheckDigit(d, 3, 1);
+    } else if (obj.type === "upca") {
+      const d = rawContent.replace(/\D/g, "").slice(0, 11).padEnd(11, "0");
+      displayText = d + eanCheckDigit(d, 3, 1);
+    } else if (obj.type === "upce") {
+      const digits6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");
+      const [vA, vB, vC, vD, vE, vF] = digits6.split("");
+      const fi = parseInt(vF ?? "0", 10);
+      let exp: string;
+      if (fi <= 2) exp = `0${vA}${vB}${vF}0000${vC}${vD}${vE}`;
+      else if (fi === 3) exp = `0${vA}${vB}${vC}00000${vD}${vE}`;
+      else if (fi === 4) exp = `0${vA}${vB}${vC}${vD}00000${vE}`;
+      else exp = `0${vA}${vB}${vC}${vD}${vE}${vF}0000`;
+      let ckSum = 0;
+      for (let i = 0; i < 11; i++)
+        ckSum += parseInt(exp[i] ?? "0", 10) * (i % 2 === 0 ? 3 : 1);
+      displayText = `0${digits6}${(10 - (ckSum % 10)) % 10}`;
     }
 
     if (showText) {
@@ -578,19 +600,18 @@ export function BarcodeObject({
 
       if (rotation === "R") {
         // rot=90: (x0-ly, y0+lx) — fh spans LEFT, W spans DOWN
-        // Standard: text RIGHT; LOGMARS: text LEFT
+        // Standard: text LEFT (below→left after 90°CW); LOGMARS: text RIGHT (above→right)
         if (isTextAbove) {
-          txtX = -textGap;           // left edge at x=-gap, fh extends further left
+          txtX = w + textGap + textFontSize;
         } else {
-          txtX = w + textGap + textFontSize; // right edge at x=w+gap+fh, text to the right
+          txtX = -textGap;
         }
         txtY = 0;
         txtRot = 90;
         txtWidth = h;
       } else if (rotation === "I") {
         // rot=180: (x0-lx, y0-ly) — W spans LEFT, fh spans UP
-        // Standard: text ABOVE (y=[-(gap+fh), -gap])
-        // LOGMARS:  text BELOW (y=[h+gap, h+gap+fh])
+        // Standard: text ABOVE (below→above after 180°); LOGMARS: text BELOW (above→below)
         txtX = w;
         if (isTextAbove) {
           txtY = h + textGap + textFontSize;
@@ -601,12 +622,11 @@ export function BarcodeObject({
         txtWidth = w;
       } else {
         // B (270° CW): rot=-90, (x0+ly, y0-lx) — fh spans RIGHT, W spans UP
-        // Standard: text LEFT (x=[-(gap+fh), -gap], y=[0,h]): x0=-(gap+fh), y0=h
-        // LOGMARS:  text RIGHT (x=[w+gap, w+gap+fh], y=[0,h]): x0=w+gap, y0=h
+        // Standard: text RIGHT (below→right after 270°CW); LOGMARS: text LEFT (above→left)
         if (isTextAbove) {
-          txtX = w + textGap;
-        } else {
           txtX = -(textGap + textFontSize);
+        } else {
+          txtX = w + textGap;
         }
         txtY = h;
         txtRot = -90;

From e8af764ebfbadec10be2633f6a5e6c31c2eeebce Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:10:12 +0200
Subject: [PATCH 15/20] fix(canvas): format EAN/UPC rotated HRI with digit
 grouping and check digit

Rotated EAN/UPC barcodes now show the same grouped digit string as the
upright layout: EAN-13 "5  901234 123457", EAN-8 "5901 2345",
UPC-A "1  23456 78901 2", UPC-E "0  123456 7".
---
 src/components/Canvas/BarcodeObject.tsx | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index dc418e0d..e7ad6d4e 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -467,13 +467,19 @@ export function BarcodeObject({
       displayText = `${rawContent}${chars[sum % 43] ?? ""}`;
     } else if (obj.type === "ean13") {
       const d = rawContent.replace(/\D/g, "").slice(0, 12).padEnd(12, "0");
-      displayText = d + eanCheckDigit(d, 1, 3);
+      const ck = eanCheckDigit(d, 1, 3);
+      // "5  901234 123457" — system digit, 2 spaces, left 6, space, right 5 + check
+      displayText = `${d[0]}  ${d.slice(1, 7)} ${d.slice(7)}${ck}`;
     } else if (obj.type === "ean8") {
       const d = rawContent.replace(/\D/g, "").slice(0, 7).padEnd(7, "0");
-      displayText = d + eanCheckDigit(d, 3, 1);
+      const ck = eanCheckDigit(d, 3, 1);
+      // "5901 2345"
+      displayText = `${d.slice(0, 4)} ${d.slice(4)}${ck}`;
     } else if (obj.type === "upca") {
       const d = rawContent.replace(/\D/g, "").slice(0, 11).padEnd(11, "0");
-      displayText = d + eanCheckDigit(d, 3, 1);
+      const ck = eanCheckDigit(d, 3, 1);
+      // "1  23456 78901 6" — system digit, left 5, right 5, check digit
+      displayText = `${d[0]}  ${d.slice(1, 6)} ${d.slice(6)} ${ck}`;
     } else if (obj.type === "upce") {
       const digits6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");
       const [vA, vB, vC, vD, vE, vF] = digits6.split("");
@@ -486,7 +492,8 @@ export function BarcodeObject({
       let ckSum = 0;
       for (let i = 0; i < 11; i++)
         ckSum += parseInt(exp[i] ?? "0", 10) * (i % 2 === 0 ? 3 : 1);
-      displayText = `0${digits6}${(10 - (ckSum % 10)) % 10}`;
+      // "0  123456 7" — system 0, 6 data digits, check digit
+      displayText = `0  ${digits6} ${(10 - (ckSum % 10)) % 10}`;
     }
 
     if (showText) {

From a8ab0b3392be1ba764d76baadb10f69e69161a29 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:21:08 +0200
Subject: [PATCH 16/20] fix(canvas): position rotated EAN/UPC HRI digits at 1/4
 and 3/4 using layout

For rotated EAN/UPC barcodes the HRI text now uses getEanUpcLayout to
place each digit group at the correct position along the rotated encoding
axis, mirroring the upright layout: system digit floated before the start
guard, left group centered at ~1/4, right group at ~3/4. Applies to all
three rotation cases (R/I/B) with correct axis mapping per rotation.
---
 src/components/Canvas/BarcodeObject.tsx | 204 ++++++++++++++++--------
 1 file changed, 135 insertions(+), 69 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index e7ad6d4e..1ac9e53d 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -583,101 +583,167 @@ export function BarcodeObject({
 
     // ── Rotated 1D: text overlay rotated alongside the bars ──────────────
     if (showRotatedText) {
-      // Konva rotation=90 (CW): local (lx,ly) → screen (x0-ly, y0+lx).
-      //   Width (h) spans downward; height (fh) spans leftward.
-      //   → text RIGHT of barcode (x=[w+gap, w+gap+fh], y=[0,h]):
-      //     x0=w+gap+fh, y0=0
-      // Konva rotation=-90 (CCW): local (lx,ly) → screen (x0+ly, y0-lx).
-      //   Width (h) spans upward; height (fh) spans rightward.
-      //   → text LEFT of barcode (x=[-(gap+fh), -gap], y=[0,h]):
-      //     x0=-(gap+fh), y0=h
-      // Konva rotation=180: local (lx,ly) → screen (x0-lx, y0-ly).
-      //   Width (w) spans leftward; height (fh) spans upward.
-      //   → text ABOVE barcode (x=[0,w], y=[-(gap+fh), -gap]):
-      //     x0=w, y0=-gap
+      // Rotation math (Konva y-down, CW positive):
+      //   R  (rot=90):  local-x→screen-down, local-y→screen-left
+      //   B  (rot=-90): local-x→screen-up,   local-y→screen-right
+      //   I  (rot=180): local-x→screen-left,  local-y→screen-up
       //
-      // LOGMARS places text ABOVE bars in upright, so for quarter rotations
-      // its side is mirrored (LEFT↔RIGHT); for 180° it goes BELOW.
+      // Text "side" for 90°/270°: standard 1D text is below bars in upright,
+      //   so after 90°CW it's on the LEFT; after 270°CW on the RIGHT.
+      //   LOGMARS is mirrored (text above in upright → right for 90°, left for 270°).
       const isTextAbove = obj.type === "logmars";
+      // x-anchor for R/B (shared by all text nodes for a given rotation)
+      const sideX =
+        rotation === "R"
+          ? isTextAbove ? w + textGap + textFontSize : -textGap
+          : isTextAbove ? -(textGap + textFontSize) : w + textGap;
+      const tRot = rotation === "R" ? 90 : rotation === "I" ? 180 : -90;
+
+      // ── EAN/UPC: reproduce upright digit layout along the rotated axis ──
+      if (EAN_UPC_TYPES.has(obj.type)) {
+        const bwipSc = get1DBwipScale(moduleWidth, scale, dpmm);
+        // For I: encoding runs horizontally (canvas.width); for R/B: vertically (canvas.height)
+        const encDisplay = rotation === "I" ? w : h;
+        const encCanvas  = rotation === "I" ? barcodeCanvas.width : barcodeCanvas.height;
+        const layout = getEanUpcLayout(obj.type as EanUpcType, encDisplay, encCanvas, bwipSc);
+        const { xLeft, xRight, halfWidth: halfW } = layout;
+        const ldW = textFontSize * 1.2;
+
+        const tStyle = {
+          fontSize: textFontSize,
+          fontFamily: "'Courier New', monospace" as const,
+          wrap: "none" as const,
+          fill: "#000000",
+          listening: false,
+        };
+
+        // Position a text node at `encPos` from barcode start, spanning `size`.
+        // For R: encPos → screen-y downward from top (start=top).
+        // For B: encPos → screen-y upward from bottom (start=bottom), anchor = h - encPos.
+        // For I: encPos → screen-x leftward from right (start=right), anchor-x = w - encPos.
+        const node = (key: string, encPos: number, size: number, text: string) => {
+          const tx = rotation === "I" ? w - encPos : sideX;
+          const ty = rotation === "R" ? encPos : rotation === "B" ? h - encPos : -textGap;
+          return <Text key={key} x={tx} y={ty} rotation={tRot} width={Math.max(size, 1)} text={text} align="center" {...tStyle} />;
+        };
+
+        // Single digit floated BEFORE barcode start (outside the quiet zone).
+        const sysNode = (key: string, text: string) => {
+          // R: above top (y=-ldW); B: below bottom (y=h+ldW); I: right of barcode (x=w+ldW).
+          const tx = rotation === "I" ? w + ldW : sideX;
+          const ty = rotation === "R" ? -ldW : rotation === "B" ? h + ldW : -textGap;
+          return <Text key={key} x={tx} y={ty} rotation={tRot} width={Math.max(ldW, 1)} text={text} align="center" {...tStyle} />;
+        };
+
+        // Single digit floated AFTER barcode end (UPC-A/UPC-E check digit).
+        const trailNode = (key: string, text: string) => {
+          // R: below bottom (y≈encDisplay); B: above top (y≈h-encDisplay); I: left of x=0.
+          const tx = rotation === "I" ? -ldW : sideX;
+          const ty = rotation === "R" ? encDisplay : rotation === "B" ? h - encDisplay : -textGap;
+          return <Text key={key} x={tx} y={ty} rotation={tRot} width={Math.max(ldW, 1)} text={text} align="left" {...tStyle} />;
+        };
+
+        let eanNodes: React.ReactNode[] = [];
+
+        if (obj.type === "ean13") {
+          const d12 = rawContent.replace(/\D/g, "").slice(0, 12).padEnd(12, "0");
+          const all13 = d12 + eanCheckDigit(d12, 1, 3);
+          eanNodes = [
+            sysNode("sys", all13[0] ?? ""),
+            node("left", xLeft, halfW, all13.slice(1, 7)),
+            node("right", xRight, halfW, all13.slice(7, 13)),
+          ];
+        } else if (obj.type === "ean8") {
+          const d7 = rawContent.replace(/\D/g, "").slice(0, 7).padEnd(7, "0");
+          const all8 = d7 + eanCheckDigit(d7, 3, 1);
+          eanNodes = [
+            node("left", xLeft, halfW, all8.slice(0, 4)),
+            node("right", xRight, halfW, all8.slice(4, 8)),
+          ];
+        } else if (obj.type === "upca") {
+          const d11 = rawContent.replace(/\D/g, "").slice(0, 11).padEnd(11, "0");
+          const all12 = d11 + eanCheckDigit(d11, 3, 1);
+          eanNodes = [
+            sysNode("sys", all12[0] ?? ""),
+            node("left", xLeft, halfW, all12.slice(1, 6)),
+            node("right", xRight, halfW, all12.slice(6, 11)),
+            trailNode("trail", all12[11] ?? ""),
+          ];
+        } else if (obj.type === "upce") {
+          const d6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");
+          const [vA, vB, vC, vD, vE, vF] = d6.split("");
+          const fi = parseInt(vF ?? "0", 10);
+          let exp: string;
+          if (fi <= 2) exp = `0${vA}${vB}${vF}0000${vC}${vD}${vE}`;
+          else if (fi === 3) exp = `0${vA}${vB}${vC}00000${vD}${vE}`;
+          else if (fi === 4) exp = `0${vA}${vB}${vC}${vD}00000${vE}`;
+          else exp = `0${vA}${vB}${vC}${vD}${vE}${vF}0000`;
+          let ckSum = 0;
+          for (let i = 0; i < 11; i++)
+            ckSum += parseInt(exp[i] ?? "0", 10) * (i % 2 === 0 ? 3 : 1);
+          const ck = String((10 - (ckSum % 10)) % 10);
+          eanNodes = [
+            sysNode("sys", "0"),
+            node("mid", xLeft, halfW, d6),
+            trailNode("trail", ck),
+          ];
+        }
+
+        return (
+          <Group
+            id={obj.id} x={x} y={y} draggable
+            onClick={(e) => onSelect(e.evt.shiftKey || e.evt.ctrlKey || e.evt.metaKey)}
+            onTap={() => onSelect(false)}
+            onDragMove={(e) => e.target.position(snapPos(e.target.x(), e.target.y()))}
+            onDragEnd={handleDragEnd}
+          >
+            <KImage x={0} y={0} image={barcodeCanvas}
+              width={Math.max(w, 1)} height={Math.max(h, 1)}
+              imageSmoothingEnabled={false}
+              stroke={isSelected ? "#6366f1" : undefined}
+              strokeWidth={isSelected ? 2 : 0}
+              strokeScaleEnabled={false}
+            />
+            {eanNodes}
+          </Group>
+        );
+      }
 
+      // ── Other 1D: single centered text string ────────────────────────────
       let txtX: number;
       let txtY: number;
-      let txtRot: number;
       let txtWidth: number;
 
       if (rotation === "R") {
-        // rot=90: (x0-ly, y0+lx) — fh spans LEFT, W spans DOWN
-        // Standard: text LEFT (below→left after 90°CW); LOGMARS: text RIGHT (above→right)
-        if (isTextAbove) {
-          txtX = w + textGap + textFontSize;
-        } else {
-          txtX = -textGap;
-        }
-        txtY = 0;
-        txtRot = 90;
-        txtWidth = h;
+        txtX = sideX; txtY = 0; txtWidth = h;
       } else if (rotation === "I") {
-        // rot=180: (x0-lx, y0-ly) — W spans LEFT, fh spans UP
-        // Standard: text ABOVE (below→above after 180°); LOGMARS: text BELOW (above→below)
         txtX = w;
-        if (isTextAbove) {
-          txtY = h + textGap + textFontSize;
-        } else {
-          txtY = -textGap;
-        }
-        txtRot = 180;
+        txtY = isTextAbove ? h + textGap + textFontSize : -textGap;
         txtWidth = w;
       } else {
-        // B (270° CW): rot=-90, (x0+ly, y0-lx) — fh spans RIGHT, W spans UP
-        // Standard: text RIGHT (below→right after 270°CW); LOGMARS: text LEFT (above→left)
-        if (isTextAbove) {
-          txtX = -(textGap + textFontSize);
-        } else {
-          txtX = w + textGap;
-        }
-        txtY = h;
-        txtRot = -90;
-        txtWidth = h;
+        txtX = sideX; txtY = h; txtWidth = h;
       }
 
       return (
         <Group
-          id={obj.id}
-          x={x}
-          y={y}
-          draggable
-          onClick={(e) =>
-            onSelect(e.evt.shiftKey || e.evt.ctrlKey || e.evt.metaKey)
-          }
+          id={obj.id} x={x} y={y} draggable
+          onClick={(e) => onSelect(e.evt.shiftKey || e.evt.ctrlKey || e.evt.metaKey)}
           onTap={() => onSelect(false)}
-          onDragMove={(e) =>
-            e.target.position(snapPos(e.target.x(), e.target.y()))
-          }
+          onDragMove={(e) => e.target.position(snapPos(e.target.x(), e.target.y()))}
           onDragEnd={handleDragEnd}
         >
-          <KImage
-            x={0}
-            y={0}
-            image={barcodeCanvas}
-            width={Math.max(w, 1)}
-            height={Math.max(h, 1)}
+          <KImage x={0} y={0} image={barcodeCanvas}
+            width={Math.max(w, 1)} height={Math.max(h, 1)}
             imageSmoothingEnabled={false}
             stroke={isSelected ? "#6366f1" : undefined}
             strokeWidth={isSelected ? 2 : 0}
             strokeScaleEnabled={false}
           />
           <Text
-            x={txtX}
-            y={txtY}
-            rotation={txtRot}
-            width={Math.max(txtWidth, 1)}
-            text={displayText}
-            fontSize={textFontSize}
+            x={txtX} y={txtY} rotation={tRot} width={Math.max(txtWidth, 1)}
+            text={displayText} fontSize={textFontSize}
             fontFamily="'Courier New', monospace"
-            align="center"
-            wrap="none"
-            fill="#000000"
-            listening={false}
+            align="center" wrap="none" fill="#000000" listening={false}
           />
         </Group>
       );

From 0a6811597a79791165b92673e8119ef955f7c262 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:29:02 +0200
Subject: [PATCH 17/20] refactor(barcode): extract upceCheckDigit helper,
 remove dead EAN/UPC displayText block

Three copies of the UPC-E expansion+check-digit logic collapsed into a single
exported helper. Dead displayText branch for EAN/UPC types (unreachable after
rotated positioned-node rendering was added) deleted.
---
 src/components/Canvas/BarcodeObject.tsx | 60 ++-----------------------
 src/components/Canvas/bwipHelpers.ts    | 12 +++++
 2 files changed, 15 insertions(+), 57 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index 1ac9e53d..b0dcb157 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -10,6 +10,7 @@ import {
   buildBwipOptions,
   getDisplaySize,
   eanCheckDigit,
+  upceCheckDigit,
   get1DBwipScale,
   getEanUpcLayout,
   type EanUpcType,
@@ -345,23 +346,7 @@ export function BarcodeObject({
           .slice(0, 6)
           .padEnd(6, "0");
 
-        // Expand UPC-E to 11-digit UPC-A to compute check digit
-        const vA = digits6[0] ?? "0",
-          vB = digits6[1] ?? "0",
-          vC = digits6[2] ?? "0";
-        const vD = digits6[3] ?? "0",
-          vE = digits6[4] ?? "0",
-          vF = digits6[5] ?? "0";
-        const fi = parseInt(vF, 10);
-        let expanded11: string;
-        if (fi <= 2) expanded11 = `0${vA}${vB}${vF}0000${vC}${vD}${vE}`;
-        else if (fi === 3) expanded11 = `0${vA}${vB}${vC}00000${vD}${vE}`;
-        else if (fi === 4) expanded11 = `0${vA}${vB}${vC}${vD}00000${vE}`;
-        else expanded11 = `0${vA}${vB}${vC}${vD}${vE}${vF}0000`;
-        let ckSum = 0;
-        for (let i = 0; i < 11; i++)
-          ckSum += parseInt(expanded11[i] ?? "0", 10) * (i % 2 === 0 ? 3 : 1);
-        const checkDigit = String((10 - (ckSum % 10)) % 10);
+        const checkDigit = upceCheckDigit(digits6);
 
         // UPC-E: 6 digits centered over the data area (modules 3–44 of 51)
         const { xLeft: xMid, halfWidth: midW } = layout;
@@ -465,35 +450,6 @@ export function BarcodeObject({
         if (idx >= 0) sum += idx;
       }
       displayText = `${rawContent}${chars[sum % 43] ?? ""}`;
-    } else if (obj.type === "ean13") {
-      const d = rawContent.replace(/\D/g, "").slice(0, 12).padEnd(12, "0");
-      const ck = eanCheckDigit(d, 1, 3);
-      // "5  901234 123457" — system digit, 2 spaces, left 6, space, right 5 + check
-      displayText = `${d[0]}  ${d.slice(1, 7)} ${d.slice(7)}${ck}`;
-    } else if (obj.type === "ean8") {
-      const d = rawContent.replace(/\D/g, "").slice(0, 7).padEnd(7, "0");
-      const ck = eanCheckDigit(d, 3, 1);
-      // "5901 2345"
-      displayText = `${d.slice(0, 4)} ${d.slice(4)}${ck}`;
-    } else if (obj.type === "upca") {
-      const d = rawContent.replace(/\D/g, "").slice(0, 11).padEnd(11, "0");
-      const ck = eanCheckDigit(d, 3, 1);
-      // "1  23456 78901 6" — system digit, left 5, right 5, check digit
-      displayText = `${d[0]}  ${d.slice(1, 6)} ${d.slice(6)} ${ck}`;
-    } else if (obj.type === "upce") {
-      const digits6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");
-      const [vA, vB, vC, vD, vE, vF] = digits6.split("");
-      const fi = parseInt(vF ?? "0", 10);
-      let exp: string;
-      if (fi <= 2) exp = `0${vA}${vB}${vF}0000${vC}${vD}${vE}`;
-      else if (fi === 3) exp = `0${vA}${vB}${vC}00000${vD}${vE}`;
-      else if (fi === 4) exp = `0${vA}${vB}${vC}${vD}00000${vE}`;
-      else exp = `0${vA}${vB}${vC}${vD}${vE}${vF}0000`;
-      let ckSum = 0;
-      for (let i = 0; i < 11; i++)
-        ckSum += parseInt(exp[i] ?? "0", 10) * (i % 2 === 0 ? 3 : 1);
-      // "0  123456 7" — system 0, 6 data digits, check digit
-      displayText = `0  ${digits6} ${(10 - (ckSum % 10)) % 10}`;
     }
 
     if (showText) {
@@ -671,17 +627,7 @@ export function BarcodeObject({
           ];
         } else if (obj.type === "upce") {
           const d6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");
-          const [vA, vB, vC, vD, vE, vF] = d6.split("");
-          const fi = parseInt(vF ?? "0", 10);
-          let exp: string;
-          if (fi <= 2) exp = `0${vA}${vB}${vF}0000${vC}${vD}${vE}`;
-          else if (fi === 3) exp = `0${vA}${vB}${vC}00000${vD}${vE}`;
-          else if (fi === 4) exp = `0${vA}${vB}${vC}${vD}00000${vE}`;
-          else exp = `0${vA}${vB}${vC}${vD}${vE}${vF}0000`;
-          let ckSum = 0;
-          for (let i = 0; i < 11; i++)
-            ckSum += parseInt(exp[i] ?? "0", 10) * (i % 2 === 0 ? 3 : 1);
-          const ck = String((10 - (ckSum % 10)) % 10);
+          const ck = upceCheckDigit(d6);
           eanNodes = [
             sysNode("sys", "0"),
             node("mid", xLeft, halfW, d6),
diff --git a/src/components/Canvas/bwipHelpers.ts b/src/components/Canvas/bwipHelpers.ts
index 6b596449..0b161aac 100644
--- a/src/components/Canvas/bwipHelpers.ts
+++ b/src/components/Canvas/bwipHelpers.ts
@@ -132,6 +132,18 @@ export function eanCheckDigit(digits: string, w0: number, w1: number): string {
   return String((10 - (sum % 10)) % 10);
 }
 
+/** Compute the UPC-E check digit from the 6 compressed data digits. */
+export function upceCheckDigit(digits6: string): string {
+  const [vA, vB, vC, vD, vE, vF] = digits6.padEnd(6, "0").split("");
+  const fi = parseInt(vF ?? "0", 10);
+  let exp: string;
+  if (fi <= 2) exp = `0${vA}${vB}${vF}0000${vC}${vD}${vE}`;
+  else if (fi === 3) exp = `0${vA}${vB}${vC}00000${vD}${vE}`;
+  else if (fi === 4) exp = `0${vA}${vB}${vC}${vD}00000${vE}`;
+  else exp = `0${vA}${vB}${vC}${vD}${vE}${vF}0000`;
+  return eanCheckDigit(exp, 3, 1);
+}
+
 /**
  * Encode text as Code 128 subset B using bwip-js raw ^NNN format.
  * ZPL's ^BC defaults to subset B for printable ASCII content, so using raw

From 86d9b393de99dd657331fc6f20502e3a7fd2b8a1 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:38:57 +0200
Subject: [PATCH 18/20] refactor(barcode): unify Group/KImage wrapper in
 showRotatedText block

Addresses Gemini finding: two nearly-identical return statements collapsed
into one. Text content (EAN/UPC nodes or plain Text) is determined first,
then rendered in a single shared Group.
---
 src/components/Canvas/BarcodeObject.tsx | 72 ++++++++++---------------
 1 file changed, 28 insertions(+), 44 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index b0dcb157..545c1883 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -556,6 +556,7 @@ export function BarcodeObject({
       const tRot = rotation === "R" ? 90 : rotation === "I" ? 180 : -90;
 
       // ── EAN/UPC: reproduce upright digit layout along the rotated axis ──
+      let textElements: React.ReactNode;
       if (EAN_UPC_TYPES.has(obj.type)) {
         const bwipSc = get1DBwipScale(moduleWidth, scale, dpmm);
         // For I: encoding runs horizontally (canvas.width); for R/B: vertically (canvas.height)
@@ -599,12 +600,10 @@ export function BarcodeObject({
           return <Text key={key} x={tx} y={ty} rotation={tRot} width={Math.max(ldW, 1)} text={text} align="left" {...tStyle} />;
         };
 
-        let eanNodes: React.ReactNode[] = [];
-
         if (obj.type === "ean13") {
           const d12 = rawContent.replace(/\D/g, "").slice(0, 12).padEnd(12, "0");
           const all13 = d12 + eanCheckDigit(d12, 1, 3);
-          eanNodes = [
+          textElements = [
             sysNode("sys", all13[0] ?? ""),
             node("left", xLeft, halfW, all13.slice(1, 7)),
             node("right", xRight, halfW, all13.slice(7, 13)),
@@ -612,14 +611,14 @@ export function BarcodeObject({
         } else if (obj.type === "ean8") {
           const d7 = rawContent.replace(/\D/g, "").slice(0, 7).padEnd(7, "0");
           const all8 = d7 + eanCheckDigit(d7, 3, 1);
-          eanNodes = [
+          textElements = [
             node("left", xLeft, halfW, all8.slice(0, 4)),
             node("right", xRight, halfW, all8.slice(4, 8)),
           ];
         } else if (obj.type === "upca") {
           const d11 = rawContent.replace(/\D/g, "").slice(0, 11).padEnd(11, "0");
           const all12 = d11 + eanCheckDigit(d11, 3, 1);
-          eanNodes = [
+          textElements = [
             sysNode("sys", all12[0] ?? ""),
             node("left", xLeft, halfW, all12.slice(1, 6)),
             node("right", xRight, halfW, all12.slice(6, 11)),
@@ -628,48 +627,38 @@ export function BarcodeObject({
         } else if (obj.type === "upce") {
           const d6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");
           const ck = upceCheckDigit(d6);
-          eanNodes = [
+          textElements = [
             sysNode("sys", "0"),
             node("mid", xLeft, halfW, d6),
             trailNode("trail", ck),
           ];
         }
+      } else {
+        // ── Other 1D: single centered text string ──────────────────────────
+        let txtX: number;
+        let txtY: number;
+        let txtWidth: number;
+
+        if (rotation === "R") {
+          txtX = sideX; txtY = 0; txtWidth = h;
+        } else if (rotation === "I") {
+          txtX = w;
+          txtY = isTextAbove ? h + textGap + textFontSize : -textGap;
+          txtWidth = w;
+        } else {
+          txtX = sideX; txtY = h; txtWidth = h;
+        }
 
-        return (
-          <Group
-            id={obj.id} x={x} y={y} draggable
-            onClick={(e) => onSelect(e.evt.shiftKey || e.evt.ctrlKey || e.evt.metaKey)}
-            onTap={() => onSelect(false)}
-            onDragMove={(e) => e.target.position(snapPos(e.target.x(), e.target.y()))}
-            onDragEnd={handleDragEnd}
-          >
-            <KImage x={0} y={0} image={barcodeCanvas}
-              width={Math.max(w, 1)} height={Math.max(h, 1)}
-              imageSmoothingEnabled={false}
-              stroke={isSelected ? "#6366f1" : undefined}
-              strokeWidth={isSelected ? 2 : 0}
-              strokeScaleEnabled={false}
-            />
-            {eanNodes}
-          </Group>
+        textElements = (
+          <Text
+            x={txtX} y={txtY} rotation={tRot} width={Math.max(txtWidth, 1)}
+            text={displayText} fontSize={textFontSize}
+            fontFamily="'Courier New', monospace"
+            align="center" wrap="none" fill="#000000" listening={false}
+          />
         );
       }
 
-      // ── Other 1D: single centered text string ────────────────────────────
-      let txtX: number;
-      let txtY: number;
-      let txtWidth: number;
-
-      if (rotation === "R") {
-        txtX = sideX; txtY = 0; txtWidth = h;
-      } else if (rotation === "I") {
-        txtX = w;
-        txtY = isTextAbove ? h + textGap + textFontSize : -textGap;
-        txtWidth = w;
-      } else {
-        txtX = sideX; txtY = h; txtWidth = h;
-      }
-
       return (
         <Group
           id={obj.id} x={x} y={y} draggable
@@ -685,12 +674,7 @@ export function BarcodeObject({
             strokeWidth={isSelected ? 2 : 0}
             strokeScaleEnabled={false}
           />
-          <Text
-            x={txtX} y={txtY} rotation={tRot} width={Math.max(txtWidth, 1)}
-            text={displayText} fontSize={textFontSize}
-            fontFamily="'Courier New', monospace"
-            align="center" wrap="none" fill="#000000" listening={false}
-          />
+          {textElements}
         </Group>
       );
     }

From 8d46ffabfc5a0a65604b553a42ab7cf6d5379ac8 Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:41:46 +0200
Subject: [PATCH 19/20] fix(barcode): include UPC-A check digit in right block,
 not separate node

Labelary does not render the check digit outside the right guard bars.
Right block now shows 6 digits (d6-d11) over 42 modules (halfWidth * 6/5),
matching upright N layout. Applied to both upright and rotated rendering.
---
 src/components/Canvas/BarcodeObject.tsx | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index 545c1883..fe984771 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -311,13 +311,13 @@ export function BarcodeObject({
             fill="#000000"
             listening={false}
           />,
-          // right 5 digits
+          // right 6 digits (including check digit)
           <Text
             key="dr"
             x={xRightUpca}
             y={textY}
-            width={halfUpca}
-            text={allDigits.slice(6, 11)}
+            width={Math.round(halfUpca * 6 / 5)}
+            text={allDigits.slice(6, 12)}
             fontSize={textFontSize}
             fontFamily="'Courier New', monospace"
             align="center"
@@ -325,20 +325,6 @@ export function BarcodeObject({
             fill="#000000"
             listening={false}
           />,
-          // check digit — outside-right (like leading digit on left)
-          <Text
-            key="dc"
-            x={w + 2}
-            y={textY}
-            width={ldW}
-            text={allDigits[11]}
-            fontSize={textFontSize}
-            fontFamily="'Courier New', monospace"
-            align="left"
-            wrap="none"
-            fill="#000000"
-            listening={false}
-          />,
         ];
       } else if (obj.type === "upce") {
         const digits6 = rawContent
@@ -621,8 +607,7 @@ export function BarcodeObject({
           textElements = [
             sysNode("sys", all12[0] ?? ""),
             node("left", xLeft, halfW, all12.slice(1, 6)),
-            node("right", xRight, halfW, all12.slice(6, 11)),
-            trailNode("trail", all12[11] ?? ""),
+            node("right", xRight, Math.round(halfW * 6 / 5), all12.slice(6, 12)),
           ];
         } else if (obj.type === "upce") {
           const d6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");

From 700efaa6ad33262a2b54102d51443e7f8c6c8dfb Mon Sep 17 00:00:00 2001
From: u8array <alexanderleinich1@gmail.com>
Date: Wed, 6 May 2026 22:46:43 +0200
Subject: [PATCH 20/20] fix(barcode): UPC-A HRI shows 5+5 digits, check digit
 not rendered

Labelary omits the check digit from the human-readable line entirely.
Right block reverted to 5 digits (d6-d10) over 35 modules, matching
the upright N layout: system-digit | left-5 | right-5.
---
 src/components/Canvas/BarcodeObject.tsx | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/Canvas/BarcodeObject.tsx b/src/components/Canvas/BarcodeObject.tsx
index fe984771..172059ec 100644
--- a/src/components/Canvas/BarcodeObject.tsx
+++ b/src/components/Canvas/BarcodeObject.tsx
@@ -311,13 +311,13 @@ export function BarcodeObject({
             fill="#000000"
             listening={false}
           />,
-          // right 6 digits (including check digit)
+          // right 5 digits
           <Text
             key="dr"
             x={xRightUpca}
             y={textY}
-            width={Math.round(halfUpca * 6 / 5)}
-            text={allDigits.slice(6, 12)}
+            width={halfUpca}
+            text={allDigits.slice(6, 11)}
             fontSize={textFontSize}
             fontFamily="'Courier New', monospace"
             align="center"
@@ -607,7 +607,7 @@ export function BarcodeObject({
           textElements = [
             sysNode("sys", all12[0] ?? ""),
             node("left", xLeft, halfW, all12.slice(1, 6)),
-            node("right", xRight, Math.round(halfW * 6 / 5), all12.slice(6, 12)),
+            node("right", xRight, halfW, all12.slice(6, 11)),
           ];
         } else if (obj.type === "upce") {
           const d6 = rawContent.replace(/\D/g, "").slice(0, 6).padEnd(6, "0");