minor LLM fuckup fixes

app/IR.hs

@@ -4,33 +4,73 @@ import Data.Text
 
 newtype Document = Doc [Element]
 
-data Element = Heading Heading | Code Code | BlockQuote BlockQuote | List List | Table Table | HTML HTML | Paragraph Paragraph | BlankLine BlankLine
+data Element
+  = Heading Heading
+  | Code Code
+  | BlockQuote BlockQuote
+  | List List
+  | HTML HTML
+  | Paragraph Paragraph
+  | HorizontalRule
 
-data Heading = H {level :: Int, text :: Text}
+-- Removed: BlankLine
 
-data Code = C {language :: Text, code :: Text}
+data Heading = H
+  { level :: Int,
+    text :: [InlineText]
+  }
 
-newtype BlockQuote = Q Text
+data Code = C
+  { language :: Maybe Text,
+    code :: Text
+  }
+
+data BlockQuote = Q [InlineText]
+
+data ListItem = LI
+  { content :: [InlineText], -- Flatten continuations into here
+    children :: [List]
+  }
 
 data ListType = Ordered | Unordered
 
-data ListItem = LI {content :: Text, children :: [List]}
+data List = L
+  { list_type :: ListType,
+    items :: [ListItem]
+  }
 
-data List = L {list_type :: ListType, items :: [ListItem]}
+-- Table: keep as-is or simplify based on your needs
 
-data Table = T {header :: TableHeader, rows :: [TableRow]}
+data HTML
+  = HTMLTag
+  { tagName :: Text,
+    attributes :: [(Text, Maybe Text)],
+    html_content :: Text
+  }
 
-newtype TableHeader = TH [Text]
+-- Optionally skip: HTMLComment, HTMLDeclaration
-
-newtype TableRow = TR Text
-
-newtype HTML = Raw Text
 
 newtype Paragraph = P [InlineText]
 
-data InlineText = Normal Text | Escaped Char | Bold InlineText | Italic InlineText | CodeLine Text | Link {nest :: InlineText, href :: Text} | HTMLIn Text
+data InlineText
-
+  = Text Text -- Combined Normal and Escaped
-data BlankLine = BL
+  | Bold [InlineText]
+  | Italic [InlineText]
+  | InlineCode Text
+  | Link
+      { linkText :: [InlineText],
+        url :: Text,
+        title :: Maybe Text
+      }
+  | Image
+      { altText :: [InlineText],
+        url :: Text,
+        title :: Maybe Text
+      }
+  | HTMLInline
+      { inlineTagName :: Text,
+        inlineAttributes :: [(Text, Maybe Text)]
+      }
 
 -- for processing math
 -- https://hackage.haskell.org/package/typst-0.6.1/docs/Typst-Parse.html#v:parseTypst

app/Markdown.hs

@@ -66,17 +66,23 @@ htmlInline = do
   remaining <- htmlInlineRemainder
   whiteSpace
   char '>'
-  let remainingTagText = foldl' (\ongoing  current -> ongoing ++ ' ' : current) "" remaining
+  let remainingTagText = foldl' (\ongoing current -> ongoing ++ ' ' : current) "" remaining
 
   pure $ HTMLIn $ pack $ '<' : name ++ remaining
   where
     htmlInlineRemainder = many $ whiteSpace *> attribute
     name = many $ choice [alphaNum, char '-', char ':']
+    value = do
+      char '"'
+      l <- letter
+      rem <- many $ choice [alphaNum, char '-', char ':']
+      char '"'
+      pure '"' : l : rem ++ "\""
     attribute = do
-        attrName <- name
+      attrName <- name
-        char '='
+      char '='
-        attrValue <- value
+      attrValue <- value
-        pure attrName ++ '=' : 
+      pure attrName ++ ('=' : attrValue)
 
 whiteSpace :: Parser Text
 whiteSpace = pack <$> many space