fix: add root to relative href

DocGen4/Output/Definition.lean

@@ -25,11 +25,11 @@ def equationsToHtml (i : DefinitionInfo) : HtmlM (Option Html) := do
 
 def definitionToHtml (i : DefinitionInfo) : HtmlM (Array Html) := do
   let equationsHtml? ← equationsToHtml i
-  let docstringHtml? := i.doc.map docStringToHtml
+  let docstringHtml? ← i.doc.mapM docStringToHtml
   match equationsHtml?, docstringHtml? with
-  | some e, some d => pure #[e, d]
+  | some e, some d => pure (#[e] ++ d)
   | some e, none   => pure #[e]
-  | none  , some e => pure #[e]
+  | none  , some d => pure d
   | none  , none   => pure #[]
 
 

DocGen4/Output/DocString.lean

@@ -28,9 +28,15 @@ def textToIdAttribute (s : String) : String :=
   |>.toLower
   |>.replace " " "-"
 
-partial def addAttributes : Element → Element
+def extendRelativeLink (link : String) (root : String) : String := 
-| el@(Element.Element name attrs contents) => 
+  -- HACK: better way to detect absolute links
-  -- heading only
+  if link.startsWith "http" then
+    link
+  else root ++ link
+
+partial def addAttributes : Element → HtmlM Element
+| el@(Element.Element name attrs contents) => do
+  -- add id and class to <h_></h_>
   if name = "h1" ∨ name = "h2" ∨ name = "h3" ∨ name = "h4" ∨ name = "h5" ∨ name = "h6" then
     let id := textToIdAttribute (elementToPlainText el)
     let anchorAttributes := Std.RBMap.empty
@@ -40,24 +46,33 @@ partial def addAttributes : Element → Element
     let newAttrs := attrs
       |>.insert "id" id
       |>.insert "class" "markdown-heading"
-    let newContents :=
+    let newContents := (← 
-      contents.map (λ c => match c with
+      contents.mapM (λ c => match c with
-      | Content.Element e => Content.Element (addAttributes e)
+      | Content.Element e => (addAttributes e).map (Content.Element)
-      | _ => c)
+      | _ => pure c))
       |>.push (Content.Element anchor)
-    ⟨ name, newAttrs, newContents⟩ 
+    pure ⟨ name, newAttrs, newContents⟩ 
+  -- extend relative href for <a></a>
+  else if name = "a" then
+    let root ← getRoot
+    let newAttrs := match attrs.find? "href" with
+    | some href => attrs.insert "href" (extendRelativeLink href root)
+    | none => attrs
+    pure ⟨ name, newAttrs, contents⟩
+  -- recursively modify
   else
-    let newContents := contents.map λ c => match c with
+    let newContents ← contents.mapM λ c => match c with
-      | Content.Element e => Content.Element (addAttributes e)
+      | Content.Element e => (addAttributes e).map Content.Element
-      | _ => c
+      | _ => pure c
-    ⟨ name, attrs, newContents ⟩ 
+    pure ⟨ name, attrs, newContents ⟩ 
 
-def docStringToHtml (s : String) : Html := 
+def docStringToHtml (s : String) : HtmlM (Array Html) := do
   let rendered := CMark.renderHtml s
-  let attributed := match manyDocument rendered.mkIterator with
+  match manyDocument rendered.mkIterator with
-  | Parsec.ParseResult.success _ res =>  "".intercalate (res.map addAttributes |>.map toString).toList
+  | Parsec.ParseResult.success _ res => 
-  | _ => rendered
+    res.mapM λ x => do
-  Html.text attributed
+      pure (Html.text $ toString (← addAttributes x))
+  | _ => pure #[Html.text rendered]
 
 end Output
 end DocGen4

DocGen4/Output/Inductive.lean

@@ -13,9 +13,9 @@ def ctorToHtml (i : NameInfo) : HtmlM Html := do
 
 def inductiveToHtml (i : InductiveInfo) : HtmlM (Array Html) := do
   let constructorsHtml := <ul "class"="constructors">[← i.ctors.toArray.mapM ctorToHtml]</ul>
-  let docstringHtml? := i.doc.map docStringToHtml
+  let docstringHtml? ← i.doc.mapM docStringToHtml
   match docstringHtml? with
-  | some d => pure #[constructorsHtml, d]
+  | some d => pure (#[constructorsHtml] ++ d)
   | none   => pure #[constructorsHtml]
 
 end Output

DocGen4/Output/Module.lean

@@ -82,7 +82,7 @@ def docInfoToHtml (module : Name) (doc : DocInfo) : HtmlM Html := do
   | DocInfo.instanceInfo i => instanceToHtml i
   | DocInfo.classInductiveInfo i => classInductiveToHtml i
   | i => match i.getDocString with
-    | some d => pure #[docStringToHtml d]
+    | some d => pure (← docStringToHtml d)
     | _ => pure #[]
 
   let attrs := doc.getAttrs
@@ -108,7 +108,7 @@ def docInfoToHtml (module : Name) (doc : DocInfo) : HtmlM Html := do
 def modDocToHtml (module : Name) (mdoc : ModuleDoc) : HtmlM Html := do
   pure 
     <div «class»="mod_doc">
-      {docStringToHtml mdoc.doc}
+      [←docStringToHtml mdoc.doc]
     </div>
 
 def moduleMemberToHtml (module : Name) (member : ModuleMember) : HtmlM Html := 

DocGen4/Output/Structure.lean

@@ -27,9 +27,9 @@ def structureToHtml (i : StructureInfo) : HtmlM (Array Html) := do
         </ul>
         <li «class»="structure_ext_ctor">)</li>
       </ul>)
-  let docstringHtml? := i.doc.map docStringToHtml
+  let docstringHtml? ← i.doc.mapM docStringToHtml
   match docstringHtml? with
-  | some d => pure #[structureHtml, d]
+  | some d => pure (#[structureHtml] ++ d)
   | none   => pure #[structureHtml]
 
 end Output