summaryrefslogtreecommitdiff
path: root/src/exec
diff options
context:
space:
mode:
Diffstat (limited to 'src/exec')
-rw-r--r--src/exec/context.rs16
-rw-r--r--src/exec/mod.rs14
-rw-r--r--src/exec/state.rs141
3 files changed, 86 insertions, 85 deletions
diff --git a/src/exec/context.rs b/src/exec/context.rs
index 13e53b09..725907f2 100644
--- a/src/exec/context.rs
+++ b/src/exec/context.rs
@@ -76,10 +76,10 @@ impl ExecContext {
/// Push text, but in monospace.
pub fn push_monospace_text(&mut self, text: impl Into<EcoString>) {
- let prev = Rc::clone(&self.state.font);
- self.state.font_mut().monospace = true;
+ let prev = Rc::clone(&self.state.text);
+ self.state.text_mut().monospace = true;
self.push_text(text);
- self.state.font = prev;
+ self.state.text = prev;
}
/// Push a word space into the active paragraph.
@@ -121,7 +121,7 @@ impl ExecContext {
/// Apply a forced paragraph break.
pub fn parbreak(&mut self) {
- let amount = self.state.par.spacing.resolve(self.state.font.size);
+ let amount = self.state.text.par_spacing();
self.stack.finish_par(&self.state);
self.stack.push_soft(StackChild::Spacing(amount));
}
@@ -148,7 +148,7 @@ impl ExecContext {
ParChild::Text(
text.into(),
self.state.aligns.cross,
- Rc::clone(&self.state.font),
+ Rc::clone(&self.state.text),
)
}
}
@@ -187,7 +187,7 @@ struct StackBuilder {
impl StackBuilder {
fn new(state: &State) -> Self {
Self {
- dirs: Gen::new(state.lang.dir, Dir::TTB),
+ dirs: Gen::new(state.dir, Dir::TTB),
children: vec![],
last: Last::None,
par: ParBuilder::new(state),
@@ -237,8 +237,8 @@ impl ParBuilder {
fn new(state: &State) -> Self {
Self {
aligns: state.aligns,
- dir: state.lang.dir,
- line_spacing: state.par.leading.resolve(state.font.size),
+ dir: state.dir,
+ line_spacing: state.text.line_spacing(),
children: vec![],
last: Last::None,
}
diff --git a/src/exec/mod.rs b/src/exec/mod.rs
index 76857b44..8b769def 100644
--- a/src/exec/mod.rs
+++ b/src/exec/mod.rs
@@ -57,8 +57,8 @@ impl ExecWithMap for SyntaxNode {
Self::Space => ctx.push_word_space(),
Self::Linebreak(_) => ctx.linebreak(),
Self::Parbreak(_) => ctx.parbreak(),
- Self::Strong(_) => ctx.state.font_mut().strong ^= true,
- Self::Emph(_) => ctx.state.font_mut().emph ^= true,
+ Self::Strong(_) => ctx.state.text_mut().strong ^= true,
+ Self::Emph(_) => ctx.state.text_mut().emph ^= true,
Self::Raw(n) => n.exec(ctx),
Self::Heading(n) => n.exec_with_map(ctx, map),
Self::List(n) => n.exec_with_map(ctx, map),
@@ -87,10 +87,10 @@ impl ExecWithMap for HeadingNode {
ctx.parbreak();
let snapshot = ctx.state.clone();
- let font = ctx.state.font_mut();
+ let text = ctx.state.text_mut();
let upscale = 1.6 - 0.1 * self.level as f64;
- font.size *= upscale;
- font.strong = true;
+ text.size *= upscale;
+ text.strong = true;
self.body.exec_with_map(ctx, map);
ctx.state = snapshot;
@@ -118,11 +118,11 @@ fn exec_item(ctx: &mut ExecContext, label: EcoString, body: &SyntaxTree, map: &E
let label = ctx.exec_stack(|ctx| ctx.push_text(label));
let body = ctx.exec_tree_stack(body, map);
let stack = StackNode {
- dirs: Gen::new(Dir::TTB, ctx.state.lang.dir),
+ dirs: Gen::new(Dir::TTB, ctx.state.dir),
aspect: None,
children: vec![
StackChild::Any(label.into(), Gen::default()),
- StackChild::Spacing(ctx.state.font.size / 2.0),
+ StackChild::Spacing(ctx.state.text.size / 2.0),
StackChild::Any(body.into(), Gen::default()),
],
};
diff --git a/src/exec/state.rs b/src/exec/state.rs
index 624394ba..be70cb67 100644
--- a/src/exec/state.rs
+++ b/src/exec/state.rs
@@ -8,37 +8,33 @@ use crate::layout::Paint;
use crate::paper::{Paper, PaperClass, PAPER_A4};
/// The execution state.
-#[derive(Default, Debug, Clone, Eq, PartialEq, Hash)]
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
pub struct State {
- /// The current language-related settings.
- pub lang: LangState,
- /// The current page settings.
- pub page: PageState,
- /// The current paragraph settings.
- pub par: ParState,
- /// The current font settings.
- pub font: Rc<FontState>,
+ /// The direction for text and other inline objects.
+ pub dir: Dir,
/// The current alignments of layouts in their parents.
pub aligns: Gen<Align>,
+ /// The current page settings.
+ pub page: PageState,
+ /// The current text settings.
+ pub text: Rc<TextState>,
}
impl State {
- /// Access the `font` state mutably.
- pub fn font_mut(&mut self) -> &mut FontState {
- Rc::make_mut(&mut self.font)
+ /// Access the `text` state mutably.
+ pub fn text_mut(&mut self) -> &mut TextState {
+ Rc::make_mut(&mut self.text)
}
}
-/// Defines language properties.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct LangState {
- /// The direction for text and other inline objects.
- pub dir: Dir,
-}
-
-impl Default for LangState {
+impl Default for State {
fn default() -> Self {
- Self { dir: Dir::LTR }
+ Self {
+ dir: Dir::LTR,
+ aligns: Gen::splat(Align::Start),
+ page: PageState::default(),
+ text: Rc::new(TextState::default()),
+ }
}
}
@@ -82,34 +78,14 @@ impl Default for PageState {
}
}
-/// Defines paragraph properties.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct ParState {
- /// The spacing between paragraphs (dependent on scaled font size).
- pub spacing: Linear,
- /// The spacing between lines (dependent on scaled font size).
- pub leading: Linear,
- /// The spacing between words (dependent on scaled font size).
- // TODO: Don't ignore this.
- pub word_spacing: Linear,
-}
-
-impl Default for ParState {
- fn default() -> Self {
- Self {
- spacing: Relative::new(1.0).into(),
- leading: Relative::new(0.5).into(),
- word_spacing: Relative::new(0.25).into(),
- }
- }
-}
-
-/// Defines font properties.
+/// Defines text properties.
#[derive(Debug, Clone, Eq, PartialEq, Hash)]
-pub struct FontState {
- /// A list of font families with generic class definitions.
+pub struct TextState {
+ /// A list of font families with generic class definitions (the final
+ /// family list also depends on `monospace`).
pub families: Rc<FamilyList>,
- /// The selected font variant.
+ /// The selected font variant (the final variant also depends on `strong`
+ /// and `emph`).
pub variant: FontVariant,
/// Whether the strong toggle is active or inactive. This determines
/// whether the next `*` adds or removes font weight.
@@ -121,6 +97,13 @@ pub struct FontState {
pub monospace: bool,
/// The font size.
pub size: Length,
+ /// The spacing between words (dependent on scaled font size).
+ // TODO: Don't ignore this.
+ pub word_spacing: Linear,
+ /// The spacing between lines (dependent on scaled font size).
+ pub line_spacing: Linear,
+ /// The spacing between paragraphs (dependent on scaled font size).
+ pub par_spacing: Linear,
/// The top end of the text bounding box.
pub top_edge: VerticalFontMetric,
/// The bottom end of the text bounding box.
@@ -135,13 +118,13 @@ pub struct FontState {
pub overline: Option<Rc<LineState>>,
}
-impl FontState {
- /// Access the `families` mutably.
+impl TextState {
+ /// Access the `families` list mutably.
pub fn families_mut(&mut self) -> &mut FamilyList {
Rc::make_mut(&mut self.families)
}
- /// The canonical family iterator.
+ /// The resolved family iterator.
pub fn families(&self) -> impl Iterator<Item = &str> + Clone {
let head = if self.monospace {
self.families.monospace.as_slice()
@@ -151,7 +134,7 @@ impl FontState {
head.iter().map(String::as_str).chain(self.families.iter())
}
- /// The canonical variant with `strong` and `emph` factored in.
+ /// The resolved variant with `strong` and `emph` factored in.
pub fn variant(&self) -> FontVariant {
let mut variant = self.variant;
@@ -169,9 +152,24 @@ impl FontState {
variant
}
+
+ /// The resolved word spacing.
+ pub fn word_spacing(&self) -> Length {
+ self.word_spacing.resolve(self.size)
+ }
+
+ /// The resolved line spacing.
+ pub fn line_spacing(&self) -> Length {
+ self.line_spacing.resolve(self.size)
+ }
+
+ /// The resolved paragraph spacing.
+ pub fn par_spacing(&self) -> Length {
+ self.par_spacing.resolve(self.size)
+ }
}
-impl Default for FontState {
+impl Default for TextState {
fn default() -> Self {
Self {
families: Rc::new(FamilyList::default()),
@@ -184,6 +182,9 @@ impl Default for FontState {
emph: false,
monospace: false,
size: Length::pt(11.0),
+ word_spacing: Relative::new(0.25).into(),
+ line_spacing: Relative::new(0.5).into(),
+ par_spacing: Relative::new(1.0).into(),
top_edge: VerticalFontMetric::CapHeight,
bottom_edge: VerticalFontMetric::Baseline,
fill: Paint::Color(Color::Rgba(RgbaColor::BLACK)),
@@ -194,24 +195,6 @@ impl Default for FontState {
}
}
-/// Describes a line that could be positioned over, under or on top of text.
-#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
-pub struct LineState {
- /// Stroke color of the line.
- ///
- /// Defaults to the text color if `None`.
- pub stroke: Option<Paint>,
- /// Thickness of the line's stroke. Calling functions should attempt to
- /// read this value from the appropriate font tables if this is `None`.
- pub thickness: Option<Linear>,
- /// Position of the line relative to the baseline. Calling functions should
- /// attempt to read this value from the appropriate font tables if this is
- /// `None`.
- pub offset: Option<Linear>,
- /// Amount that the line will be longer or shorter than its associated text.
- pub extent: Linear,
-}
-
/// Font family definitions.
#[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
pub struct FamilyList {
@@ -276,3 +259,21 @@ impl Display for FontFamily {
})
}
}
+
+/// Describes a line that is positioned over, under or on top of text.
+#[derive(Debug, Copy, Clone, Eq, PartialEq, Hash)]
+pub struct LineState {
+ /// Stroke color of the line.
+ ///
+ /// Defaults to the text color if `None`.
+ pub stroke: Option<Paint>,
+ /// Thickness of the line's stroke. Calling functions should attempt to
+ /// read this value from the appropriate font tables if this is `None`.
+ pub thickness: Option<Linear>,
+ /// Position of the line relative to the baseline. Calling functions should
+ /// attempt to read this value from the appropriate font tables if this is
+ /// `None`.
+ pub offset: Option<Linear>,
+ /// Amount that the line will be longer or shorter than its associated text.
+ pub extent: Linear,
+}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-15 22:57:02 +0000