Add Stroke::from_pair

crates/typst/src/eval/ops.rs

@@ -6,7 +6,7 @@ use ecow::eco_format;
 
 use crate::diag::{bail, At, SourceResult, StrResult};
 use crate::eval::{access_dict, Access, Eval, Vm};
-use crate::foundations::{format_str, Datetime, IntoValue, Regex, Repr, Smart, Value};
+use crate::foundations::{format_str, Datetime, IntoValue, Regex, Repr, Value};
 use crate::layout::{Align, Length, Rel};
 use crate::syntax::ast::{self, AstNode};
 use crate::text::TextElem;
@@ -217,28 +217,15 @@ pub fn add(lhs: Value, rhs: Value) -> StrResult<Value> {
         (Array(a), Array(b)) => Array(a + b),
         (Dict(a), Dict(b)) => Dict(a + b),
 
-        (Color(color), Length(thickness)) | (Length(thickness), Color(color)) => Stroke {
+        (Color(color), Length(thickness)) | (Length(thickness), Color(color)) => {
-            paint: Smart::Custom(color.into()),
+            Stroke::from_pair(color, thickness).into_value()
-            thickness: Smart::Custom(thickness),
-            ..Stroke::default()
         }
-        .into_value(),
-
         (Gradient(gradient), Length(thickness))
-        | (Length(thickness), Gradient(gradient)) => Stroke {
+        | (Length(thickness), Gradient(gradient)) => {
-            paint: Smart::Custom(gradient.into()),
+            Stroke::from_pair(gradient, thickness).into_value()
-            thickness: Smart::Custom(thickness),
-            ..Stroke::default()
         }
-        .into_value(),
-
         (Pattern(pattern), Length(thickness)) | (Length(thickness), Pattern(pattern)) => {
-            Stroke {
+            Stroke::from_pair(pattern, thickness).into_value()
-                paint: Smart::Custom(pattern.into()),
-                thickness: Smart::Custom(thickness),
-                ..Stroke::default()
-            }
-            .into_value()
         }
 
         (Duration(a), Duration(b)) => Duration(a + b),

crates/typst/src/layout/frame.rs

@@ -384,11 +384,8 @@ impl Frame {
             1,
             Point::with_y(self.baseline()),
             FrameItem::Shape(
-                Geometry::Line(Point::with_x(self.size.x)).stroked(FixedStroke {
+                Geometry::Line(Point::with_x(self.size.x))
-                    paint: Color::RED.into(),
+                    .stroked(FixedStroke::from_pair(Color::RED, Abs::pt(1.0))),
-                    thickness: Abs::pt(1.0),
-                    ..FixedStroke::default()
-                }),
                 Span::detached(),
             ),
         );
@@ -411,11 +408,8 @@ impl Frame {
         self.push(
             Point::with_y(y),
             FrameItem::Shape(
-                Geometry::Line(Point::with_x(self.size.x)).stroked(FixedStroke {
+                Geometry::Line(Point::with_x(self.size.x))
-                    paint: Color::GREEN.into(),
+                    .stroked(FixedStroke::from_pair(Color::GREEN, Abs::pt(1.0))),
-                    thickness: Abs::pt(1.0),
-                    ..FixedStroke::default()
-                }),
                 Span::detached(),
             ),
         );

crates/typst/src/math/frac.rs

@@ -152,11 +152,12 @@ fn layout(
         frame.push(
             line_pos,
             FrameItem::Shape(
-                Geometry::Line(Point::with_x(line_width)).stroked(FixedStroke {
+                Geometry::Line(Point::with_x(line_width)).stroked(
-                    paint: TextElem::fill_in(ctx.styles()).as_decoration(),
+                    FixedStroke::from_pair(
-                    thickness,
+                        TextElem::fill_in(ctx.styles()).as_decoration(),
-                    ..FixedStroke::default()
+                        thickness,
-                }),
+                    ),
+                ),
                 span,
             ),
         );

crates/typst/src/math/root.rs

@@ -131,11 +131,12 @@ fn layout(
     frame.push(
         line_pos,
         FrameItem::Shape(
-            Geometry::Line(Point::with_x(radicand.width())).stroked(FixedStroke {
+            Geometry::Line(Point::with_x(radicand.width())).stroked(
-                paint: TextElem::fill_in(ctx.styles()).as_decoration(),
+                FixedStroke::from_pair(
-                thickness,
+                    TextElem::fill_in(ctx.styles()).as_decoration(),
-                ..FixedStroke::default()
+                    thickness,
-            }),
+                ),
+            ),
             span,
         ),
     );

crates/typst/src/text/deco.rs

@@ -410,11 +410,10 @@ pub(crate) fn decorate(
     };
 
     let offset = offset.unwrap_or(-metrics.position.at(text.size)) - shift;
-    let stroke = stroke.clone().unwrap_or(FixedStroke {
+    let stroke = stroke.clone().unwrap_or(FixedStroke::from_pair(
-        paint: text.fill.as_decoration(),
+        text.fill.as_decoration(),
-        thickness: metrics.thickness.at(text.size),
+        metrics.thickness.at(text.size),
-        ..FixedStroke::default()
+    ));
-    });
 
     let gap_padding = 0.08 * text.size;
     let min_width = 0.162 * text.size;

crates/typst/src/visualize/stroke.rs

@@ -66,6 +66,17 @@ pub struct Stroke<T: Numeric = Length> {
     pub miter_limit: Smart<Scalar>,
 }
 
+impl Stroke {
+    /// Create a stroke from a paint and a thickness.
+    pub fn from_pair(paint: impl Into<Paint>, thickness: Length) -> Self {
+        Self {
+            paint: Smart::Custom(paint.into()),
+            thickness: Smart::Custom(thickness),
+            ..Default::default()
+        }
+    }
+}
+
 #[scope]
 impl Stroke {
     /// Converts a value to a stroke or constructs a stroke with the given
@@ -583,6 +594,17 @@ pub struct FixedStroke {
     pub miter_limit: Scalar,
 }
 
+impl FixedStroke {
+    /// Create a stroke from a paint and a thickness.
+    pub fn from_pair(paint: impl Into<Paint>, thickness: Abs) -> Self {
+        Self {
+            paint: paint.into(),
+            thickness,
+            ..Default::default()
+        }
+    }
+}
+
 impl Default for FixedStroke {
     fn default() -> Self {
         Self {