n-star: Take inner-radius as a sep. argument (#957)

Author: johannes-wolf

CHANGES.md

@@ -20,6 +20,8 @@
 - Added a new `(project: <coordinate>, onto: (<coordinate>, <coordinate>))` 
   coordinate for projecting a point onto a line (short form: `(pt, "_|_", a, b)`)
 - Debug shapes (bounding boxes) are ignored by `merge-path` (#575)
+- **BREAKING** The `n-star` element now takes the inner radius as a separate style key `inner-radius` (ratio or number) (#920)
+- Fixed an issue with multiline text and baseline anchors in `content` (#956)
 
 # 0.4.1
 - Added a `n-star` shape for drawing n-pointed stars

src/draw/shapes.typ

@@ -708,7 +708,8 @@
 ///
 /// ## Styling
 /// Root: nstar
-/// - radius (inner, outer) = : The radius of the star's inner and outer points.
+/// - radius (number): The radius of the star's outer points.
+/// - inner-radius (number,ratio): The radius (relative to the outer radius) of the star's inner points(relative to the outer radius) of the star's inner points.
 /// - show-inner (bool) = false: If true, also draws the inner polygon connecting the star's inner points.
 /// - fill (color, gradient): The fill color for the star.
 /// - stroke (color, thickness, ...): The stroke for the star and the inner polygon.
@@ -723,10 +724,11 @@
     let style = styles.resolve(ctx.style, merge: style, root: "n-star")
 
     let (ctx, origin) = coordinate.resolve(ctx, origin)
-    let (inner-radius, outer-radius) = if type(style.radius) == array {
-      style.radius.map(util.resolve-number.with(ctx))
+    let outer-radius = util.resolve-number(ctx, style.radius)
+    let inner-radius = if type(style.inner-radius) == ratio {
+      outer-radius * style.inner-radius / 100%
     } else {
-      (style.radius, style.radius).map(util.resolve-number.with(ctx))
+      util.resolve-number(ctx, style.inner-radius)
     }
 
     let angle-step = 360deg / sides

src/styles.typ

@@ -129,6 +129,7 @@
   ),
   n-star: (
     radius: auto,
+    inner-radius: 50%,
     stroke: auto,
     fill: auto,
     // Connect inner points of the star

tests/shapes/n-star/ref/1.png

@@ -2,17 +2,12 @@
 #import "/src/lib.typ": *
 #import "/tests/helper.typ": *
 
-#test-case(
-  sides => {
+#test-case(sides => {
     import cetz.draw: *
+    n-star((0, 0), sides, angle: 9deg)
+}, args: (3, 4, 5, 6, 7))
 
-    n-star((0, 0), sides, angle: 9deg, stroke: luma(200) + 1pt)
-    set-origin((3, 0))
-    n-star((0, 0), sides, radius: (1, 1.5), angle: 30deg)
-    set-origin((4, 0))
-    n-star((0, 0), sides, radius: (1, 2), angle: 60deg, fill: red)
-    set-origin((4.5, 0))
-    n-star((0, 0), sides, radius: (1, 2.5), angle: 90deg, fill: blue, show-inner: true)
-  },
-  args: (3, 4, 5, 6, 7),
-)
+#test-case(sides => {
+    import cetz.draw: *
+    n-star((0, 0), inner-radius: 0.8, sides, fill: blue)
+}, args: (3, 4, 5, 6, 7))