Skip to content

Make definition lists handle blank lines more like normal lists #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
notriddle wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make definition lists handle blank lines more like normal lists #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions commonmark-extensions/src/Commonmark/Extensions/DefinitionList.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,10 +160,13 @@ definitionListDefinitionBlockSpec = BlockSpec
, blockCanContain = const True
, blockContainsLines = False
, blockParagraph = False
, blockContinue = \node@(Node ndata _cs) -> do
pos <- getPosition
, blockContinue = \node@(Node ndata children) -> do
let definitionIndent = fromDyn (blockData ndata) 0
gobbleSpaces definitionIndent <|> 0 <$ lookAhead blankLine
-- a marker followed by two blanks is just an empty item:
pos <- getPosition
case blockBlanks ndata of
_:_ | null children -> lookAhead blankLine
_ -> () <$ gobbleSpaces definitionIndent <|> lookAhead blankLine
return $! (pos, node)
, blockConstructor = fmap mconcat . renderChildren
, blockFinalize = defaultFinalizer
Expand Down
31 changes: 31 additions & 0 deletions commonmark-extensions/test/definition_lists.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,3 +301,34 @@ bim
</dd>
</dl>
````````````````````````````````

<https://github.com/jgm/commonmark-hs/issues/165

```````````````````````````````` example
HTML In a Definition List
:
<div>
<span>One space</span>
</div>


HTML *Outside* a Definition List
:

<div>
<span>Two Spaces</span>
</div>
.
<dl>
<dt>HTML In a Definition List</dt>
<dd> <div>
<span>One space</span>
</div>
</dd>
<dt>HTML <em>Outside</em> a Definition List</dt>
<dd></dd>
</dl>
<div>
<span>Two Spaces</span>
</div>
````````````````````````````````