From 2e917c7e12579737bb3c81258e20098732a32f10 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Wed, 20 Apr 2022 10:18:47 -0400
Subject: Keep md.bqn from adding an empty code tag after a link containing
 code

---
 md.bqn | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'md.bqn')

diff --git a/md.bqn b/md.bqn
index 646dc1f3..d8a514bf 100644
--- a/md.bqn
+++ b/md.bqn
@@ -363,7 +363,6 @@ Markdown ← {filename𝕊𝕩:
     # If span has both a leading and a trailing space, they are removed.
     remSpace ← I2M ⥊ ((1<-˜˝˘)∧·∧˝˘' '=⊏⟜𝕩)⊸/ -⟜0‿1˘ codeBounds
     codeMask ∧↩ ¬ remSpace
-    ⟨code,codePos⟩ ← codeMask extensions◶(⋈˜⟨⟩)‿GetMultiHighlights 𝕩
     include ← ¬ remSpace ∨ ≠` I2M ⥊ ctInds
     codeBounds ↩ ⥊ -⟜1‿0˘ codeBounds
     unused ← actual ∧ include ∧ ¬ codeMask
@@ -417,10 +416,15 @@ Markdown ← {filename𝕊𝕩:
     lInds ← JoinPairs○FindPairs˝ brak
     linkPos ← ⊏˘ lInds
     lInds +⎉1↩ 1‿0‿1‿0
-    unused ∧↩ include ∧↩ ¬ ≠` I2M ⥊ (¯1‿1+0‿3⊸⊏)˘ lInds
+    unused ∧↩ include ∧↩ notLink ← ¬ ≠` I2M ⥊ (¯1‿1+0‿3⊸⊏)˘ lInds
     linkGroup ← 1 -˜ (⊣×>)○(+`I2M)´ (≠⊸⥊⟜↕∾⊢)⟜2⊸⊔ ⥊lInds
     links ← ⥊ ProcLink¨˝˘ ∘‿2 ⥊ linkGroup ⊔ 𝕩
 
+    # Code highlighting within a link was handled by ProcLink
+    codeMask ∧↩ notLink
+    ⟨code,codePos⟩ ← codeMask extensions◶(⋈˜⟨⟩)‿GetMultiHighlights 𝕩
+    codeBounds /˜↩ codeBounds ⊏ notLink
+
     # Emphasis (still rudimentary)
     eMasks ← (unused ∧ 𝕩⊸=)¨ "*_"
     eMasks ↩ «⊸∧¨⊸(⊣∾˜»⊸∨⊸<¨) eMasks
-- 
cgit v1.2.3