diff --git a/crates/drawingml/src/part.rs b/crates/drawingml/src/part.rs
index 27215f85d..c3e530dd8 100644
--- a/crates/drawingml/src/part.rs
+++ b/crates/drawingml/src/part.rs
@@ -239,4 +239,84 @@ mod tests {
assert_eq!(back.extra.len(), MAX_EXTRA_COLORS);
assert_eq!(back.extra[0].tints.as_deref(), Some(&long[..MAX_TINT_ROWS]));
}
+
+ const THEME_FILE: &str = r#"
+
+
+
+
+
+"#;
+
+ fn theme_round_trip(t: &Theme) -> (String, Theme) {
+ let xml = String::from_utf8(crate::theme::theme_xml(&mut Part::new(), t)).unwrap();
+ let back = crate::theme::read_theme(&mut Part::new(), &parse(xml.as_bytes()).unwrap());
+ (xml, back)
+ }
+
+ #[test]
+ fn a_theme_keeps_system_colours_custom_colours_family_id_and_font_panose() {
+ let t = crate::theme::read_theme(&mut Part::new(), &parse(THEME_FILE.as_bytes()).unwrap());
+ assert_eq!(t.sys_colors.len(), 2);
+ let (xml, back) = theme_round_trip(&t);
+ assert!(xml.contains(r#""#), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ assert!(xml.contains("Brand red") && xml.contains("C00000") && xml.contains("Brand teal") && xml.contains("008080"), "{xml}");
+ assert!(xml.contains("thm15:themeFamily") && xml.contains("{62F939B6-93AF-4DB8-9C6B-D6C7DFDC589F}") && xml.contains("{4A3C46E8-61CC-4603-A589-7422A47A8E4A}"), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ assert_eq!((&back.sys_colors, &back.colors.colors, &back.fonts, &back.raw_extra), (&t.sys_colors, &t.colors.colors, &t.fonts, &t.raw_extra), "read, write, read changes nothing");
+ // Order: the colour list comes before the extension list, both after the theme elements.
+ let at = |n: &str| xml.find(n).unwrap_or_else(|| panic!("{n} in {xml}"));
+ assert!(at("") < at("") && at("") < at(""#), "{xml}");
+ assert!(xml.contains(r#""#), "{xml}");
+ let (plain, back) = theme_round_trip(&Theme::default());
+ assert!(!plain.contains("sysClr") && !plain.contains("custClrLst") && !plain.contains("themeFamily") && !plain.contains("panose"), "{plain}");
+ assert!(back.sys_colors.is_empty() && back.fonts.minor.latin_attrs.is_empty());
+ }
+
+ #[test]
+ fn list_styles_keep_def_ppr_in_every_place_they_are_written() {
+ use crate::text::{ListStyle, TextBody};
+ let src = r#""#;
+ let ls = crate::read::list_style(&mut Part::new(), &parse(src.as_bytes()).unwrap());
+ let d = ls.default_level.as_ref().expect("defPPr read");
+ assert_eq!((d.para.margin_left, d.para.align, d.run.lang.as_deref(), d.run.size), (Some(36.0), Some(crate::text::Align::Center), Some("de-DE"), Some(18.0)));
+ assert_eq!(ls.level(0).and_then(|l| l.run.size), Some(44.0));
+ for tag in ["p:defaultTextStyle", "p:titleStyle", "p:bodyStyle", "p:otherStyle", "p:notesStyle", "a:lstStyle"] {
+ let mut w = craft_xml::Writer::new();
+ crate::write::list_style(&mut w, &mut Part::new(), tag, &ls);
+ let xml = format!(r#"{}"#, w.finish());
+ assert!(xml.find("{}"#, w.finish());
+ let back = crate::read::text_body(&mut Part::new(), parse(xml.as_bytes()).unwrap().child(craft_xml::Local("txBody")).unwrap());
+ assert_eq!(back.list_style, ls);
+ let empty = ListStyle { default_level: Some(Default::default()), ..Default::default() };
+ assert!(!empty.is_empty());
+ let mut w = craft_xml::Writer::new();
+ crate::write::list_style(&mut w, &mut Part::new(), "p:defaultTextStyle", &empty);
+ assert_eq!(w.finish(), "");
+ // Without `a:defPPr` none is written.
+ let mut w = craft_xml::Writer::new();
+ crate::write::list_style(&mut w, &mut Part::new(), "p:defaultTextStyle", &ListStyle { default_level: None, ..ls });
+ assert!(!w.finish().contains("defPPr"));
+ }
}
diff --git a/crates/drawingml/src/read.rs b/crates/drawingml/src/read.rs
index 9e9f8ff3e..012c20552 100644
--- a/crates/drawingml/src/read.rs
+++ b/crates/drawingml/src/read.rs
@@ -623,6 +623,11 @@ pub fn list_style(src: &mut dyn Source, ls: &El) -> ListStyle {
let mut out = ListStyle::default();
for e in ls.elements() {
let n = e.local();
+ if n == "defPPr" {
+ let (_, para, run) = ppr(src, e);
+ out.default_level = Some(LevelStyle { para, run: run.unwrap_or_default() });
+ continue;
+ }
let Some(l) = n.strip_prefix("lvl").and_then(|r| r.strip_suffix("pPr")).and_then(|d| d.parse::().ok()) else { continue };
if !(1..=9).contains(&l) {
continue;
diff --git a/crates/drawingml/src/text.rs b/crates/drawingml/src/text.rs
index f60f23236..8fe0244e1 100644
--- a/crates/drawingml/src/text.rs
+++ b/crates/drawingml/src/text.rs
@@ -706,6 +706,10 @@ pub struct LevelStyle {
pub struct ListStyle {
/// Levels 1–9 (index 0–8); `None` = not specified.
pub levels: Vec