From c8636c9dfd41c1353fe8d1c959bd0fbde44b60f2 Mon Sep 17 00:00:00 2001
From: LordBaryhobal <lordbaryhobal@gmail.com>
Date: Sun, 23 Jun 2024 22:22:49 +0200
Subject: [PATCH] improved intermediate values placement

---
 gallery/example1.pdf | Bin 185146 -> 185147 bytes
 gallery/example1.typ |   6 +++---
 src/func.typ         |   4 ----
 src/renderer.typ     |  15 +++++++++++++--
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/gallery/example1.pdf b/gallery/example1.pdf
index 750205d5848d4a051e3af6f10d41715d089f9795..53f7f9ee8ed456e02538fab86c668281221297d4 100644
GIT binary patch
delta 629
zcmdnBjC=Po?uHh|EleKk87-$bPGM5np1Yojo2_1=ael}=@!6(JCfr+jk7HXl%U<Kc
zzsK{Q9hTh1Iz2x3C7V~>pWo{7wf<|T)&9FO&2)A@OZn<-r9IBg6JtY_HU~Vo%<ran
zuyS$knQxEdyecIM_-#K1h`3BzVQk?m$Q>fzF*{|O^mDg%r)2h(mPZ^;G%Y{oEzwgJ
z9dgrS;qM!B>+SA~7{^5zUF1kQEWBT`ch7qJwkvZ#{@qvFy0Jw!a4$#dS0$e^wf9CT
z*G@R?-TFQINm<GB2&e5Y<Yu>glAZWYW6q>po@gdd%PWr7eySaJK4v*a@BCF2D7oFX
z|B7-BUrTSZYew?)AK#Ck%&!#DQ$B2|&B>H2!ZLB!oR6~B%H1j}g4i_A`niQEFXy~A
z^V?~$t&V<&Ure)XkN$G(>&5l|SZ6h?TfBYdHYN>WRU-o<0~4btO)domec${Pm&B4(
z1q~M~ps<O7nUOI>di%4JOukGUMg~A}D-)yX)@PV>5xjykOshqW0zIk%9V;^`i-Jw7
zaxH=rwG&O!rW>4P(!egYJ@+irJVqu9gXz5InaUZ>r?;MG>Si?AE_i{-naS2%!2kpl
z@_4yGw4sH8v8frln30(&hB_m2bK~g~FEI%-T1;PhiOJ0$tGgU+Z8a4%a7x8;+1YUw
amn0UIR1~GAaT!{e7#Le{sj9mAy8!?tE9|uZ

delta 628
zcmdnJjC<EI?uHh|EleKk87-zaPGM5np1Yojo2}krmG+yzNt@e5E?HldK3LYfpj>U;
z{~Kp(ES$GL__SL0uEWXx`u|T>zh8NE)A{+gHl=-@_#m&;x1~J8VAE=^6fv%vUk5c*
zEb_PX-mJUht;x^)ZlStdSCfZODcf?*q{dgwg_F;eJ-+iIAmfdKX}bhR<cBL2oXr>W
zy0xS=OXPQ7u75r|=@_@Snv`Qs#Ut~@6Tg2wK4F*fzWdwP8BE)tx=MWEnz)ve=bps2
zoso)MvHe?J@14GPGTtx5?j}zT*r$9+wl#QDZ=$z?X1i6!@s%tSt>bhvw8P`|wH|MK
zKC!ChY~zN)d8f_FI_vA_{F&zd(8y@c=1B?{+#Cf~o|e47(RfpbvR3MZOK(zAOp9hE
z%+1`N6Da+}q$h7?@ebGg82P`i;sZF>&77`yl1X^`+HFjt!m5UrriMm_QJP!|3i`hJ
zDK3d6sR|k{Rz?O!CI)6k#t`Z4&rdS>GI1DMTA3PJ85vHuIm4uj;1!->S}mHCr0?XG
z<dS0H=A3R(nQf*YnI2_0-S8}v26n0Kd1smCF*2E3PUkz%RL*ENz3n_xH>2@(p$kmT
zOo3(!1|Xo2$IAtx4J{0eO-<3ojLb|i)ESwZ8=<Q+wlFcDzU&f{n*mlwI@;Q5DrjJp
Snl5vhNrK&+OI6j?-wgn9w(nE`

diff --git a/gallery/example1.typ b/gallery/example1.typ
index 3af0b84..f9d2cc2 100644
--- a/gallery/example1.typ
+++ b/gallery/example1.typ
@@ -26,7 +26,7 @@
         disc(center: ($0$, "bottom"), eod: true),
         disc(center: ($0$, "bottom")),
         val(asymp($y=1$), "top"),
-        inter($y_0$, 2, 4, i: 2)
+        inter($y_0$, 2, 3)
       )
     )
     convex-line(
@@ -68,7 +68,7 @@
       val($2$, "bottom"),
       none,
       val(asymp($2sqrt(2)$), "top"),
-      inter($(2sqrt(1 + sqrt(5))) / sqrt(3)$, 3, 4, i: 5)
+      inter($(2sqrt(1 + sqrt(5))) / sqrt(3)$, 3, 4)
     ))
 
     convex-line("concavité", (
@@ -118,7 +118,7 @@
         val([min], "bottom"),
         none,
         val(asymp($x = 0$), "top"),
-        inter($0$, 0, 1, i: 1),
+        inter($0$, 0, 1),
         inter($0$, 1, 2, i: 4)
       )
     )
diff --git a/src/func.typ b/src/func.typ
index aa210aa..212fa48 100644
--- a/src/func.typ
+++ b/src/func.typ
@@ -41,10 +41,6 @@
 }
 
 #let inter(value, start, end, i: auto) = {
-  let i = i
-  if i == auto {
-    i = calc.floor( (start + end) / 2 )
-  }
   return (
     type: "intermediate",
     value: value,
diff --git a/src/renderer.typ b/src/renderer.typ
index 9990dc4..ff240d2 100644
--- a/src/renderer.typ
+++ b/src/renderer.typ
@@ -154,6 +154,7 @@
   let header = "header-" + str(line-i)
   let ood = line.start-ood
   let value-i = -1
+  let values-anchors = (:)
 
   if line.start-ood and line.values.len() != 0 {
     let first = line.values.first()
@@ -178,6 +179,7 @@
     if value.type == "value" {
       let pos = func.get-anchor(ctx, line-i, i, value.alignment, "center")
       value-i += 1
+      values-anchors.insert(str(value-i), i)
       draw.content(
         name: "value-" + str(value-i),
         pos,
@@ -193,8 +195,14 @@
     } else if value.type == "intermediate" {
       let start = "value-" + str(value.start)
       let end = "value-" + str(value.end)
-      let top = func.get-anchor(ctx, line-i, value.i, "top", "center", dy: 0)
-      let bottom = func.get-anchor(ctx, line-i, value.i, "bottom", "center", dy: 0)
+      let i = value.i
+      if i == auto {
+        let start-anchor = values-anchors.at(str(value.start))
+        let end-anchor = values-anchors.at(str(value.end))
+        i = calc.floor((start-anchor + end-anchor) / 2)
+      }
+      let top = func.get-anchor(ctx, line-i, i, "top", "center", dy: 0)
+      let bottom = func.get-anchor(ctx, line-i, i, "bottom", "center", dy: 0)
       let inter-name = "inter-" + str(i)
       draw.intersections(inter-name, {
         draw.hide(draw.line(start, end))
@@ -257,6 +265,7 @@
       if value.left.value != none {
         let p = func.get-anchor(ctx, line-i, i, value.left.alignment, "left")
         value-i += 1
+        values-anchors.insert(str(value-i), i)
         draw.content(
           name: "value-" + str(value-i),
           p,
@@ -274,6 +283,7 @@
       if value.center.value != none {
         let p = func.get-anchor(ctx, line-i, i, value.center.alignment, "center")
         value-i += 1
+        values-anchors.insert(str(value-i), i)
         draw.content(
           name: "value-" + str(value-i),
           p,
@@ -291,6 +301,7 @@
       if value.right.value != none {
         let p = func.get-anchor(ctx, line-i, i, value.right.alignment, "right")
         value-i += 1
+        values-anchors.insert(str(value-i), i)
         draw.content(
           name: "value-" + str(value-i),
           p,