UPDATED: Add HTML comment test cases to further demonstrate

diff --git a/tests/MMD6Tests/HTML Blocks.fodt b/tests/MMD6Tests/HTML Blocks.fodt
index d01e4f70db1f16d6d4a4701e7218f8945ab1d404..3531076744706bee455e5f098dc0e94d6637a1f8 100644 (file)
--- a/tests/MMD6Tests/HTML Blocks.fodt
+++ b/tests/MMD6Tests/HTML Blocks.fodt
@@ -299,17 +299,17 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 
 <text:p text:style-name="Standard"><text:a xlink:type="simple" xlink:href="#foo2">foo</text:a></text:p>
 
+<text:p text:style-name="Standard">15</text:p>
+
 <text:p text:style-name="Standard">&lt;!&#8211; This is not a</text:p>
 
 <text:p text:style-name="Standard"><text:span text:style-name="MMD-Italic">comment</text:span> &#8211;&gt;</text:p>
 
-<text:p text:style-name="Standard">15</text:p>
-
 <text:p text:style-name="Standard"><text:span text:style-name="MMD-Bold">foo3</text:span></text:p>
 
-<text:p text:style-name="Standard"><text:span text:style-name="MMD-Bold">foo5</text:span></text:p>
-
 <text:p text:style-name="Standard">20</text:p>
+
+<text:p text:style-name="Standard"><text:span text:style-name="MMD-Bold">foo5</text:span></text:p>
 </office:text>
 </office:body>
 </office:document>

diff --git a/tests/MMD6Tests/HTML Blocks.html b/tests/MMD6Tests/HTML Blocks.html
index 9b67dd1432af7c1f13ca56e17a5b82b9b228c306..2cc61958b60a3812a4988f6015244818f99e9906 100644 (file)
--- a/tests/MMD6Tests/HTML Blocks.html
+++ b/tests/MMD6Tests/HTML Blocks.html
@@ -74,12 +74,20 @@
 longer
  *comment* -->
 
-<p>&lt;!&#8211; This is not a</p>
+<!--
+This
 
-<p><em>comment</em> &#8211;&gt;</p>
+is
+
+a comment
+-->
 
 <p>15</p>
 
+<p>&lt;!&#8211; This is not a</p>
+
+<p><em>comment</em> &#8211;&gt;</p>
+
 <div>
 <div>
 **foo1**
@@ -112,6 +120,8 @@ longer
 
 </div>
 
+<p>20</p>
+
 <div>
 <div>
 
@@ -120,7 +130,6 @@ longer
 </div>
 </div>
 
-<p>20</p>
 
 </body>
 </html>

diff --git a/tests/MMD6Tests/HTML Blocks.htmlc b/tests/MMD6Tests/HTML Blocks.htmlc
index 669e29695b9c09df17447eaf565d04f2efbf1113..38cb03fd548cc13be9768daba96d21202969b18f 100644 (file)
--- a/tests/MMD6Tests/HTML Blocks.htmlc
+++ b/tests/MMD6Tests/HTML Blocks.htmlc
@@ -69,12 +69,20 @@ latex config:       article</p>
 longer
  *comment* -->
 
-<p>&lt;!-- This is not a</p>
+<!--
+This
 
-<p><em>comment</em> --&gt;</p>
+is
+
+a comment
+-->
 
 <p>15</p>
 
+<p>&lt;!-- This is not a</p>
+
+<p><em>comment</em> --&gt;</p>
+
 <div>
 <div>
 **foo1**
@@ -107,6 +115,8 @@ longer
 
 </div>
 
+<p>20</p>
+
 <div>
 <div>
 
@@ -115,4 +125,3 @@ longer
 </div>
 </div>
 
-<p>20</p>

diff --git a/tests/MMD6Tests/HTML Blocks.tex b/tests/MMD6Tests/HTML Blocks.tex
index cb49c0701eaefe16e79f97d55fde01511e662cb2..b4f6a298f2b5c96b723da9cbec3be6e9bdf95f0a 100644 (file)
--- a/tests/MMD6Tests/HTML Blocks.tex
+++ b/tests/MMD6Tests/HTML Blocks.tex
@@ -24,17 +24,17 @@ foo
 
 foo (\autoref{foo2})
 
+15
+
 <!-- This is not a
 
 \emph{comment} -->
 
-15
-
 \textbf{foo3}
 
-\textbf{foo5}
-
 20
 
+\textbf{foo5}
+
 \input{mmd6-article-footer}
 \end{document}

diff --git a/tests/MMD6Tests/HTML Blocks.text b/tests/MMD6Tests/HTML Blocks.text
index f8ddecba8a6a7b4c3c4909ccbf6b8ff2cf9b9e4b..d257dc3b275c320e0c89597175d43b8220c9512a 100644 (file)
--- a/tests/MMD6Tests/HTML Blocks.text
+++ b/tests/MMD6Tests/HTML Blocks.text
@@ -70,12 +70,20 @@ foo
 longer
  *comment* -->
 
-<!-- This is not a
+<!--
+This
 
-*comment* -->
+is
+
+a comment
+-->
 
 15
 
+<!-- This is not a
+
+*comment* -->
+
 <div>
 <div>
 **foo1**
@@ -111,6 +119,7 @@ longer
 
 </div>
 
+20
 
 <div>
 <div>
@@ -118,5 +127,3 @@ longer
 **foo5**
 </div>
 </div>
-
-20

diff --git a/tests/MMD6Tests/HTML Comments.fodt b/tests/MMD6Tests/HTML Comments.fodt
index fb0e65c3ed19b577f749fb713e509bcf2f85065e..d54fdf32bbab8e9895fea8abdf395450d64c78c5 100644 (file)
--- a/tests/MMD6Tests/HTML Comments.fodt
+++ b/tests/MMD6Tests/HTML Comments.fodt
@@ -304,6 +304,10 @@ office:mimetype="application/vnd.oasis.opendocument.text">
 <text:p text:style-name="Standard">&lt;!&#8211; <text:span text:style-name="MMD-Italic">foo</text:span></text:p>
 
 <text:p text:style-name="Standard"><text:span text:style-name="MMD-Italic">bar</text:span></text:p>
+
+<text:p text:style-name="Standard">&#8211;&gt;</text:p>
+
+<text:p text:style-name="Standard"><text:span text:style-name="MMD-Italic">foo</text:span></text:p>
 </office:text>
 </office:body>
 </office:document>

diff --git a/tests/MMD6Tests/HTML Comments.html b/tests/MMD6Tests/HTML Comments.html
index 71f27568cfbf3c91bd87f4399c8def96c46cae6f..b60a5387fafc5c13f2068f732218ab109eba2d30 100644 (file)
--- a/tests/MMD6Tests/HTML Comments.html
+++ b/tests/MMD6Tests/HTML Comments.html
@@ -26,14 +26,14 @@
 
 <p>&#8211;&gt;</p>
 
+<p>5</p>
+
 <!--
 
 *foo*
 
 -->
 
-<p>5</p>
-
 <p>foo &lt;!&#8211;</p>
 
 <p><em>bar</em> &#8211;&gt;</p>
@@ -42,8 +42,14 @@
 
 <p><em>bar</em></p>
 
+<p>&#8211;&gt;</p>
+
+<p><em>foo</em></p>
+
 <!--
 
+*foo* --> *bar*
+
 *foo*
 
 

diff --git a/tests/MMD6Tests/HTML Comments.htmlc b/tests/MMD6Tests/HTML Comments.htmlc
index cee3e109e74a3f5e3815f8dd85b30cacb863b249..25a54ba0eeb3d2bf8402452c28a6beb4654bfc80 100644 (file)
--- a/tests/MMD6Tests/HTML Comments.htmlc
+++ b/tests/MMD6Tests/HTML Comments.htmlc
@@ -21,14 +21,14 @@ latex config:       article</p>
 
 <p>--&gt;</p>
 
+<p>5</p>
+
 <!--
 
 *foo*
 
 -->
 
-<p>5</p>
-
 <p>foo &lt;!--</p>
 
 <p><em>bar</em> --&gt;</p>
@@ -37,7 +37,13 @@ latex config:        article</p>
 
 <p><em>bar</em></p>
 
+<p>--&gt;</p>
+
+<p><em>foo</em></p>
+
 <!--
 
+*foo* --> *bar*
+
 *foo*
 

diff --git a/tests/MMD6Tests/HTML Comments.tex b/tests/MMD6Tests/HTML Comments.tex
index d16f3e928369d20aaafda21d7b72e3f477e4bab3..a7d046162ce45f7caacdceb59919f0db66b38e1d 100644 (file)
--- a/tests/MMD6Tests/HTML Comments.tex
+++ b/tests/MMD6Tests/HTML Comments.tex
@@ -29,5 +29,9 @@ foo <!--
 
 \emph{bar}
 
+-->
+
+\emph{foo}
+
 \input{mmd6-article-footer}
 \end{document}

diff --git a/tests/MMD6Tests/HTML Comments.text b/tests/MMD6Tests/HTML Comments.text
index 88a26d42d5162cd97a01485ad2897c90c7ca60af..6f0d81b5ccc94e12a546cb08dd8b330a15c21a5a 100644 (file)
--- a/tests/MMD6Tests/HTML Comments.text
+++ b/tests/MMD6Tests/HTML Comments.text
@@ -21,14 +21,14 @@ foo <!--
 
 -->
 
+5
+
 <!--
 
 *foo*
 
 -->
 
-5
-
 foo <!-- 
 
 *bar* -->
@@ -37,6 +37,12 @@ foo <!--
 
 *bar*
 
+-->
+
+*foo*
+
 <!--
 
+*foo* --> *bar*
+
 *foo*