Merge remote-tracking branch 'upstream/master'

7 files changed, 78 insertions, 14 deletions

diff --git a/test/command/1710.md b/test/command/1710.md
index be96678bd..8a8b05889 100644
--- a/test/command/1710.md
+++ b/test/command/1710.md
@@ -19,19 +19,17 @@ ok
 <section id="slide-one" class="slide level1">
 <h1>Slide one</h1>
 <div class="columns">
-<div class="column" width="40%" style="width:40%;min-width:40%;vertical-align:top;">
+<div class="column" style="width:40%;min-width:40%;vertical-align:top;">
 <ul>
 <li>a</li>
 <li>b</li>
 </ul>
-</div>
-<div class="column" width="40%" style="width:40%;min-width:40%;vertical-align:top;">
+</div><div class="column" style="width:40%;min-width:40%;vertical-align:top;">
 <ul>
 <li>c</li>
 <li>d</li>
 </ul>
-</div>
-<div class="column" width="10%" style="width:10%;min-width:10%;vertical-align:top;">
+</div><div class="column" style="width:10%;min-width:10%;vertical-align:top;">
 <p>ok</p>
 </div>
 </div>
diff --git a/test/command/3596.md b/test/command/3596.md
index a064ca632..01a871e1b 100644
--- a/test/command/3596.md
+++ b/test/command/3596.md
@@ -50,11 +50,9 @@
 ^D
 -   foo
 
--   <div id="id">
-
+-   ::: {#id}
     bar
-
-    </div>
+    :::
 
 -   baz
 
diff --git a/test/command/3989.md b/test/command/3989.md
index 643de9f5d..bf078b2e4 100644
--- a/test/command/3989.md
+++ b/test/command/3989.md
@@ -1,9 +1,7 @@
 ```
 pandoc -f markdown -t native
-<span data-toggle="tooltip" data-placement="right" data-html="true"
-title="1st line of text <br> 2nd line of text">
-Hover over me
-</span>
+<span title="1st line of text <br> 2nd line of text">foo</span>
+ <span title="1st line of text <br> 2nd line of text">foo</span>
 ^D
-[Para [Span ("",[],[("data-toggle","tooltip"),("data-placement","right"),("data-html","true"),("title","1st line of text <br> 2nd line of text")]) [SoftBreak,Str "Hover",Space,Str "over",Space,Str "me",SoftBreak]]]
+[Para [Span ("",[],[("title","1st line of text <br> 2nd line of text")]) [Str "foo"],SoftBreak,Span ("",[],[("title","1st line of text <br> 2nd line of text")]) [Str "foo"]]]
 ```
diff --git a/test/command/4012.md b/test/command/4012.md
new file mode 100644
index 000000000..579ee2459
--- /dev/null
+++ b/test/command/4012.md
@@ -0,0 +1,8 @@
+```
+pandoc -f markdown-implicit_figures
+![image]
+
+[image]: http://example.com/image.jpg {height=35mm}
+^D
+<p><img src="http://example.com/image.jpg" alt="image" style="height:35mm" /></p>
+```
diff --git a/test/command/4016.md b/test/command/4016.md
new file mode 100644
index 000000000..69ad1c911
--- /dev/null
+++ b/test/command/4016.md
@@ -0,0 +1,47 @@
+```
+pandoc -t beamer
+# Level 2 blocks
+
+<div class="columns">
+<div class="column" width="40%">
+## Block one
+- Item
+</div>
+<div class="column" width="60%">
+## Block two
+- Item
+</div>
+</div>
+^D
+\begin{frame}{%
+\protect\hypertarget{level-2-blocks}{%
+Level 2 blocks}}
+
+\begin{columns}[T]
+\begin{column}{0.40\textwidth}
+\begin{block}{Block one}
+
+\begin{itemize}
+\tightlist
+\item
+  Item
+\end{itemize}
+
+\end{block}
+\end{column}
+
+\begin{column}{0.60\textwidth}
+\begin{block}{Block two}
+
+\begin{itemize}
+\tightlist
+\item
+  Item
+\end{itemize}
+
+\end{block}
+\end{column}
+\end{columns}
+
+\end{frame}
+```
diff --git a/test/command/4019.md b/test/command/4019.md
new file mode 100644
index 000000000..ab13f0233
--- /dev/null
+++ b/test/command/4019.md
@@ -0,0 +1,8 @@
+```
+pandoc --wrap=preserve
+This <!-- x > 0 --> works!
+This <!-- x > 0 --> fails?
+^D
+<p>This <!-- x > 0 --> works!
+This <!-- x > 0 --> fails?</p>
+```
diff --git a/test/command/latex-command-comment.md b/test/command/latex-command-comment.md
new file mode 100644
index 000000000..640277f15
--- /dev/null
+++ b/test/command/latex-command-comment.md
@@ -0,0 +1,7 @@
+```
+pandoc -f latex -t native
+\emph%
+{hi}
+^D
+[Para [Emph [Str "hi"]]]
+```