feat: Add support for description selbri attachment points in parsing and graph representation

Author: lagleki

JboParse.hs

@@ -50,8 +50,14 @@ data FreeReturn
 evalFree :: Free -> ParseStateM FreeReturn
 evalFree (Discursive bt) = do
     ap <- getLastAttachmentPoint
+    -- For sei, the terms in BridiTail3 are PRE-selbri terms (leading terms)
+    -- but BridiTail3's second argument is normally TAIL terms (after selbri).
+    -- We fix this by treating them as leading terms via parseSentence.
+    let fixedParse = case bt of
+            BridiTail3 sb preTerms -> parseSentence (Sentence preTerms (BridiTail3 sb []))
+            _ -> parseBTail bt
     (FRSides SideDiscursive ap . (\p -> [TexticuleProp p]) <$>) $ evalParseM $
-	($nullArgs) <$> partiallyRunBridiM (parseBTail bt)
+	($nullArgs) <$> partiallyRunBridiM fixedParse
 evalFree (Bracketed text) = FRSides SideBracketed APBridi <$> evalText text
 evalFree (TruthQ kau) = return $ FRTruthQ kau
 evalFree _ = return FRIgnored
@@ -172,7 +178,9 @@ parseSelbri3 (ConnectedSB fore con sb sb') = do
 parseSelbri3 (ScalarNegatedSB nahe sb) =
     mapRelsInBridi (ScalarNegatedRel nahe) <$> parseSelbri3 sb
 parseSelbri3 (TanruUnit fs tu2 las) =
-    advanceArgPosToSelbri >> parseTU tu2 <* parseTerms las <* doFreesInParseM fs
+    advanceArgPosToSelbri >> parseTU tu2
+    <* liftParseStateMToParseM (setLastAttachmentPoint APSelbri)
+    <* parseTerms las <* doFreesInParseM fs
     {- Alternative: give tanru units their own scope, with linkargs deleting
     - places. Popular amongst lo irci, though contradicts CLL:5.12.11.
     - TODO: make it a command-line option?
@@ -663,7 +671,11 @@ mapRelsInBridi f b = (terpProp (\r ts -> Rel (f r) ts) id id) . b
 selbriToVPred :: Selbri -> ParseM r JboVPred
 selbriToVPred sb = parsedSelbriToVPred $ parseSelbri sb
 parsedSelbriToVPred :: BridiM Bridi -> ParseM r JboVPred
-parsedSelbriToVPred m = bridiToJboVPred <$> partiallyRunSubBridiM m
+parsedSelbriToVPred m = do
+    b <- partiallyRunSubBridiM m
+    -- Set APSelbri so frees inside descriptions attach to the description's selbri
+    liftParseStateMToParseM $ setLastAttachmentPoint APSelbri
+    return $ bridiToJboVPred b
 
 parsedSelbriToNewSelbri :: BridiM Bridi -> ParseM r Bridi
 parsedSelbriToNewSelbri m = closeBridi <$> partiallyRunSubBridiM m

JboTree.hs

@@ -65,10 +65,15 @@ jboPropsToGraph ps =
     in GraphOutput (reverse $ gsNodes finalState) (reverse $ gsEdges finalState)
 
 -- | Record which node an attachment point refers to (overwrite for rightmost/last in tree)
+-- | Record which node an attachment point refers to.
+-- Only records the FIRST occurrence - this matches parsing order where SEI captures
+-- the "current" selbri at the time it's encountered (e.g., zarci in "le zarci sei...")
 recordAttachment :: AttachmentPoint -> String -> GraphM ()
 recordAttachment ap nodeId = do
     st <- get
-    put $ st { gsAttachmentMap = Map.insert ap nodeId (gsAttachmentMap st) }
+    case Map.lookup ap (gsAttachmentMap st) of
+        Just _ -> return ()  -- Already recorded, keep the first one
+        Nothing -> put $ st { gsAttachmentMap = Map.insert ap nodeId (gsAttachmentMap st) }
 
 -- | Look up node ID for an attachment point; use bridi root for APUnknown/APBridi or when not found
 attachmentTarget :: String -> AttachmentPoint -> GraphM String