fix: improve fixed textbox slide fidelity

Signed-off-by: Yonghye Kwon <developer.0hye@gmail.com>

Author: developer0hye

crates/office2pdf/src/ir/elements.rs

@@ -152,6 +152,8 @@ pub struct TextBoxData {
     /// When true, text should not wrap — the content width is unconstrained.
     /// Corresponds to `<a:bodyPr wrap="none"/>` in OOXML.
     pub no_wrap: bool,
+    /// Whether the source requested PowerPoint autofit behavior for this box.
+    pub auto_fit: bool,
 }
 
 /// The kind of list: ordered (numbered) or unordered (bulleted).

crates/office2pdf/src/lib_render_tests.rs

@@ -357,6 +357,7 @@ fn test_render_document_fixed_textbox_ordered_list_keeps_all_numbers() {
                     stroke: None,
                     shape_kind: None,
                     no_wrap: false,
+                    auto_fit: false,
                 }),
             }],
             background_color: None,
@@ -710,6 +711,7 @@ fn test_render_pptx_style_document_size() {
                     stroke: None,
                     shape_kind: None,
                     no_wrap: false,
+                    auto_fit: false,
                 }),
             }],
         }));
@@ -769,6 +771,7 @@ fn test_render_document_with_centered_fixed_text_box() {
                     stroke: None,
                     shape_kind: None,
                     no_wrap: false,
+                    auto_fit: false,
                 }),
             }],
         })],
@@ -781,3 +784,69 @@ fn test_render_document_with_centered_fixed_text_box() {
         "Centered fixed text box should compile to a valid PDF"
     );
 }
+
+#[test]
+fn test_render_document_with_auto_fit_fixed_text_box() {
+    let doc = Document {
+        metadata: Metadata::default(),
+        pages: vec![Page::Fixed(FixedPage {
+            size: PageSize {
+                width: 300.0,
+                height: 200.0,
+            },
+            background_color: None,
+            background_gradient: None,
+            elements: vec![FixedElement {
+                x: 20.0,
+                y: 20.0,
+                width: 150.0,
+                height: 22.0,
+                kind: FixedElementKind::TextBox(TextBoxData {
+                    content: vec![Block::Paragraph(Paragraph {
+                        style: ParagraphStyle {
+                            alignment: Some(Alignment::Right),
+                            ..ParagraphStyle::default()
+                        },
+                        runs: vec![
+                            Run {
+                                text: "3. 시스템 연동 방안 ".to_string(),
+                                style: TextStyle {
+                                    font_size: Some(28.0),
+                                    bold: Some(true),
+                                    ..TextStyle::default()
+                                },
+                                href: None,
+                                footnote: None,
+                            },
+                            Run {
+                                text: "클라우드 기반 업무 시스템 연동".to_string(),
+                                style: TextStyle {
+                                    font_size: Some(16.0),
+                                    bold: Some(true),
+                                    ..TextStyle::default()
+                                },
+                                href: None,
+                                footnote: None,
+                            },
+                        ],
+                    })],
+                    padding: Insets::default(),
+                    vertical_align: TextBoxVerticalAlign::Top,
+                    fill: None,
+                    opacity: None,
+                    stroke: None,
+                    shape_kind: None,
+                    no_wrap: false,
+                    auto_fit: true,
+                }),
+            }],
+        })],
+        styles: StyleSheet::default(),
+    };
+
+    let pdf = render_document(&doc).unwrap();
+    assert!(
+        pdf.starts_with(b"%PDF"),
+        "Auto-fit fixed text box should compile to a valid PDF"
+    );
+}

crates/office2pdf/src/parser/pptx_shape_style_tests.rs

@@ -203,6 +203,86 @@ fn test_gradient_background_with_scheme_colors() {
     assert!((gradient.angle - 45.0).abs() < 0.001);
 }
 
+#[test]
+fn test_gradient_filled_shape_keeps_following_siblings() {
+    let before = make_text_box(0, 0, 2_000_000, 600_000, "Before");
+    let gradient_shape = concat!(
+        r#"<p:sp><p:nvSpPr><p:cNvPr id="30" name="GradientShape"/><p:cNvSpPr/><p:nvPr/></p:nvSpPr>"#,
+        r#"<p:spPr><a:xfrm><a:off x="0" y="800000"/><a:ext cx="3000000" cy="1200000"/></a:xfrm>"#,
+        r#"<a:prstGeom prst="rect"><a:avLst/></a:prstGeom>"#,
+        r#"<a:gradFill flip="none" rotWithShape="1"><a:gsLst>"#,
+        r#"<a:gs pos="0"><a:srgbClr val="367482"/></a:gs>"#,
+        r#"<a:gs pos="100000"><a:srgbClr val="306572"/></a:gs>"#,
+        r#"</a:gsLst><a:lin ang="5400000" scaled="1"/><a:tileRect/></a:gradFill>"#,
+        r#"</p:spPr></p:sp>"#
+    )
+    .to_string();
+    let after = make_text_box(0, 2_400_000, 2_500_000, 600_000, "After");
+    let slide = make_slide_xml(&[before, gradient_shape, after]);
+    let data = build_test_pptx(SLIDE_CX, SLIDE_CY, &[slide]);
+
+    let parser = PptxParser;
+    let (doc, _warnings) = parser.parse(&data, &ConvertOptions::default()).unwrap();
+
+    let page = first_fixed_page(&doc);
+    assert_eq!(
+        page.elements.len(),
+        3,
+        "Gradient-filled shapes must not consume later siblings: {:#?}",
+        page.elements
+    );
+
+    let last_text = match &page.elements[2].kind {
+        FixedElementKind::TextBox(text_box) => match &text_box.content[0] {
+            Block::Paragraph(paragraph) => paragraph.runs[0].text.clone(),
+            other => panic!("Expected paragraph block, got {other:?}"),
+        },
+        other => panic!("Expected final sibling text box, got {other:?}"),
+    };
+    assert_eq!(last_text, "After");
+}
+
+#[test]
+fn test_gradient_text_shape_with_style_keeps_following_siblings() {
+    let before = make_text_box(0, 0, 2_000_000, 600_000, "Before");
+    let gradient_text_shape = concat!(
+        r#"<p:sp><p:nvSpPr><p:cNvPr id="31" name="StyledGradientShape"/><p:cNvSpPr/><p:nvPr/></p:nvSpPr>"#,
+        r#"<p:spPr><a:xfrm flipV="1"><a:off x="0" y="800000"/><a:ext cx="3000000" cy="200000"/></a:xfrm>"#,
+        r#"<a:prstGeom prst="trapezoid"><a:avLst/></a:prstGeom>"#,
+        r#"<a:gradFill flip="none" rotWithShape="1"><a:gsLst>"#,
+        r#"<a:gs pos="0"><a:srgbClr val="FFFFFF"><a:alpha val="70000"/></a:srgbClr></a:gs>"#,
+        r#"<a:gs pos="76000"><a:srgbClr val="FFFFFF"><a:alpha val="29000"/></a:srgbClr></a:gs>"#,
+        r#"<a:gs pos="92000"><a:srgbClr val="FFFFFF"><a:alpha val="0"/></a:srgbClr></a:gs>"#,
+        r#"</a:gsLst><a:lin ang="16200000" scaled="1"/><a:tileRect/></a:gradFill><a:ln><a:noFill/></a:ln></p:spPr>"#,
+        r#"<p:style><a:lnRef idx="2"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="1"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="0"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="minor"><a:schemeClr val="lt1"/></a:fontRef></p:style>"#,
+        r#"<p:txBody><a:bodyPr rtlCol="0" anchor="ctr"/><a:lstStyle/><a:p><a:pPr algn="ctr"/><a:endParaRPr lang="en-US"/></a:p></p:txBody></p:sp>"#
+    )
+    .to_string();
+    let after = make_text_box(0, 1_400_000, 2_500_000, 600_000, "After");
+    let slide = make_slide_xml(&[before, gradient_text_shape, after]);
+    let data = build_test_pptx(SLIDE_CX, SLIDE_CY, &[slide]);
+
+    let parser = PptxParser;
+    let (doc, _warnings) = parser.parse(&data, &ConvertOptions::default()).unwrap();
+
+    let page = first_fixed_page(&doc);
+    assert_eq!(
+        page.elements.len(),
+        3,
+        "Styled gradient text shapes must not consume later siblings: {:#?}",
+        page.elements
+    );
+
+    let last_text = match &page.elements[2].kind {
+        FixedElementKind::TextBox(text_box) => match &text_box.content[0] {
+            Block::Paragraph(paragraph) => paragraph.runs[0].text.clone(),
+            other => panic!("Expected paragraph block, got {other:?}"),
+        },
+        other => panic!("Expected final sibling text box, got {other:?}"),
+    };
+    assert_eq!(last_text, "After");
+}
+
 #[test]
 fn test_solid_background_no_gradient() {
     let bg_xml =

crates/office2pdf/src/parser/pptx_slides.rs

@@ -482,6 +482,7 @@ fn finalize_shape(
     text_box_padding: Insets,
     text_box_vertical_align: TextBoxVerticalAlign,
     text_box_no_wrap: bool,
+    text_box_auto_fit: bool,
 ) -> Vec<FixedElement> {
     // Resolve effective fill: explicit > noFill > style fallback.
     let effective_fill: Option<Color> = if shape.fill.is_some() {
@@ -559,6 +560,7 @@ fn finalize_shape(
                     stroke: None,
                     shape_kind: None,
                     no_wrap: text_box_no_wrap,
+                    auto_fit: text_box_auto_fit,
                 }),
             });
         } else {
@@ -577,6 +579,7 @@ fn finalize_shape(
                     stroke,
                     shape_kind: None,
                     no_wrap: text_box_no_wrap,
+                    auto_fit: text_box_auto_fit,
                 }),
             });
         }
@@ -724,6 +727,7 @@ struct SlideXmlParser<'a> {
     text_box_padding: Insets,
     text_box_vertical_align: TextBoxVerticalAlign,
     text_box_no_wrap: bool,
+    text_box_auto_fit: bool,
     text_body_style_defaults: PptxTextBodyStyleDefaults,
 
     // ── Paragraph state (`<a:p>`) ───────────────────────────────────
@@ -745,6 +749,7 @@ struct SlideXmlParser<'a> {
     in_text: bool,
     in_rpr: bool,
     in_end_para_rpr: bool,
+    in_text_line: bool,
     solid_fill_ctx: SolidFillCtx,
     /// Inside `<a:lnRef>` within `<p:style>` — for resolving fallback line color.
     in_style_ln_ref: bool,
@@ -794,6 +799,7 @@ impl<'a> SlideXmlParser<'a> {
             text_box_padding: default_pptx_text_box_padding(),
             text_box_vertical_align: TextBoxVerticalAlign::Top,
             text_box_no_wrap: false,
+            text_box_auto_fit: false,
             text_body_style_defaults: PptxTextBodyStyleDefaults::default(),
 
             in_para: false,
@@ -812,6 +818,7 @@ impl<'a> SlideXmlParser<'a> {
             in_text: false,
             in_rpr: false,
             in_end_para_rpr: false,
+            in_text_line: false,
             solid_fill_ctx: SolidFillCtx::None,
             in_style_ln_ref: false,
             in_style_fill_ref: false,
@@ -878,6 +885,7 @@ impl<'a> SlideXmlParser<'a> {
                 self.text_box_padding = default_pptx_text_box_padding();
                 self.text_box_vertical_align = TextBoxVerticalAlign::Top;
                 self.text_box_no_wrap = false;
+                self.text_box_auto_fit = false;
             }
             b"sp" | b"cxnSp" if self.in_shape => {
                 self.shape.depth += 1;
@@ -966,6 +974,9 @@ impl<'a> SlideXmlParser<'a> {
                     &mut self.text_box_no_wrap,
                 );
             }
+            b"spAutoFit" | b"normAutofit" if self.in_shape && self.in_txbody => {
+                self.text_box_auto_fit = true;
+            }
             b"lstStyle" if self.in_shape && self.in_txbody => {
                 let local_defaults = parse_pptx_list_style(reader, self.theme, self.color_map);
                 self.text_body_style_defaults.merge_from(&local_defaults);
@@ -1068,10 +1079,13 @@ impl<'a> SlideXmlParser<'a> {
                 self.para_end_run_style = self.para_default_run_style.clone();
                 extract_rpr_attributes(e, &mut self.para_end_run_style);
             }
-            b"solidFill" if self.in_rpr => {
+            b"ln" if self.in_rpr || self.in_end_para_rpr => {
+                self.in_text_line = true;
+            }
+            b"solidFill" if self.in_rpr && !self.in_text_line => {
                 self.solid_fill_ctx = SolidFillCtx::RunFill;
             }
-            b"solidFill" if self.in_end_para_rpr => {
+            b"solidFill" if self.in_end_para_rpr && !self.in_text_line => {
                 self.solid_fill_ctx = SolidFillCtx::EndParaFill;
             }
             b"srgbClr" | b"schemeClr" | b"sysClr" if self.solid_fill_ctx != SolidFillCtx::None => {
@@ -1205,6 +1219,9 @@ impl<'a> SlideXmlParser<'a> {
                     &mut self.text_box_no_wrap,
                 );
             }
+            b"spAutoFit" | b"normAutofit" if self.in_shape && self.in_txbody => {
+                self.text_box_auto_fit = true;
+            }
             b"prstGeom" if self.shape.in_sp_pr => {
                 if let Some(prst) = get_attr_str(e, b"prst") {
                     self.shape.prst_geom = Some(prst);
@@ -1273,6 +1290,9 @@ impl<'a> SlideXmlParser<'a> {
                 self.para_end_run_style = self.para_default_run_style.clone();
                 extract_rpr_attributes(e, &mut self.para_end_run_style);
             }
+            b"ln" if self.in_rpr || self.in_end_para_rpr => {
+                self.in_text_line = true;
+            }
             b"pPr" if self.in_para && !self.in_run => {
                 self.para_level = extract_paragraph_level(e);
                 self.para_style = self
@@ -1375,6 +1395,7 @@ impl<'a> SlideXmlParser<'a> {
                             self.text_box_padding,
                             self.text_box_vertical_align,
                             self.text_box_no_wrap,
+                            self.text_box_auto_fit,
                         ));
                     }
                     self.in_shape = false;
@@ -1430,6 +1451,9 @@ impl<'a> SlideXmlParser<'a> {
             b"endParaRPr" if self.in_end_para_rpr => {
                 self.in_end_para_rpr = false;
             }
+            b"ln" if self.in_text_line => {
+                self.in_text_line = false;
+            }
             b"lnSpc" if self.in_ln_spc => {
                 self.in_ln_spc = false;
             }

crates/office2pdf/src/parser/pptx_text_box_semantic_tests.rs

@@ -190,6 +190,11 @@ fn test_text_box_body_pr_defaults_and_center_anchor_extracted() {
         text_box.vertical_align,
         crate::ir::TextBoxVerticalAlign::Center
     );
+    assert!(
+        text_box.auto_fit,
+        "spAutoFit text boxes should preserve the autofit hint in the IR"
+    );
+    assert!(!text_box.no_wrap);
 }
 
 #[test]
@@ -465,6 +470,47 @@ fn test_text_box_lst_style_default_run_props_are_applied_to_runs() {
     assert_eq!(run.style.color, Some(Color::new(0x03, 0x25, 0x43)));
 }
 
+#[test]
+fn test_text_box_font_ref_default_color_is_not_overridden_by_run_line_fill() {
+    let slide_shape = concat!(
+        r#"<p:sp><p:nvSpPr><p:cNvPr id="2" name="OrgBox"/><p:cNvSpPr/><p:nvPr/></p:nvSpPr>"#,
+        r#"<p:spPr><a:xfrm><a:off x="0" y="0"/><a:ext cx="2000000" cy="900000"/></a:xfrm>"#,
+        r#"<a:prstGeom prst="rect"><a:avLst/></a:prstGeom><a:ln><a:noFill/></a:ln></p:spPr>"#,
+        r#"<p:style>"#,
+        r#"<a:lnRef idx="2"><a:schemeClr val="accent1"/></a:lnRef>"#,
+        r#"<a:fillRef idx="1"><a:schemeClr val="lt1"/></a:fillRef>"#,
+        r#"<a:effectRef idx="0"><a:schemeClr val="accent1"/></a:effectRef>"#,
+        r#"<a:fontRef idx="minor"><a:schemeClr val="dk1"/></a:fontRef>"#,
+        r#"</p:style>"#,
+        r#"<p:txBody><a:bodyPr/><a:lstStyle/>"#,
+        r#"<a:p><a:pPr algn="ctr"/>"#,
+        r#"<a:r><a:rPr lang="ko-KR">"#,
+        r#"<a:ln><a:solidFill><a:sysClr val="window" lastClr="FFFFFF"><a:alpha val="0"/></a:sysClr></a:solidFill></a:ln>"#,
+        r#"<a:latin typeface="Pretendard"/><a:ea typeface="Pretendard"/></a:rPr><a:t>이동욱 이사</a:t></a:r>"#,
+        r#"</a:p></p:txBody></p:sp>"#,
+    );
+    let slide_xml = make_slide_xml(&[slide_shape.to_string()]);
+    let theme_xml = make_theme_xml(&standard_theme_colors(), "Pretendard", "Pretendard");
+    let data = build_test_pptx_with_theme(SLIDE_CX, SLIDE_CY, &[slide_xml], &theme_xml);
+
+    let parser = PptxParser;
+    let (doc, _warnings) = parser.parse(&data, &ConvertOptions::default()).unwrap();
+
+    let page = first_fixed_page(&doc);
+    let blocks = text_box_blocks(&page.elements[0]);
+    let paragraph = match &blocks[0] {
+        Block::Paragraph(paragraph) => paragraph,
+        other => panic!("Expected Paragraph block, got {other:?}"),
+    };
+    assert_eq!(paragraph.runs.len(), 1);
+    assert_eq!(paragraph.runs[0].text, "이동욱 이사");
+    assert_eq!(
+        paragraph.runs[0].style.color,
+        Some(Color::new(0x00, 0x00, 0x00)),
+        "Run line fill should not overwrite the fontRef default text color"
+    );
+}
+
 #[test]
 fn test_non_placeholder_shape_inherits_master_other_style_run_defaults() {
     let slide_shape = concat!(

crates/office2pdf/src/parser/pptx_theme.rs

@@ -599,6 +599,8 @@ pub(super) fn parse_shape_gradient_fill(
                                 color,
                             });
                         }
+                        // `parse_color_from_start` consumes the matching end tag too.
+                        depth = depth.saturating_sub(1);
                     }
                     _ => {}
                 }
@@ -681,6 +683,8 @@ pub(super) fn parse_effect_list(
                         if let Some(alpha) = parsed.alpha {
                             shdw_opacity = alpha;
                         }
+                        // `parse_color_from_start` consumes the matching end tag too.
+                        depth = depth.saturating_sub(1);
                     }
                     _ => {}
                 }