Began using Transparent
This commit is contained in:
parent
22f4f89137
commit
eaf5d9408c
3 changed files with 5 additions and 2 deletions
|
|
@ -54,6 +54,7 @@ elementToHTML (List (L {list_type = Ordered {start_number, style}, items}) attrs
|
||||||
elementToHTML (List (L {list_type = Unordered {style}, items}) attrs) = T.concat ["<ul", maybe "" handleStyle style, ">", generateLiElems items, "</ul>"]
|
elementToHTML (List (L {list_type = Unordered {style}, items}) attrs) = T.concat ["<ul", maybe "" handleStyle style, ">", generateLiElems items, "</ul>"]
|
||||||
elementToHTML (HTML (HTMLTag {html_content})) = html_content
|
elementToHTML (HTML (HTMLTag {html_content})) = html_content
|
||||||
elementToHTML (Paragraph (P snippets) attrs) = T.concat ["<p", handleAttrs attrs, ">", serializeInlineToHTML snippets, "</p>"]
|
elementToHTML (Paragraph (P snippets) attrs) = T.concat ["<p", handleAttrs attrs, ">", serializeInlineToHTML snippets, "</p>"]
|
||||||
|
elementToHTML (Transparent snippets) = serializeInlineToHTML snippets
|
||||||
elementToHTML HorizontalRule = "<hr>"
|
elementToHTML HorizontalRule = "<hr>"
|
||||||
elementToHTML (Table _ _) = error "TODO"
|
elementToHTML (Table _ _) = error "TODO"
|
||||||
elementToHTML (Container _ _) = error "TODO"
|
elementToHTML (Container _ _) = error "TODO"
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,8 @@ data Element
|
||||||
| -- Markdown only, DJOT will produce a RawBlock with an html type
|
| -- Markdown only, DJOT will produce a RawBlock with an html type
|
||||||
HTML HTML
|
HTML HTML
|
||||||
| Paragraph Paragraph Attrs
|
| Paragraph Paragraph Attrs
|
||||||
|
| -- to avoid breaking generation when swapping InlineText to Element in Markdown parser
|
||||||
|
Transparent [InlineText]
|
||||||
| HorizontalRule
|
| HorizontalRule
|
||||||
| Table Table Attrs
|
| Table Table Attrs
|
||||||
| -- Djot :::
|
| -- Djot :::
|
||||||
|
|
|
||||||
|
|
@ -155,7 +155,7 @@ blockquoteBlock = do
|
||||||
-- this dance with optional and notFollowedBy is done so we
|
-- this dance with optional and notFollowedBy is done so we
|
||||||
-- aren't accidentally consuming part of a block ending
|
-- aren't accidentally consuming part of a block ending
|
||||||
(optional ((notFollowedBy blockEnding) *> lineEnding))
|
(optional ((notFollowedBy blockEnding) *> lineEnding))
|
||||||
pure [(Paragraph $ P ret) emptyAttrs]
|
pure [Transparent ret]
|
||||||
|
|
||||||
-- type of list the parser returns
|
-- type of list the parser returns
|
||||||
-- parser which grabs the prefix for each item of the list
|
-- parser which grabs the prefix for each item of the list
|
||||||
|
|
@ -175,7 +175,7 @@ listBlock list_type prefix child_parser_factory nest_level = do
|
||||||
|
|
||||||
child <- optional $ child_parser_factory $ nest_level + 1
|
child <- optional $ child_parser_factory $ nest_level + 1
|
||||||
error "TODO, child list handling works different now, child needs to be combined into content"
|
error "TODO, child list handling works different now, child needs to be combined into content"
|
||||||
pure $ LI {content = [Paragraph (P content) emptyAttrs]}
|
pure $ LI {content = [Transparent content]}
|
||||||
|
|
||||||
unorderedListBlock :: (Logger m, Characters s) => Int -> Parser s m Element
|
unorderedListBlock :: (Logger m, Characters s) => Int -> Parser s m Element
|
||||||
unorderedListBlock = listBlock Unordered {style = Nothing} unordered_prefix (\level -> unwrap <$> ((try $ unorderedListBlock level) <|> orderedListBlock level))
|
unorderedListBlock = listBlock Unordered {style = Nothing} unordered_prefix (\level -> unwrap <$> ((try $ unorderedListBlock level) <|> orderedListBlock level))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue