From 645b1114db49e99c9487dfa8cb6179248256fbb2 Mon Sep 17 00:00:00 2001 From: Johannes Wolf Date: Fri, 18 Oct 2024 13:37:14 +0200 Subject: [PATCH] coordinate: Fixups --- src/coordinate.typ | 9 +++------ tests/coordinate/custom/ref/1.png | Bin 6146 -> 6166 bytes 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/coordinate.typ b/src/coordinate.typ index 725d4f9a..2fe937e5 100644 --- a/src/coordinate.typ +++ b/src/coordinate.typ @@ -294,9 +294,6 @@ } else { "element" } - } else if ctx.at("resolve-system", default: none) != none { - ctx.resolve-system = none - resolve-system(ctx, c) } if t == none { @@ -322,7 +319,7 @@ /// - update (bool): Update the context's last position /// -> array #let resolve(ctx, ..coordinates, update: true) = { - let resolver = if type(ctx.resolve-coordinate) == array { + let resolvers = if type(ctx.resolve-coordinate) == array { ctx.resolve-coordinate } else { () @@ -330,8 +327,8 @@ let result = () for c in coordinates.pos() { - for i in range(1, resolver.len() + 1) { - c = (resolver.at(resolver.len() - i))(ctx, c) + for resolver in resolvers.rev() { + c = resolver(ctx, c) } let t = resolve-system(ctx, c) diff --git a/tests/coordinate/custom/ref/1.png b/tests/coordinate/custom/ref/1.png index c179a466e152aa41cb70f9b06a8b8de91980d948..10c1cd30780e9f20f1d29ac573143966290efba0 100644 GIT binary patch delta 4422 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 GB>Wehu>vgs delta 4396 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