BlueGit

timfa posprint

Stretch raster barcodes to full printable paper width.

Narrow barcodes were only scaled down, never up, so short codes printed
too thin to scan. Native barcodes now use GS w 6 for widest modules.

Co-authored-by: Cursor <cursoragent@cursor.com>

timfa Tim Falken · pushed by timfa

Authored 2026-07-15 · 4 months ago

Hash
8f608ef812865cea24bb86cde09adec82181d3f9
Parent
c073ddac
4 files changed +52 −11
docs/HELP.md +1 −1
@@ -108,7 +108,7 @@ Directives start with `@` at the beginning of a line.
108 108 @barcode ITF 12345678 height=80
109 109 ```
110 110
111 **Raster** (rendered as bitmap — works with any symbology below):
111 **Raster** (rendered as bitmap — works with any symbology below). Raster barcodes are always stretched to the full paper width for reliable scanning:
112 112
113 113 ```markdown
114 114 @barcode RASTER CODE128 ${OrderId}
@@ -108,7 +108,7 @@ Directives start with `@` at the beginning of a line.
108@barcode ITF 12345678 height=80
108@barcode ITF 12345678 height=80
109```
109```
110
110
111**Raster** (rendered as bitmap — works with any symbology below):
111**Raster** (rendered as bitmap — works with any symbology below). Raster barcodes are always stretched to the full paper width for reliable scanning:
112
112
113```markdown
113```markdown
114@barcode RASTER CODE128 ${OrderId}
114@barcode RASTER CODE128 ${OrderId}
src/escpos.rs +12 −4
@@ -117,6 +117,8 @@ impl EscPosEncoder {
117 117 BarcodeMode::Raster => {
118 118 let img = raster::render_barcode(*symbology, data, *height as u32)
119 119 .map_err(EscPosError::Raster)?;
120 let target = self.metadata.printable_dots() as u32;
121 let img = raster::scale_gray_to_print_width(img, target);
120 122 self.encode_gray_raster(&img, ImageWidth::Default)?;
121 123 }
122 124 }
@@ -190,6 +192,8 @@ impl EscPosEncoder {
190 192 ) -> Result<(), EscPosError> {
191 193 self.buffer.extend_from_slice(&[0x1D, b'h', height]);
192 194 self.buffer.extend_from_slice(&[0x1D, b'H', if show_text { 2 } else { 0 }]);
195 // Widest module width (GS w 6) for easier scanning.
196 self.buffer.extend_from_slice(&[0x1D, b'w', 6]);
193 197 match symbology {
194 198 BarcodeSymbology::Code128 => {
195 199 let bytes = data.as_bytes();
@@ -390,19 +394,23 @@ mod tests {
390 394 #[test]
391 395 fn raster_header_matches_print_bridge_format() {
392 396 let doc = parse("@barcode RASTER CODE128 X").unwrap();
393 let mut enc = EscPosEncoder::new(PosMetadata {
397 let meta = PosMetadata {
394 398 page_width_mm: 58.0,
395 399 ..Default::default()
396 });
400 };
401 let mut enc = EscPosEncoder::new(meta.clone());
397 402 let bytes = enc.encode_document(&doc).unwrap();
398 403 let pos = bytes
399 404 .windows(4)
400 405 .position(|w| w == [0x1D, b'v', 0x30, 0x00])
401 406 .expect("raster header");
402 407 assert_eq!(&bytes[pos..pos + 4], &[0x1D, b'v', 0x30, 0x00]);
403 // x = bytes per row (u16 LE), y = height in dots (u16 LE)
404 408 let x_bytes = u16::from_le_bytes([bytes[pos + 4], bytes[pos + 5]]);
405 assert!(x_bytes > 0);
409 let expected_bytes = ((meta.printable_dots() as u32 + 7) / 8) as u16;
410 assert_eq!(
411 x_bytes, expected_bytes,
412 "barcode raster should span full printable width"
413 );
406 414 let y_dots = u16::from_le_bytes([bytes[pos + 6], bytes[pos + 7]]);
407 415 assert!(y_dots > 0);
408 416 }
@@ -117,6 +117,8 @@ impl EscPosEncoder {
117 BarcodeMode::Raster => {
117 BarcodeMode::Raster => {
118 let img = raster::render_barcode(*symbology, data, *height as u32)
118 let img = raster::render_barcode(*symbology, data, *height as u32)
119 .map_err(EscPosError::Raster)?;
119 .map_err(EscPosError::Raster)?;
120 let target = self.metadata.printable_dots() as u32;
121 let img = raster::scale_gray_to_print_width(img, target);
120 self.encode_gray_raster(&img, ImageWidth::Default)?;
122 self.encode_gray_raster(&img, ImageWidth::Default)?;
121 }
123 }
122 }
124 }
@@ -190,6 +192,8 @@ impl EscPosEncoder {
190 ) -> Result<(), EscPosError> {
192 ) -> Result<(), EscPosError> {
191 self.buffer.extend_from_slice(&[0x1D, b'h', height]);
193 self.buffer.extend_from_slice(&[0x1D, b'h', height]);
192 self.buffer.extend_from_slice(&[0x1D, b'H', if show_text { 2 } else { 0 }]);
194 self.buffer.extend_from_slice(&[0x1D, b'H', if show_text { 2 } else { 0 }]);
195 // Widest module width (GS w 6) for easier scanning.
196 self.buffer.extend_from_slice(&[0x1D, b'w', 6]);
193 match symbology {
197 match symbology {
194 BarcodeSymbology::Code128 => {
198 BarcodeSymbology::Code128 => {
195 let bytes = data.as_bytes();
199 let bytes = data.as_bytes();
@@ -390,19 +394,23 @@ mod tests {
390 #[test]
394 #[test]
391 fn raster_header_matches_print_bridge_format() {
395 fn raster_header_matches_print_bridge_format() {
392 let doc = parse("@barcode RASTER CODE128 X").unwrap();
396 let doc = parse("@barcode RASTER CODE128 X").unwrap();
393 let mut enc = EscPosEncoder::new(PosMetadata {
397 let meta = PosMetadata {
394 page_width_mm: 58.0,
398 page_width_mm: 58.0,
395 ..Default::default()
399 ..Default::default()
396 });
400 };
401 let mut enc = EscPosEncoder::new(meta.clone());
397 let bytes = enc.encode_document(&doc).unwrap();
402 let bytes = enc.encode_document(&doc).unwrap();
398 let pos = bytes
403 let pos = bytes
399 .windows(4)
404 .windows(4)
400 .position(|w| w == [0x1D, b'v', 0x30, 0x00])
405 .position(|w| w == [0x1D, b'v', 0x30, 0x00])
401 .expect("raster header");
406 .expect("raster header");
402 assert_eq!(&bytes[pos..pos + 4], &[0x1D, b'v', 0x30, 0x00]);
407 assert_eq!(&bytes[pos..pos + 4], &[0x1D, b'v', 0x30, 0x00]);
403 // x = bytes per row (u16 LE), y = height in dots (u16 LE)
404 let x_bytes = u16::from_le_bytes([bytes[pos + 4], bytes[pos + 5]]);
408 let x_bytes = u16::from_le_bytes([bytes[pos + 4], bytes[pos + 5]]);
405 assert!(x_bytes > 0);
409 let expected_bytes = ((meta.printable_dots() as u32 + 7) / 8) as u16;
410 assert_eq!(
411 x_bytes, expected_bytes,
412 "barcode raster should span full printable width"
413 );
406 let y_dots = u16::from_le_bytes([bytes[pos + 6], bytes[pos + 7]]);
414 let y_dots = u16::from_le_bytes([bytes[pos + 6], bytes[pos + 7]]);
407 assert!(y_dots > 0);
415 assert!(y_dots > 0);
408 }
416 }
src/preview.rs +9 −6
@@ -9,7 +9,7 @@ use crate::dsl::{
9 9 use crate::io::PosMetadata;
10 10 use crate::datetime;
11 11 use crate::params::{preview_barcode_sample, substitute_for_preview, substitute_inlines_for_preview};
12 use crate::raster::{render_barcode, render_qr};
12 use crate::raster::{render_barcode, render_qr, scale_gray_to_print_width};
13 13 use crate::text_wrap::{self, TextWrapStyle};
14 14
15 15 #[derive(Debug, Clone, PartialEq)]
@@ -178,20 +178,23 @@ fn render_barcode_preview(
178 178 ) -> PreviewLine {
179 179 let height_px = u32::from(height.max(20));
180 180 let resolved_data = resolved_data.trim();
181 let print_width = metadata.printable_dots() as u32;
181 182 match mode {
182 183 BarcodeMode::Raster | BarcodeMode::Native => {
183 184 match render_barcode(symbology, resolved_data, height_px) {
184 Ok(img) => scale_graphic_to_width(img, metadata.printable_dots() as u32, align),
185 Ok(img) => PreviewLine::Graphic {
186 image: scale_gray_to_print_width(img, print_width),
187 align,
188 },
185 189 Err(e) => {
186 190 if template_data.contains("${") {
187 191 if let Ok(img) =
188 192 render_barcode(symbology, preview_barcode_sample(symbology), height_px)
189 193 {
190 return scale_graphic_to_width(
191 img,
192 metadata.printable_dots() as u32,
194 return PreviewLine::Graphic {
195 image: scale_gray_to_print_width(img, print_width),
193 196 align,
194 );
197 };
195 198 }
196 199 }
197 200 PreviewLine::Error {
@@ -9,7 +9,7 @@ use crate::dsl::{
9use crate::io::PosMetadata;
9use crate::io::PosMetadata;
10use crate::datetime;
10use crate::datetime;
11use crate::params::{preview_barcode_sample, substitute_for_preview, substitute_inlines_for_preview};
11use crate::params::{preview_barcode_sample, substitute_for_preview, substitute_inlines_for_preview};
12use crate::raster::{render_barcode, render_qr};
12use crate::raster::{render_barcode, render_qr, scale_gray_to_print_width};
13use crate::text_wrap::{self, TextWrapStyle};
13use crate::text_wrap::{self, TextWrapStyle};
14
14
15#[derive(Debug, Clone, PartialEq)]
15#[derive(Debug, Clone, PartialEq)]
@@ -178,20 +178,23 @@ fn render_barcode_preview(
178) -> PreviewLine {
178) -> PreviewLine {
179 let height_px = u32::from(height.max(20));
179 let height_px = u32::from(height.max(20));
180 let resolved_data = resolved_data.trim();
180 let resolved_data = resolved_data.trim();
181 let print_width = metadata.printable_dots() as u32;
181 match mode {
182 match mode {
182 BarcodeMode::Raster | BarcodeMode::Native => {
183 BarcodeMode::Raster | BarcodeMode::Native => {
183 match render_barcode(symbology, resolved_data, height_px) {
184 match render_barcode(symbology, resolved_data, height_px) {
184 Ok(img) => scale_graphic_to_width(img, metadata.printable_dots() as u32, align),
185 Ok(img) => PreviewLine::Graphic {
186 image: scale_gray_to_print_width(img, print_width),
187 align,
188 },
185 Err(e) => {
189 Err(e) => {
186 if template_data.contains("${") {
190 if template_data.contains("${") {
187 if let Ok(img) =
191 if let Ok(img) =
188 render_barcode(symbology, preview_barcode_sample(symbology), height_px)
192 render_barcode(symbology, preview_barcode_sample(symbology), height_px)
189 {
193 {
190 return scale_graphic_to_width(
194 return PreviewLine::Graphic {
191 img,
195 image: scale_gray_to_print_width(img, print_width),
192 metadata.printable_dots() as u32,
193 align,
196 align,
194 );
197 };
195 }
198 }
196 }
199 }
197 PreviewLine::Error {
200 PreviewLine::Error {
src/raster.rs +30 −0
@@ -84,6 +84,27 @@ pub fn render_barcode(
84 84 Ok(img.to_luma8())
85 85 }
86 86
87 /// Scale a graphic to exactly `target_width` dots (nearest-neighbor).
88 ///
89 /// Barcodes are stretched to the full printable width so module bars stay
90 /// wide enough to scan reliably.
91 pub fn scale_gray_to_print_width(gray: GrayImage, target_width: u32) -> GrayImage {
92 let (w, h) = gray.dimensions();
93 if w == 0 || h == 0 || target_width == 0 {
94 return gray;
95 }
96 if w == target_width {
97 return gray;
98 }
99 let new_h = ((h as f32) * (target_width as f32 / w as f32)).max(1.0) as u32;
100 image::imageops::resize(
101 &gray,
102 target_width,
103 new_h,
104 image::imageops::FilterType::Nearest,
105 )
106 }
107
87 108 /// Prefix payload for `barcoders` Code128.
88 109 ///
89 110 /// The crate requires a leading charset marker. Set A (`\u{00C0}`) only supports
@@ -145,6 +166,15 @@ pub fn render_qr(
145 166 mod tests {
146 167 use super::*;
147 168
169 #[test]
170 fn barcode_stretches_to_print_width() {
171 let narrow = render_barcode(BarcodeSymbology::Code128, "X", 60).unwrap();
172 assert!(narrow.width() < 384);
173 let wide = scale_gray_to_print_width(narrow, 384);
174 assert_eq!(wide.width(), 384);
175 assert!(wide.height() > 60);
176 }
177
148 178 #[test]
149 179 fn renders_code128_raster() {
150 180 let img = render_barcode(BarcodeSymbology::Code128, "TEST123", 60).unwrap();
@@ -84,6 +84,27 @@ pub fn render_barcode(
84 Ok(img.to_luma8())
84 Ok(img.to_luma8())
85}
85}
86
86
87/// Scale a graphic to exactly `target_width` dots (nearest-neighbor).
88///
89/// Barcodes are stretched to the full printable width so module bars stay
90/// wide enough to scan reliably.
91pub fn scale_gray_to_print_width(gray: GrayImage, target_width: u32) -> GrayImage {
92 let (w, h) = gray.dimensions();
93 if w == 0 || h == 0 || target_width == 0 {
94 return gray;
95 }
96 if w == target_width {
97 return gray;
98 }
99 let new_h = ((h as f32) * (target_width as f32 / w as f32)).max(1.0) as u32;
100 image::imageops::resize(
101 &gray,
102 target_width,
103 new_h,
104 image::imageops::FilterType::Nearest,
105 )
106}
107
87/// Prefix payload for `barcoders` Code128.
108/// Prefix payload for `barcoders` Code128.
88///
109///
89/// The crate requires a leading charset marker. Set A (`\u{00C0}`) only supports
110/// The crate requires a leading charset marker. Set A (`\u{00C0}`) only supports
@@ -145,6 +166,15 @@ pub fn render_qr(
145mod tests {
166mod tests {
146 use super::*;
167 use super::*;
147
168
169 #[test]
170 fn barcode_stretches_to_print_width() {
171 let narrow = render_barcode(BarcodeSymbology::Code128, "X", 60).unwrap();
172 assert!(narrow.width() < 384);
173 let wide = scale_gray_to_print_width(narrow, 384);
174 assert_eq!(wide.width(), 384);
175 assert!(wide.height() > 60);
176 }
177
148 #[test]
178 #[test]
149 fn renders_code128_raster() {
179 fn renders_code128_raster() {
150 let img = render_barcode(BarcodeSymbology::Code128, "TEST123", 60).unwrap();
180 let img = render_barcode(BarcodeSymbology::Code128, "TEST123", 60).unwrap();