Skip to content

Commit 275cf44

Browse files
committed
fixed undefined variable in _get-style-at-func
1 parent ab9d74e commit 275cf44

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

src/smartart/common.typ

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
return (sizes, largest-width, highest-height)
207207
}
208208

209-
#let _get-style-at-func(style) = {
209+
#let _get-style-at-func(style, n-steps) = {
210210
if type(style) == function {
211211
style
212212
} else if type(style) == array {
@@ -219,7 +219,7 @@
219219
}
220220
}
221221
} else if type(style) == gradient {
222-
i => (fill: style.sample(i / (steps.len() - 1) * 100%))
222+
i => (fill: style.sample(i / (n-steps - 1) * 100%))
223223
} else {
224224
i => (:)
225225
}

src/smartart/cycle.typ

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,16 +103,17 @@
103103
base: cycle-basic-default-style,
104104
)
105105

106-
let step-style-at = _get-style-at-func(step-style)
107-
let arrow-style-at = _get-style-at-func(arrow-style)
106+
let n-steps = steps.len()
107+
let step-style-at = _get-style-at-func(step-style, n-steps)
108+
let arrow-style-at = _get-style-at-func(arrow-style, n-steps)
108109

109110
let (
110111
sizes,
111112
largest-width,
112113
highest-height
113114
) = _get-steps-sizes(steps, ctx, style, step-style-at)
114115

115-
let angle-step = 360deg / steps.len()
116+
let angle-step = 360deg / n-steps
116117
if not ccw {
117118
angle-step *= -1
118119
}
@@ -136,7 +137,7 @@
136137
_draw-step(ctx, step, pos, step-style, step-name, w, h)
137138
}
138139

139-
for i in range(steps.len()) {
140+
for i in range(n-steps) {
140141
let angle = angle-step * i + 90deg + offset-angle
141142

142143
let arrow-style = style.arrows + arrow-style-at(i)
@@ -186,7 +187,7 @@
186187
)
187188
draw.intersections(
188189
"j-" + str(i),
189-
"step-" + str(calc.rem(i + 1, steps.len())),
190+
"step-" + str(calc.rem(i + 1, n-steps)),
190191
"arc-" + str(i)
191192
)
192193

src/smartart/process.typ

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -149,8 +149,9 @@
149149

150150
let spacing = resolve-number(ctx, style.spacing)
151151

152-
let step-style-at = _get-style-at-func(step-style)
153-
let arrow-style-at = _get-style-at-func(arrow-style)
152+
let n-steps = steps.len()
153+
let step-style-at = _get-style-at-func(step-style, n-steps)
154+
let arrow-style-at = _get-style-at-func(arrow-style, n-steps)
154155

155156
let (
156157
sizes,
@@ -204,7 +205,7 @@
204205
dir: if i == 0 {none} else {dir}
205206
)
206207

207-
if i != steps.len() - 1 {
208+
if i != n-steps - 1 {
208209
let arrow-style = style.arrows + arrow-style-at(i)
209210
let arrow-stroke = arrow-style.stroke
210211
let arrow-fill = arrow-style.fill
@@ -308,7 +309,8 @@
308309

309310
let spacing = resolve-number(ctx, style.spacing)
310311

311-
let step-style-at = _get-style-at-func(step-style)
312+
let n-steps = steps.len()
313+
let step-style-at = _get-style-at-func(step-style, n-steps)
312314

313315
let (
314316
sizes,
@@ -357,7 +359,7 @@
357359

358360
let cap-s = if i == 0 { style.start-cap }
359361
else { style.middle-cap }
360-
let cap-e = if i == steps.len() - 1 { style.end-cap }
362+
let cap-e = if i == n-steps - 1 { style.end-cap }
361363
else { style.middle-cap }
362364

363365
let pos = if i == 0 {
@@ -389,7 +391,7 @@
389391
cap-e,
390392
step-style.cap-ratio,
391393
i == 0 and style.start-in-cap,
392-
(i == steps.len() - 1) and style.end-in-cap,
394+
(i == n-steps - 1) and style.end-in-cap,
393395
name: step-name
394396
)
395397
_draw-step-content(step, step-name, w * ctx.length)
@@ -484,9 +486,10 @@
484486
base: process-bending-default-style,
485487
)
486488

489+
let n-steps = steps.len()
487490
let stride = style.layout.max-stride
488491
if stride == none {
489-
stride = steps.len()
492+
stride = n-steps
490493
}
491494
let (flow-primary, flow-secondary) = style.layout.flow
492495
assert(
@@ -507,8 +510,8 @@
507510

508511
let spacing = resolve-number(ctx, style.spacing)
509512

510-
let step-style-at = _get-style-at-func(step-style)
511-
let arrow-style-at = _get-style-at-func(arrow-style)
513+
let step-style-at = _get-style-at-func(step-style, n-steps)
514+
let arrow-style-at = _get-style-at-func(arrow-style, n-steps)
512515

513516
let (
514517
sizes,

0 commit comments

Comments
 (0)