diff --git a/crates/automation/src/tools.rs b/crates/automation/src/tools.rs index 82bb2dfbf..e4b1445e2 100644 --- a/crates/automation/src/tools.rs +++ b/crates/automation/src/tools.rs @@ -485,7 +485,7 @@ pub fn tools() -> Vec { t( "doc_print", "Print", - "Print with Acrobat's Print dialog options, or save the print-ready PDF. pages: a range such as \"1-3, 6, 9-\" (page labels allowed; default all); subset odd/even; reverse. layout: fit (default), actual, shrink, custom (scale %), multiple (per_sheet 2/4/6/9/16, order, border, auto_rotate; cut-stack order arranges single-sided sheets for cutting into piles and stacking left to right, top to bottom, keeping sheet order within each pile; duplex must be off), booklet (booklet_subset both/front/back, binding left/right), poster (scale %, overlap pt, cut_marks). orientation auto/portrait/landscape; comments_forms document / document-and-markups (default) / document-and-stamps / form-fields-only; paper Letter/Legal/Tabloid, ARCH A/B/C/D/E1/E, ANSI C/D/E, or A0/A1/A2/A3/A4/A5 (short names or full preset labels); use layout actual for 100% in the print-ready PDF; printer drivers may still substitute paper or scale. Then path (save) or printer (a name or \"default\") with copies, collate, duplex off/long-edge/short-edge, grayscale, and options (driver options from printer_options, CUPS).", + "Print with Acrobat's Print dialog options, or save the print-ready PDF. pages: a range such as \"1-3, 6, 9-\" (page labels allowed; default all); subset odd/even; reverse. layout: fit (default), actual, shrink, custom (scale %), multiple (per_sheet 2/4/6/9/16, order, border, auto_rotate; cut-stack order arranges single-sided sheets for cutting into piles and stacking left to right, top to bottom, keeping sheet order within each pile; duplex must be off), booklet (booklet_subset both/front/back, binding left/right), poster (scale %, overlap pt, cut_marks). orientation auto/portrait/landscape; comments_forms document / document-and-markups (default) / document-and-stamps / form-fields-only; paper Letter/Legal/Tabloid, ARCH A/B/C/D/E1/E, ANSI C/D/E, or A0/A1/A2/A3/A4/A5/A6 (short names or full preset labels); use layout actual for 100% in the print-ready PDF; printer drivers may still substitute paper or scale. Then path (save) or printer (a name or \"default\") with copies, collate, duplex off/long-edge/short-edge, grayscale, and options (driver options from printer_options, CUPS).", ) .with(schema( json!({ diff --git a/crates/automation/tests/automation.rs b/crates/automation/tests/automation.rs index 0662362ba..43705c88f 100644 --- a/crates/automation/tests/automation.rs +++ b/crates/automation/tests/automation.rs @@ -5661,6 +5661,7 @@ fn architectural_and_iso_papers_through_tools() { ("A2", 420.0 * mm, 594.0 * mm), ("A1", 594.0 * mm, 841.0 * mm), ("A0", 841.0 * mm, 1189.0 * mm), + ("A6", 105.0 * mm, 148.0 * mm), ("Letter", 612.0, 792.0), ("US Legal", 612.0, 1008.0), ("Tabloid", 792.0, 1224.0), diff --git a/crates/print/README.md b/crates/print/README.md index 6a489977d..c7d6351fa 100644 --- a/crates/print/README.md +++ b/crates/print/README.md @@ -56,7 +56,7 @@ grayscale. ## Architectural sheets and scale -The Paper menu and `doc_print` share Letter, Legal, Tabloid, A3/A4/A5 plus +The Paper menu and `doc_print` share Letter, Legal, Tabloid, A3/A4/A5/A6 plus ARCH A/B/C/D/E1/E, ANSI C/D/E and ISO A0/A1/A2. ARCH D is 24 × 36 inches; ANSI D is 22 × 34 inches. Dimensions follow the [HP DesignJet paper-size table](https://support.hp.com/hr-en/document/bpp01676). Automation accepts short names such as `"ARCH D"` (case-insensitive) or the full menu label. diff --git a/crates/print/src/lib.rs b/crates/print/src/lib.rs index 7e6413d3c..e45babadb 100644 --- a/crates/print/src/lib.rs +++ b/crates/print/src/lib.rs @@ -237,13 +237,14 @@ impl Default for Settings { } /// Common paper sizes (points, portrait). -pub const PAPERS: [(&str, (f64, f64)); 18] = [ +pub const PAPERS: [(&str, (f64, f64)); 19] = [ ("US Letter", (612.0, 792.0)), ("US Legal", (612.0, 1008.0)), ("Tabloid", (792.0, 1224.0)), ("A3", (841.89, 1190.55)), ("A4", (595.28, 841.89)), ("A5", (419.53, 595.28)), + ("A6", (297.64, 419.53)), ("ARCH A (9 x 12 in)", (648.0, 864.0)), ("ARCH B (12 x 18 in)", (864.0, 1296.0)), ("ARCH C (18 x 24 in)", (1296.0, 1728.0)), diff --git a/parity/acrobat-features.toml b/parity/acrobat-features.toml index 41ab3224a..bfc05d107 100644 --- a/parity/acrobat-features.toml +++ b/parity/acrobat-features.toml @@ -7985,7 +7985,7 @@ status = "shipped" commands = ["print.dialog"] tools = ["doc_print"] evidence = ["crates/print/src/tests.rs::size_modes", "crates/print/src/tests.rs::architectural_sheets_preserve_full_scale", "crates/automation/tests/automation.rs::architectural_and_iso_papers_through_tools", "crates/ui-egui/tests/print.rs::architectural_page_can_be_matched_at_100_percent"] -notes = "fit, actual size, shrink oversized, custom %; ARCH A/B/C/D/E1/E, ANSI C/D/E, ISO A0/A1/A2 presets; Match page at 100% matches the current page to a standard sheet. PDF scale shows the previewed source-to-sheet transform, not calibrated physical output; driver substitution/scaling remains possible" +notes = "fit, actual size, shrink oversized, custom %; ARCH A/B/C/D/E1/E, ANSI C/D/E, ISO A0/A1/A2 and A6 presets; Match page at 100% matches the current page to a standard sheet. PDF scale shows the previewed source-to-sheet transform, not calibrated physical output; driver substitution/scaling remains possible" [[feature]] id = "print.paper-source-by-size"