Merge pull request #194 from jelovirt/feature/admonition-in-a-list-it…

…em-fails-193 Support admonition block in list
jelovirt · Nov 1, 2023 · 66c3f70 · 66c3f70
2 parents 766a3d3 + 97f86de
commit 66c3f70
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java b/src/main/java/com/elovirta/dita/markdown/renderer/TopicRenderer.java
@@ -835,6 +835,7 @@ private void render(final Paragraph node, final NodeRendererContext context, fin
         tightList &&
         parent.isOrDescendantOfType(BulletListItem.class, OrderedListItem.class) &&
         !parent.isOrDescendantOfType(BlockQuote.class) &&
+        ListItem.class.isAssignableFrom(parent.getClass()) &&
         ((ListItem) parent).isTight()
       ) {
         context.renderChildren(node);

diff --git a/src/test/resources/dita/admonition.dita b/src/test/resources/dita/admonition.dita
@@ -64,5 +64,13 @@
     <note class="- topic/note " type="trouble">
       <p class="- topic/p ">block content</p>
     </note>
+    <ol class="- topic/ol ">
+      <li class="- topic/li ">
+        List item
+        <note class="- topic/note " type="note">
+          <p class="- topic/p ">block content</p>
+        </note>
+      </li>
+    </ol>
   </body>
-</topic>
+</topic>
diff --git a/src/test/resources/markdown/admonition.md b/src/test/resources/markdown/admonition.md
@@ -63,3 +63,7 @@ Open by default
 
 !!! trouble ""
     block content
+
+1. List item
+   !!! note
+   block content