CHANGED: Update test suite

diff --git a/tests/MMD6Tests/Superscript.fodt b/tests/MMD6Tests/Superscript.fodt
index e3dbb8d5182f22512204eea4bf634eb969bb9868..a5796e7e9da7875ea54530a218a350694852a27f 100644 (file)
--- a/tests/MMD6Tests/Superscript.fodt
+++ b/tests/MMD6Tests/Superscript.fodt
@@ -303,6 +303,10 @@
 <text:p text:style-name="Standard">x^y</text:p>
 
 <text:p text:style-name="Standard">x~y</text:p>
+
+<text:p text:style-name="Standard">x<text:span text:style-name="MMD-Subscript">2</text:span> 3~</text:p>
+
+<text:p text:style-name="Standard">x<text:span text:style-name="MMD-Subscript">2</text:span> 3<text:span text:style-name="MMD-Subscript">2</text:span></text:p>
 </office:text>
 </office:body>
 </office:document>

diff --git a/tests/MMD6Tests/Superscript.html b/tests/MMD6Tests/Superscript.html
index ffc10b16cc1f9a87e5fb7ae59726f16c74127f72..412f8f64edc94e49bc82b1ce1fbc81f78b5d7217 100644 (file)
--- a/tests/MMD6Tests/Superscript.html
+++ b/tests/MMD6Tests/Superscript.html
@@ -34,6 +34,10 @@
 
 <p>x~y</p>
 
+<p>x<sub>2</sub> 3~</p>
+
+<p>x<sub>2</sub> 3<sub>2</sub></p>
+
 </body>
 </html>
 

diff --git a/tests/MMD6Tests/Superscript.htmlc b/tests/MMD6Tests/Superscript.htmlc
index e6cd5a1eca5dd8485d3c96d85d7096321ec8eae0..44789486efc7ce9883e7d7a96a6fad4f185c9379 100644 (file)
--- a/tests/MMD6Tests/Superscript.htmlc
+++ b/tests/MMD6Tests/Superscript.htmlc
@@ -28,3 +28,7 @@ latex config: article</p>
 <p>x^y</p>
 
 <p>x~y</p>
+
+<p>x~2 3~</p>
+
+<p>x~2 3~2</p>

diff --git a/tests/MMD6Tests/Superscript.tex b/tests/MMD6Tests/Superscript.tex
index b14afaee3491a73b717c7bc77a1db9d5000319ab..a8930dc918b393ff36a2e311b66dc6d259660de9 100644 (file)
--- a/tests/MMD6Tests/Superscript.tex
+++ b/tests/MMD6Tests/Superscript.tex
@@ -30,5 +30,9 @@ x\^{}y
 
 x\ensuremath{\sim}y
 
+x\textsubscript{2} 3\ensuremath{\sim}
+
+x\textsubscript{2} 3\textsubscript{2}
+
 \input{mmd6-article-footer}
 \end{document}

diff --git a/tests/MMD6Tests/Superscript.text b/tests/MMD6Tests/Superscript.text
index 8a1ffd03e9ddc477ae6d14da54a131d8760f0f21..965cdb0ae32c37bf5efced87a6ed647f86e0026b 100644 (file)
--- a/tests/MMD6Tests/Superscript.text
+++ b/tests/MMD6Tests/Superscript.text
@@ -28,3 +28,7 @@ z~z.~
 x\^y
 
 x\~y
+
+x~2 3~
+
+x~2 3~2

diff --git a/tests/MMD6Tests/Transclusion.fodt b/tests/MMD6Tests/Transclusion.fodt
index b35f696944af13d749b3273deef9d4b799131bef..28a5809ed1c13a86ae9bf50dee2af27ab810a561 100644 (file)
--- a/tests/MMD6Tests/Transclusion.fodt
+++ b/tests/MMD6Tests/Transclusion.fodt
@@ -289,6 +289,18 @@
 <text:p text:style-name="Preformatted Text">This is a file with no metadata.<text:line-break/></text:p>
 
 <text:p text:style-name="Standard">{{transclusion/bat.*}}</text:p>
+
+<text:p text:style-name="Standard">This text is included in <text:span text:style-name="Source_20_Text">transclusion/baz.txt</text:span>.</text:p>
+
+<text:p text:style-name="Standard">This should pull in <text:span text:style-name="Source_20_Text">bar.txt</text:span>, <text:span text:style-name="MMD-Italic">if</text:span> run from the parent directory.</text:p>
+
+<text:p text:style-name="Standard">This text is included in <text:span text:style-name="Source_20_Text">bar.txt</text:span>.</text:p>
+
+<text:p text:style-name="Standard">This can be transcluded without causing an infinite loop &#8211; {{foo.txt}}</text:p>
+
+<text:p text:style-name="Preformatted Text">This is a file with no metadata.<text:line-break/></text:p>
+
+<text:p text:style-name="Preformatted Text">This is a file with no metadata.<text:line-break/></text:p>
 </office:text>
 </office:body>
 </office:document>

diff --git a/tests/MMD6Tests/Transclusion.html b/tests/MMD6Tests/Transclusion.html
index 6517e57c043068f232e5930667262beb76ae4bb9..0b12a33cf5489101a2cc95592763334487e8cf12 100644 (file)
--- a/tests/MMD6Tests/Transclusion.html
+++ b/tests/MMD6Tests/Transclusion.html
@@ -22,6 +22,19 @@
 
 <p>This is <em>HTML</em>.</p>
 
+<p>This text is included in <code>transclusion/baz.txt</code>.</p>
+
+<p>This should pull in <code>bar.txt</code>, <em>if</em> run from the parent directory.</p>
+
+<p>This text is included in <code>bar.txt</code>.</p>
+
+<p>This can be transcluded without causing an infinite loop &#8211; {{foo.txt}}</p>
+
+<pre><code>This is a file with no metadata.
+</code></pre>
+
+<pre><code>This is a file with no metadata.
+</code></pre>
 
 </body>
 </html>

diff --git a/tests/MMD6Tests/Transclusion.htmlc b/tests/MMD6Tests/Transclusion.htmlc
index f61b47c8c6d5354eb1cad0f3b47c42963e94858b..bdf892dd8a31f55c9892d0031d309fc92a45d572 100644 (file)
--- a/tests/MMD6Tests/Transclusion.htmlc
+++ b/tests/MMD6Tests/Transclusion.htmlc
@@ -6,3 +6,5 @@ latex config:   article</p>
 <p>{{bar.txt}}</p>
 
 <p>{{transclusion/bat.*}}</p>
+
+<p>{{transclusion/baz.txt}}</p>

diff --git a/tests/MMD6Tests/Transclusion.tex b/tests/MMD6Tests/Transclusion.tex
index 9c88bd40f7e6b4fe00afa92369e146a54c9d15d0..d476cd384a08928b96a2e79f1e3644031b580f33 100644 (file)
--- a/tests/MMD6Tests/Transclusion.tex
+++ b/tests/MMD6Tests/Transclusion.tex
@@ -20,5 +20,21 @@ This is a file with no metadata.
 
 \{\{transclusion\slash bat.*\}\}
 
+This text is included in \texttt{transclusion\slash baz.txt}.
+
+This should pull in \texttt{bar.txt}, \emph{if} run from the parent directory.
+
+This text is included in \texttt{bar.txt}.
+
+This can be transcluded without causing an infinite loop -- \{\{foo.txt\}\}
+
+\begin{verbatim}
+This is a file with no metadata.
+\end{verbatim}
+
+\begin{verbatim}
+This is a file with no metadata.
+\end{verbatim}
+
 \input{mmd6-article-footer}
 \end{document}

diff --git a/tests/MMD6Tests/Transclusion.text b/tests/MMD6Tests/Transclusion.text
index de0c04727bf772c0df7828fc07d2f7721d9df130..8b668bcbe8a362c2108787dacf09eed07b69ca85 100644 (file)
--- a/tests/MMD6Tests/Transclusion.text
+++ b/tests/MMD6Tests/Transclusion.text
@@ -6,3 +6,5 @@ latex config:   article
 {{bar.txt}}
 
 {{transclusion/bat.*}}
+
+{{transclusion/baz.txt}}
\ No newline at end of file

diff --git a/tests/MMD6Tests/Variables.fodt b/tests/MMD6Tests/Variables.fodt
index 3c97c45417ded4ff9e017eb23e598411b751cdd1..5f484faf6f6b02309eff03cc93283d513c1a1386 100644 (file)
--- a/tests/MMD6Tests/Variables.fodt
+++ b/tests/MMD6Tests/Variables.fodt
@@ -285,6 +285,8 @@
 <text:p text:style-name="Standard">[%bar]</text:p>
 
 <text:p text:style-name="Standard">**foo**</text:p>
+
+<text:p text:style-name="Standard">article</text:p>
 </office:text>
 </office:body>
 </office:document>

diff --git a/tests/MMD6Tests/Variables.html b/tests/MMD6Tests/Variables.html
index 18111917c04bb08a4d45beb599cb0d05abbb1902..f9720f0ebeafbfe79dc4f04d205156da6f6a750c 100644 (file)
--- a/tests/MMD6Tests/Variables.html
+++ b/tests/MMD6Tests/Variables.html
@@ -16,6 +16,8 @@
 
 <p>**foo**</p>
 
+<p>article</p>
+
 </body>
 </html>
 

diff --git a/tests/MMD6Tests/Variables.htmlc b/tests/MMD6Tests/Variables.htmlc
index 7c8be51ac670bf7418fd2f598bd4064e6a59db83..9a7e30ed584b9d35c41cec9c3384fd558999a002 100644 (file)
--- a/tests/MMD6Tests/Variables.htmlc
+++ b/tests/MMD6Tests/Variables.htmlc
@@ -12,3 +12,5 @@ bat:  <strong>foo</strong></p>
 <p>[%bar]</p>
 
 <p>[%bat]</p>
+
+<p>[%latex config]</p>

diff --git a/tests/MMD6Tests/Variables.tex b/tests/MMD6Tests/Variables.tex
index c4080bf2a888f8281d83354525e8ad1cdd54428d..fcf31390fad5fdbc39abb3ba93e5885a3c9f88ad 100644 (file)
--- a/tests/MMD6Tests/Variables.tex
+++ b/tests/MMD6Tests/Variables.tex
@@ -12,5 +12,7 @@ bar foo bar foo bar
 
 **foo**
 
+article
+
 \input{mmd6-article-footer}
 \end{document}

diff --git a/tests/MMD6Tests/Variables.text b/tests/MMD6Tests/Variables.text
index eae7b0f11f6075a37419b12406718147cf7582a8..de411af0cce073e985e589c6906572ed33bb9c35 100644 (file)
--- a/tests/MMD6Tests/Variables.text
+++ b/tests/MMD6Tests/Variables.text
@@ -12,3 +12,5 @@ foo:  bar
 [%bar]
 
 [%bat]
+
+[%latex config]

diff --git a/tests/MMD6Tests/transclusion/baz.txt b/tests/MMD6Tests/transclusion/baz.txt
new file mode 100644 (file)
index 0000000..dda0612
--- /dev/null
+++ b/tests/MMD6Tests/transclusion/baz.txt
@@ -0,0 +1,7 @@
+Title:  bar
+
+This text is included in `transclusion/baz.txt`.
+
+This should pull in `bar.txt`, *if* run from the parent directory.
+
+{{bar.txt}}