app/IR.hs

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

app/Markdown.hs

@@ -66,23 +66,17 @@ 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
-      char '='
-      attrValue <- value
-      pure attrName ++ ('=' : attrValue)
+        attrName <- name
+        char '='
+        attrValue <- value
+        pure attrName ++ '=' : 
 
 whiteSpace :: Parser Text
 whiteSpace = pack <$> many space