modifier: Rename decoration to modifier

Author: johannes-wolf

src/canvas.typ

@@ -62,15 +62,13 @@
     nodes: (:),
     // Group stack
     groups: (),
-    // Registeretd decoration functions
-    decorations: (
-      wave: wave,
-      zigzag: zigzag,
-      coil: coil,
-    ),
+    // Registeretd modifier functions
     path-modifiers: (
       linearize: modifiers.linearize,
       wave: modifiers.wave,
+      //zigzag: modifiers.zigzag,
+      //coil: modifiers.coil,
+      ticks: modifiers.ticks,
     ),
   )
 

src/draw/grouping.typ

@@ -583,7 +583,7 @@
     let (ctx, drawables, ..) = process.many(ctx, util.resolve-body(ctx, body))
 
     let style = styles.resolve(ctx.style, merge: style.named())
-    style.decoration = modifier
+    style.modifier = modifier
 
     drawables = apply-path-modifier(ctx, style, drawables, close)
 

src/draw/shapes.typ

@@ -40,7 +40,7 @@
 
 // Apply path decoration to drawables
 #let _apply-decoration(ctx, style, drawables, close) = {
-  return modifier.apply-path-modifier(ctx, style, drawables, close).first()
+  return modifier.apply-path-modifier(ctx, style, drawables, close)
 }
 
 /// Draws a circle or ellipse.

src/modifier.typ

@@ -66,10 +66,10 @@
     drawables = (drawables,)
   }
 
-  let fns = if type(style.decoration) == array {
-    style.decoration
+  let fns = if type(style.modifier) == array {
+    style.modifier
   } else {
-    (style.decoration,)
+    (style.modifier,)
   }.map(n => {
     let name = if type(n) == dictionary {
       n.name
@@ -94,8 +94,8 @@
     (fn: fn, style: style + extra-style)
   })
 
-  // Unset decorations to prevent unwanted recursion
-  style.decoration = ()
+  // Unset modifiers to prevent unwanted recursion
+  style.modifier = ()
 
   // Apply function on all drawables
   return drawables.map(d => {

src/styles.typ

@@ -9,10 +9,9 @@
   //   - "CURVED" Preserving the bezier curve by calculating new control points
   shorten: "LINEAR",
 
-  // Path decorations:
-  //   - Named decoration: "wave",
-  //   - Decoration function taking a path
-  decoration: none,
+  // Path modifier:
+  //   - Named modifier: "wave",
+  //   - Modifier function taking a path
   modifier: (:),
 
   // Allowed values:
@@ -66,7 +65,7 @@
     radius: auto,
     stroke: auto,
     fill: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   group: (
     padding: auto,
@@ -77,22 +76,22 @@
     mark: auto,
     fill: auto,
     stroke: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   bezier: (
     stroke: auto,
     fill: auto,
     mark: auto,
     shorten: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   catmull: (
     tension: .5,
     mark: auto,
     shorten: auto,
     stroke: auto,
     fill: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   hobby: (
     /// Curve start and end omega (curlyness)
@@ -101,7 +100,7 @@
     shorten: auto,
     stroke: auto,
     fill: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   rect: (
     /// Rect corner radius that supports the following types:
@@ -117,7 +116,7 @@
     radius: 0,
     stroke: auto,
     fill: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   arc: (
     // Supported values:
@@ -130,7 +129,7 @@
     stroke: auto,
     fill: auto,
     radius: auto,
-    decoration: auto,
+    modifier: auto,
   ),
   content: (
     padding: auto,
@@ -141,7 +140,7 @@
     frame: none,
     fill: auto,
     stroke: auto,
-    decoration: auto,
+    modifier: auto,
   ),
 )