From 2e12106a901cf2574a7ef50975e71be13d02fca9 Mon Sep 17 00:00:00 2001
From: John MacFarlane <jgm@berkeley.edu>
Date: Mon, 10 Jun 2019 14:42:08 -0700
Subject: Asciidoc writer: ensure correct nesting strong/emph.

Closes #5565.
---
 src/Text/Pandoc/Writers/AsciiDoc.hs | 2 ++
 test/command/5565.md                | 6 ++++++
 2 files changed, 8 insertions(+)
 create mode 100644 test/command/5565.md

diff --git a/src/Text/Pandoc/Writers/AsciiDoc.hs b/src/Text/Pandoc/Writers/AsciiDoc.hs
index 31827fd69..cf5fec86f 100644
--- a/src/Text/Pandoc/Writers/AsciiDoc.hs
+++ b/src/Text/Pandoc/Writers/AsciiDoc.hs
@@ -405,6 +405,8 @@ withIntraword p = setIntraword True *> p <* setIntraword False
 
 -- | Convert Pandoc inline element to asciidoc.
 inlineToAsciiDoc :: PandocMonad m => WriterOptions -> Inline -> ADW m Doc
+inlineToAsciiDoc opts (Emph [Strong xs]) =
+  inlineToAsciiDoc opts (Strong [Emph xs])  -- see #5565
 inlineToAsciiDoc opts (Emph lst) = do
   contents <- inlineListToAsciiDoc opts lst
   isIntraword <- gets intraword
diff --git a/test/command/5565.md b/test/command/5565.md
new file mode 100644
index 000000000..1459e066d
--- /dev/null
+++ b/test/command/5565.md
@@ -0,0 +1,6 @@
+```
+% pandoc -t asciidoc
+***hi***
+^D
+*_hi_*
+```
-- 
cgit v1.2.3