BlueGit

timfa posprint

Remove default_feed_before_cut metadata; auto-cut no longer feeds.

Spacing before cut is controlled in the template via blank lines or @feed.
Legacy files that still contain the field load fine; it is ignored on save.

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

timfa Tim Falken · pushed by timfa

Authored 2026-07-15 · 4 months ago

Hash
704324ca1a4ee5c6a47d9297707fb2d97bfac12e
Parent
b2e87838
4 files changed +10 −14
docs/ARCHITECTURE.md +2 −2
@@ -84,7 +84,7 @@ Image paths in `@image` resolve relative to the `.pos` file directory on print.
84 84 3. User selects a USB-serial port from `list_usb_serial_printers()`.
85 85 4. `substitute_document` → `EscPosEncoder::encode_document` → `SerialTransport::open` (9600 baud) → `print_bytes`.
86 86
87 If `metadata.cut_after_print` is true and the template has no `@cut`, feed + cut are appended automatically.
87 If `metadata.cut_after_print` is true and the template has no `@cut`, a cut command is appended automatically. Add blank lines or `@feed` in the template to control spacing before the cut.
88 88
89 89 ---
90 90
@@ -109,7 +109,7 @@ enum Block {
109 109
110 110 // io/
111 111 struct PosFile { version, metadata: PosMetadata, body }
112 struct PosMetadata { title, page_width_mm, preview_mode, chars_per_line, codepage, cut_after_print, default_feed_before_cut }
112 struct PosMetadata { title, page_width_mm, preview_mode, chars_per_line, codepage, cut_after_print }
113 113
114 114 // print/
115 115 struct PrinterDevice { id, display_name, port_name }
@@ -84,7 +84,7 @@ Image paths in `@image` resolve relative to the `.pos` file directory on print.
843. User selects a USB-serial port from `list_usb_serial_printers()`.
843. User selects a USB-serial port from `list_usb_serial_printers()`.
854. `substitute_document` → `EscPosEncoder::encode_document` → `SerialTransport::open` (9600 baud) → `print_bytes`.
854. `substitute_document` → `EscPosEncoder::encode_document` → `SerialTransport::open` (9600 baud) → `print_bytes`.
86
86
87If `metadata.cut_after_print` is true and the template has no `@cut`, feed + cut are appended automatically.
87If `metadata.cut_after_print` is true and the template has no `@cut`, a cut command is appended automatically. Add blank lines or `@feed` in the template to control spacing before the cut.
88
88
89---
89---
90
90
@@ -109,7 +109,7 @@ enum Block {
109
109
110// io/
110// io/
111struct PosFile { version, metadata: PosMetadata, body }
111struct PosFile { version, metadata: PosMetadata, body }
112struct PosMetadata { title, page_width_mm, preview_mode, chars_per_line, codepage, cut_after_print, default_feed_before_cut }
112struct PosMetadata { title, page_width_mm, preview_mode, chars_per_line, codepage, cut_after_print }
113
113
114// print/
114// print/
115struct PrinterDevice { id, display_name, port_name }
115struct PrinterDevice { id, display_name, port_name }
docs/FILE-FORMAT.md +1 −4
@@ -34,8 +34,7 @@ A `.pos` file stores a POS print template: metadata (page settings, title) plus
34 34 "preview_mode": "autoscale",
35 35 "chars_per_line": 48,
36 36 "codepage": "CP437",
37 "cut_after_print": true,
38 "default_feed_before_cut": 4
37 "cut_after_print": true
39 38 }
40 39 ```
41 40
@@ -47,7 +46,6 @@ A `.pos` file stores a POS print template: metadata (page settings, title) plus
47 46 | `chars_per_line` | `number?` | derived | Override character width for preview; derived from mm if omitted |
48 47 | `codepage` | `string?` | `"CP437"` | Character encoding for ESC/POS text |
49 48 | `cut_after_print` | `boolean` | `true` | Append cut command when printing if doc has no `@cut` |
50 | `default_feed_before_cut` | `number` | `4` | Feed lines before auto-cut |
51 49
52 50 ### Page width derivation
53 51
@@ -138,7 +136,6 @@ interface PosMetadata {
138 136 chars_per_line?: number;
139 137 codepage?: string;
140 138 cut_after_print?: boolean;
141 default_feed_before_cut?: number;
142 139 }
143 140 ```
144 141
@@ -34,8 +34,7 @@ A `.pos` file stores a POS print template: metadata (page settings, title) plus
34 "preview_mode": "autoscale",
34 "preview_mode": "autoscale",
35 "chars_per_line": 48,
35 "chars_per_line": 48,
36 "codepage": "CP437",
36 "codepage": "CP437",
37 "cut_after_print": true,
37 "cut_after_print": true
38 "default_feed_before_cut": 4
39}
38}
40```
39```
41
40
@@ -47,7 +46,6 @@ A `.pos` file stores a POS print template: metadata (page settings, title) plus
47| `chars_per_line` | `number?` | derived | Override character width for preview; derived from mm if omitted |
46| `chars_per_line` | `number?` | derived | Override character width for preview; derived from mm if omitted |
48| `codepage` | `string?` | `"CP437"` | Character encoding for ESC/POS text |
47| `codepage` | `string?` | `"CP437"` | Character encoding for ESC/POS text |
49| `cut_after_print` | `boolean` | `true` | Append cut command when printing if doc has no `@cut` |
48| `cut_after_print` | `boolean` | `true` | Append cut command when printing if doc has no `@cut` |
50| `default_feed_before_cut` | `number` | `4` | Feed lines before auto-cut |
51
49
52### Page width derivation
50### Page width derivation
53
51
@@ -138,7 +136,6 @@ interface PosMetadata {
138 chars_per_line?: number;
136 chars_per_line?: number;
139 codepage?: string;
137 codepage?: string;
140 cut_after_print?: boolean;
138 cut_after_print?: boolean;
141 default_feed_before_cut?: number;
142}
139}
143```
140```
144
141
src/escpos.rs +0 −1
@@ -44,7 +44,6 @@ impl EscPosEncoder {
44 44 self.encode_block(block)?;
45 45 }
46 46 if self.metadata.cut_after_print && !document.blocks.iter().any(|b| matches!(b, Block::Cut)) {
47 self.feed(self.metadata.default_feed_before_cut);
48 47 self.cut();
49 48 }
50 49 Ok(&self.buffer)
@@ -44,7 +44,6 @@ impl EscPosEncoder {
44 self.encode_block(block)?;
44 self.encode_block(block)?;
45 }
45 }
46 if self.metadata.cut_after_print && !document.blocks.iter().any(|b| matches!(b, Block::Cut)) {
46 if self.metadata.cut_after_print && !document.blocks.iter().any(|b| matches!(b, Block::Cut)) {
47 self.feed(self.metadata.default_feed_before_cut);
48 self.cut();
47 self.cut();
49 }
48 }
50 Ok(&self.buffer)
49 Ok(&self.buffer)
src/io/mod.rs +7 −7
@@ -18,18 +18,12 @@ pub struct PosMetadata {
18 18 pub codepage: Option<String>,
19 19 #[serde(default = "default_cut_after_print")]
20 20 pub cut_after_print: bool,
21 #[serde(default = "default_feed_before_cut")]
22 pub default_feed_before_cut: u8,
23 21 }
24 22
25 23 fn default_cut_after_print() -> bool {
26 24 true
27 25 }
28 26
29 fn default_feed_before_cut() -> u8 {
30 4
31 }
32
33 27 impl Default for PosMetadata {
34 28 fn default() -> Self {
35 29 Self {
@@ -38,7 +32,6 @@ impl Default for PosMetadata {
38 32 chars_per_line: None,
39 33 codepage: Some("CP437".into()),
40 34 cut_after_print: true,
41 default_feed_before_cut: 4,
42 35 }
43 36 }
44 37 }
@@ -132,6 +125,7 @@ mod tests {
132 125 fn roundtrip_json() {
133 126 let file = PosFile::new("# Test");
134 127 let json = file.to_json_pretty().unwrap();
128 assert!(!json.contains("default_feed_before_cut"));
135 129 let loaded = PosFile::from_json(&json).unwrap();
136 130 assert_eq!(loaded, file);
137 131 }
@@ -162,6 +156,12 @@ mod tests {
162 156 let loaded = PosFile::from_json(json).unwrap();
163 157 assert_eq!(loaded.body, "hello");
164 158 assert!(!loaded.to_json_pretty().unwrap().contains("preview_mode"));
159 assert!(
160 !loaded
161 .to_json_pretty()
162 .unwrap()
163 .contains("default_feed_before_cut")
164 );
165 165 }
166 166
167 167 #[test]
@@ -18,18 +18,12 @@ pub struct PosMetadata {
18 pub codepage: Option<String>,
18 pub codepage: Option<String>,
19 #[serde(default = "default_cut_after_print")]
19 #[serde(default = "default_cut_after_print")]
20 pub cut_after_print: bool,
20 pub cut_after_print: bool,
21 #[serde(default = "default_feed_before_cut")]
22 pub default_feed_before_cut: u8,
23}
21}
24
22
25fn default_cut_after_print() -> bool {
23fn default_cut_after_print() -> bool {
26 true
24 true
27}
25}
28
26
29fn default_feed_before_cut() -> u8 {
30 4
31}
32
33impl Default for PosMetadata {
27impl Default for PosMetadata {
34 fn default() -> Self {
28 fn default() -> Self {
35 Self {
29 Self {
@@ -38,7 +32,6 @@ impl Default for PosMetadata {
38 chars_per_line: None,
32 chars_per_line: None,
39 codepage: Some("CP437".into()),
33 codepage: Some("CP437".into()),
40 cut_after_print: true,
34 cut_after_print: true,
41 default_feed_before_cut: 4,
42 }
35 }
43 }
36 }
44}
37}
@@ -132,6 +125,7 @@ mod tests {
132 fn roundtrip_json() {
125 fn roundtrip_json() {
133 let file = PosFile::new("# Test");
126 let file = PosFile::new("# Test");
134 let json = file.to_json_pretty().unwrap();
127 let json = file.to_json_pretty().unwrap();
128 assert!(!json.contains("default_feed_before_cut"));
135 let loaded = PosFile::from_json(&json).unwrap();
129 let loaded = PosFile::from_json(&json).unwrap();
136 assert_eq!(loaded, file);
130 assert_eq!(loaded, file);
137 }
131 }
@@ -162,6 +156,12 @@ mod tests {
162 let loaded = PosFile::from_json(json).unwrap();
156 let loaded = PosFile::from_json(json).unwrap();
163 assert_eq!(loaded.body, "hello");
157 assert_eq!(loaded.body, "hello");
164 assert!(!loaded.to_json_pretty().unwrap().contains("preview_mode"));
158 assert!(!loaded.to_json_pretty().unwrap().contains("preview_mode"));
159 assert!(
160 !loaded
161 .to_json_pretty()
162 .unwrap()
163 .contains("default_feed_before_cut")
164 );
165 }
165 }
166
166
167 #[test]
167 #[test]