diff --git a/crates/idml/src/model/mod.rs b/crates/idml/src/model/mod.rs index 492a09b6b..89d061e84 100644 --- a/crates/idml/src/model/mod.rs +++ b/crates/idml/src/model/mod.rs @@ -26,13 +26,13 @@ pub use effects::{DirectionalFeatherValues, DropShadowValues, FeatherValues, Gra pub use geometry::{MAX_PATH_POINTS, PathGeometry, PathGeometryError, PathPoint, SubPath}; pub use preferences::TextFramePreferences; pub use resources::{ - CharacterAppearanceValues, CharacterTypographyValues, CjkCharacterValues, ColorDefinition, ColorGroup, ColorGroupDefinition, ColorGroupMember, - ColorSpace, CompositeFontDefinition, CompositeFontEntryDefinition, EpubExportTagMap, FontDefinition, FontFamilyDefinition, FontsPart, - GradientDefinition, GradientStop, GradientStopDefinition, GradientStopValue, GraphicPart, GrepStyleValue, Ink, InkDefinition, MojikumiRow, - NestedLineStyleValue, NestedStyleValue, NestedStyleValues, OpenTypeFeatureValues, ParagraphAlignmentValues, ParagraphBoxValues, - ParagraphFlowValues, ParagraphListValues, RubyValues, StrokeDefinition, StrokeStyle, StrokeStyleKind, Style, StyleGroup, StyleGroupWriter, - StyleKind, StyleNode, Swatch, SwatchKind, TabStopValues, TextDecorationValues, TintDefinition, color_groups, inks, named, preference, - stroke_styles, style_groups, swatches, + CharacterAppearanceValues, CharacterSpecialValues, CharacterTypographyValues, CjkCharacterValues, ColorDefinition, ColorGroup, + ColorGroupDefinition, ColorGroupMember, ColorSpace, CompositeFontDefinition, CompositeFontEntryDefinition, EpubExportTagMap, FontDefinition, + FontFamilyDefinition, FontsPart, GradientDefinition, GradientStop, GradientStopDefinition, GradientStopValue, GraphicPart, GrepStyleValue, Ink, + InkDefinition, MojikumiRow, NestedLineStyleValue, NestedStyleValue, NestedStyleValues, OpenTypeFeatureValues, ParagraphAlignmentValues, + ParagraphBoxValues, ParagraphFlowValues, ParagraphListValues, RubyValues, StrokeDefinition, StrokeStyle, StrokeStyleKind, Style, StyleGroup, + StyleGroupWriter, StyleKind, StyleNode, Swatch, SwatchKind, TabStopValues, TextDecorationValues, TintDefinition, color_groups, inks, named, + preference, stroke_styles, style_groups, swatches, }; pub use spread::{ ClippingPathValues, Graphic, GraphicChild, GraphicKind, GraphicLayerOptions, Guide, ItemChild, ItemKind, Link, MarginPreference, Page, PageChild, diff --git a/crates/idml/src/model/resources.rs b/crates/idml/src/model/resources.rs index eaedfcdcb..ef1cd77be 100644 --- a/crates/idml/src/model/resources.rs +++ b/crates/idml/src/model/resources.rs @@ -199,6 +199,66 @@ pub struct RubyValues { pub overprint_stroke: Option, } +/// Raw remaining character attributes and properties before semantic enum and condition mapping. +#[derive(Clone, Debug, Default, PartialEq)] +pub struct CharacterSpecialValues { + pub capitalization: Option, + pub position: Option, + pub glyph_form: Option, + pub no_break: Option, + pub tate_chu_yoko: Option, + pub tate_chu_yoko_x_offset: Option, + pub tate_chu_yoko_y_offset: Option, + pub warichu: Option, + pub warichu_lines: Option, + pub warichu_size: Option, + pub warichu_line_spacing: Option, + pub warichu_alignment: Option, + pub warichu_chars_before_break: Option, + pub warichu_chars_after_break: Option, + pub digits: Option, + pub character_direction: Option, + pub allow_kashidas: Option, + pub diacritic_position: Option, + pub diacritic_x_offset: Option, + pub diacritic_y_offset: Option, + pub positional_form: Option, + pub applied_conditions: Option, + pub applied_language: Option, +} + +impl CharacterSpecialValues { + /// Reads remaining character ranges/style fields from IDML. + pub fn from_el(el: &El) -> Self { + let values = Values::of(el); + Self { + capitalization: values.prop("Capitalization"), + position: values.prop("Position"), + glyph_form: values.prop("GlyphForm"), + no_break: values.boolean("NoBreak"), + tate_chu_yoko: values.boolean("Tatechuyoko"), + tate_chu_yoko_x_offset: values.num("TatechuyokoXOffset"), + tate_chu_yoko_y_offset: values.num("TatechuyokoYOffset"), + warichu: values.boolean("Warichu"), + warichu_lines: values.num("WarichuLines"), + warichu_size: values.num("WarichuSize"), + warichu_line_spacing: values.num("WarichuLineSpacing"), + warichu_alignment: values.prop("WarichuAlignment"), + warichu_chars_before_break: values.num("WarichuCharsBeforeBreak"), + warichu_chars_after_break: values.num("WarichuCharsAfterBreak"), + digits: values.prop("DigitsType"), + character_direction: values.prop("CharacterDirection"), + allow_kashidas: values.prop("Kashidas"), + diacritic_position: values.prop("DiacriticPosition"), + diacritic_x_offset: values.num("XOffsetDiacritic"), + diacritic_y_offset: values.num("YOffsetDiacritic"), + positional_form: values.prop("PositionalForm"), + applied_conditions: values.prop("AppliedConditions"), + applied_language: values.prop("AppliedLanguage"), + } + } +} + impl RubyValues { /// Reads Ruby text and formatting values from an IDML character range/style. pub fn from_el(el: &El) -> Self {