Add Java->Java 8 and APL->BQN arrows to functional language diagram

2 files changed, 22 insertions, 2 deletions

diff --git a/doc/functional.md b/doc/functional.md
index 738cbae7..fc6541ba 100644
--- a/doc/functional.md
+++ b/doc/functional.md
@@ -14,7 +14,6 @@ pl ← <˘∘‿2⥊⟨
   "Pascal",     45‿12
   "C",          36‿10
   "Java",       48‿17
-  "Java 8",     37‿16
   "C#",         40‿20
   "Python",     28‿13
   "Javascript", 23‿17
@@ -29,6 +28,10 @@ pl ← <˘∘‿2⥊⟨
   "Idris",      26‿30
   "Coq",        26‿32
 ⟩
+arr ← ⟨
+  ⟨"Java 8", "Java", ¯11‿¯1, ¯3⟩
+  ⟨"",       "APL",  "BQN",   7⟩
+⟩
 cat ← ⟨
   ⟨"First-class",    0, ¯2, "bluegreen", 240, 252, 220, 190,   0⟩
   ⟨"Function-level", 1, ¯2, "red",       220, 320, 130, 180, ¯34⟩
@@ -54,11 +57,26 @@ Circ ← {
     (txt Attr"class"‿c) Enc tp Enc n
   ⟩
 }
+To ← {
+  PlPos ← ((⊑¨pl)⊑∘⊐<)⊑(1⊑¨pl)˙
+  n‿f‿t‿c ← 𝕩
+  f ↩ PlPos f ⋄ t ↩ (@≤⊑)◶⟨f⊸+, PlPos⟩ t
+  w ← 1‿¯1×⌽ u ← v ÷ l ← +´⌾(ט) v ← -˜´ p ← 10×f‿t
+  q ← ∾⟜⌽1=↕4 ⋄ m←l-50
+  a ← +˝w‿u× -⟜»˘ ((c×2¨˝⊸»)×⎉1·×⟜¬¯1⊸⊏÷m˙)⊸+ +`˘ ⍉>∾⟜(⌽1‿¯1⊸ר)⟨¯5‿¯1,1.5‿m,¯4‿¯1,7.5‿14⟩
+  d ← ⟨"d", ∾("M"∾q⊏"lq")∾⟜Fmt¨⟨(⊑p)+0‿4-˜(c×w)+26×u⟩∾((c×w)+÷⟜2)⊸∾¨⌾(q⊸/)a⟩
+  lab ← (0<≠)◶⟨⟩‿{⟨
+    ("text"At"font-size=8|dy=-0.2em") Enc ("textPath"At"href=#arr|startOffset=80%") Enc 𝕩
+  ⟩} n
+  path ← "path" At "stroke=currentColor|fill=none|opacity=0.9|stroke-width="∾FmtNum 0.9+0.4׬≠lab
+  ⟨path At⟜"id=arr"⍟(≠lab)⊸Elt d⟩ ∾ lab
+}
 
 0‿0‿512‿512 SVG gr Enc ∾⟨
   ⥊<("text"Attr"font-size"‿"24"∾Pos 256‿38) Enc """Functional programming"""
   ('0'+↕∘≠)⊸(Circ¨) cat
   Enc˜⟜("text" Attr ·Pos 10⊸×)´¨ pl
+  ∾To¨ arr
 ⟩
 -->
 
diff --git a/docs/doc/functional.html b/docs/doc/functional.html
index 33847f13..dbbee78a 100644
--- a/docs/doc/functional.html
+++ b/docs/doc/functional.html
@@ -40,7 +40,6 @@
     <text x='450' y='120'>Pascal</text>
     <text x='360' y='100'>C</text>
     <text x='480' y='170'>Java</text>
-    <text x='370' y='160'>Java 8</text>
     <text x='400' y='200'>C#</text>
     <text x='280' y='130'>Python</text>
     <text x='230' y='170'>Javascript</text>
@@ -54,6 +53,9 @@
     <text x='300' y='365'>Haskell</text>
     <text x='260' y='300'>Idris</text>
     <text x='260' y='320'>Coq</text>
+    <path stroke='currentColor' fill='none' opacity='0.9' stroke-width='0.9' id='arr' d='M454.378 160.658l1.691 -4.766q-30.101 -5.095 -60.744 -4.215l0.82 -4.037l-14.051 7.88l14.127 7.189l-1.189 -4.03q30.087 0.576 59.63 7.126l-0.283 -5.148'/>
+    <text font-size='8' dy='-0.2em'><textPath href='#arr' startOffset='80%'>Java 8</textPath></text>
+    <path stroke='currentColor' fill='none' opacity='0.9' stroke-width='1.3' d='M226.665 452.565l4.048 -3.283q-32.658 -21.441 -55.416 -52.782l4.127 -1.284l-14.113 -7.558l1.635 16.292l2.959 -2.944q22.243 32.947 54.386 55.995l2.374 -4.437'/>
   </g>
 </svg>