Updated writer tests for new version of texmath.

5 files changed, 25 insertions, 20 deletions

diff --git a/tests/writer.docbook b/tests/writer.docbook
index 780775d0f..d2b28a28a 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook
@@ -1077,7 +1077,7 @@ These should not be escaped:  \$ \\ \> \[ \{
     </listitem>
     <listitem>
       <para>
-        α ∧ ω
+        <emphasis>α</emphasis> ∧ <emphasis>ω</emphasis>
       </para>
     </listitem>
     <listitem>
@@ -1099,7 +1099,7 @@ These should not be escaped:  \$ \\ \&gt; \[ \{
     <listitem>
       <para>
         Here's one that has a line break in it:
-        α + ω × <emphasis>x</emphasis><superscript>2</superscript>.
+        <emphasis>α</emphasis> + <emphasis>ω</emphasis> × <emphasis>x</emphasis><superscript>2</superscript>.
       </para>
     </listitem>
   </itemizedlist>
diff --git a/tests/writer.html b/tests/writer.html
index 58cb69129..84b1f12d4 100644
--- a/tests/writer.html
+++ b/tests/writer.html
@@ -444,11 +444,11 @@ Blah
 <li></li>
 <li><span class="math">2 + 2 = 4</span></li>
 <li><span class="math"><em>x</em> ∈ <em>y</em></span></li>
-<li><span class="math">α ∧ ω</span></li>
+<li><span class="math"><em>α</em> ∧ <em>ω</em></span></li>
 <li><span class="math">223</span></li>
 <li><span class="math"><em>p</em></span>-Tree</li>
 <li>Here’s some display math: <br /><span class="math">$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</span><br /></li>
-<li>Here’s one that has a line break in it: <span class="math">α + ω × <em>x</em><sup>2</sup></span>.</li>
+<li>Here’s one that has a line break in it: <span class="math"><em>α</em> + <em>ω</em> × <em>x</em><sup>2</sup></span>.</li>
 </ul>
 <p>These shouldn’t be math:</p>
 <ul>
diff --git a/tests/writer.man b/tests/writer.man
index bdbb91604..28bc0feb5 100644
--- a/tests/writer.man
+++ b/tests/writer.man
@@ -564,7 +564,7 @@ Ellipses\&...and\&...and\&....
 .IP \[bu] 2
 \f[I]x\f[] ∈ \f[I]y\f[]
 .IP \[bu] 2
-α ∧ ω
+\f[I]α\f[] ∧ \f[I]ω\f[]
 .IP \[bu] 2
 223
 .IP \[bu] 2
@@ -575,7 +575,8 @@ Here's some display math:
 $\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$
 .RE
 .IP \[bu] 2
-Here's one that has a line break in it: α + ω × \f[I]x\f[]^2^.
+Here's one that has a line break in it:
+\f[I]α\f[] + \f[I]ω\f[] × \f[I]x\f[]^2^.
 .PP
 These shouldn't be math:
 .IP \[bu] 2
diff --git a/tests/writer.opendocument b/tests/writer.opendocument
index 22ff86167..4e02db650 100644
--- a/tests/writer.opendocument
+++ b/tests/writer.opendocument
@@ -689,17 +689,21 @@
     <style:style style:name="T59" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T60" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T61" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
-    <style:style style:name="T62" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
+    <style:style style:name="T62" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T63" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T64" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T65" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
-    <style:style style:name="T66" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
+    <style:style style:name="T66" style:family="text"><style:text-properties style:text-position="super 58%" /></style:style>
     <style:style style:name="T67" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T68" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T69" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T70" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T71" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="T72" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
+    <style:style style:name="T73" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
+    <style:style style:name="T74" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
+    <style:style style:name="T75" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
+    <style:style style:name="T76" style:family="text"><style:text-properties fo:font-style="italic" style:font-style-asian="italic" style:font-style-complex="italic" /></style:style>
     <style:style style:name="P1" style:family="paragraph" style:parent-style-name="Quotations">
       <style:paragraph-properties fo:margin-left="0.5in" fo:margin-right="0in" fo:text-indent="0in" style:auto-text-indent="false" />
     </style:style>
@@ -1400,13 +1404,13 @@ three&#8212;four &#8212; five.</text:p>
     <text:p text:style-name="P51"><text:span text:style-name="T58">x</text:span> ∈ <text:span text:style-name="T59">y</text:span></text:p>
   </text:list-item>
   <text:list-item>
-    <text:p text:style-name="P51">α ∧ ω</text:p>
+    <text:p text:style-name="P51"><text:span text:style-name="T60">α</text:span> ∧ <text:span text:style-name="T61">ω</text:span></text:p>
   </text:list-item>
   <text:list-item>
     <text:p text:style-name="P51">223</text:p>
   </text:list-item>
   <text:list-item>
-    <text:p text:style-name="P51"><text:span text:style-name="T60">p</text:span>-Tree</text:p>
+    <text:p text:style-name="P51"><text:span text:style-name="T62">p</text:span>-Tree</text:p>
   </text:list-item>
   <text:list-item>
     <text:p text:style-name="P51">Here&#8217;s some display math:
@@ -1415,7 +1419,7 @@ three&#8212;four &#8212; five.</text:p>
   <text:list-item>
     <text:p text:style-name="P51">Here&#8217;s one that has a line break in
     it:
-    α + ω × <text:span text:style-name="T61">x</text:span><text:span text:style-name="T62">2</text:span>.</text:p>
+    <text:span text:style-name="T63">α</text:span> + <text:span text:style-name="T64">ω</text:span> × <text:span text:style-name="T65">x</text:span><text:span text:style-name="T66">2</text:span>.</text:p>
   </text:list-item>
 </text:list>
 <text:p text:style-name="First_20_paragraph">These shouldn&#8217;t be
@@ -1427,7 +1431,7 @@ math:</text:p>
   </text:list-item>
   <text:list-item>
     <text:p text:style-name="P52">$22,000 is a
-    <text:span text:style-name="T63">lot</text:span> of money. So is $34,000.
+    <text:span text:style-name="T67">lot</text:span> of money. So is $34,000.
     (It worked if &#8220;lot&#8221; is emphasized.)</text:p>
   </text:list-item>
   <text:list-item>
@@ -1436,10 +1440,10 @@ math:</text:p>
   <text:list-item>
     <text:p text:style-name="P52">Escaped
     <text:span text:style-name="Teletype">$</text:span>: $73
-    <text:span text:style-name="T64">this</text:span><text:span text:style-name="T65">
-    </text:span><text:span text:style-name="T66">should</text:span><text:span text:style-name="T67">
-    </text:span><text:span text:style-name="T68">be</text:span><text:span text:style-name="T69">
-    </text:span><text:span text:style-name="T70">emphasized</text:span>
+    <text:span text:style-name="T68">this</text:span><text:span text:style-name="T69">
+    </text:span><text:span text:style-name="T70">should</text:span><text:span text:style-name="T71">
+    </text:span><text:span text:style-name="T72">be</text:span><text:span text:style-name="T73">
+    </text:span><text:span text:style-name="T74">emphasized</text:span>
     23$.</text:p>
   </text:list-item>
 </text:list>
@@ -1589,10 +1593,10 @@ indented to show that they belong to the footnote (as with list
 items).</text:p><text:p text:style-name="P58"><text:s text:c="2" />{ &lt;code&gt; }</text:p><text:p text:style-name="Footnote">If
 you want, you can indent every line, but you can also be lazy and just indent
 the first line of each block.</text:p></text:note-body></text:note> This
-should <text:span text:style-name="T71">not</text:span> be a footnote
+should <text:span text:style-name="T75">not</text:span> be a footnote
 reference, because it contains a space.[^my note] Here is an inline
 note.<text:note text:id="ftn2" text:note-class="footnote"><text:note-citation>3</text:note-citation><text:note-body><text:p text:style-name="Footnote">This
-is <text:span text:style-name="T72">easier</text:span> to type. Inline notes
+is <text:span text:style-name="T76">easier</text:span> to type. Inline notes
 may contain
 <text:a xlink:type="simple" xlink:href="http://google.com" office:name=""><text:span text:style-name="Definition">links</text:span></text:a>
 and <text:span text:style-name="Teletype">]</text:span> verbatim characters,
diff --git a/tests/writer.rtf b/tests/writer.rtf
index 6bca9387f..648b4966d 100644
--- a/tests/writer.rtf
+++ b/tests/writer.rtf
@@ -266,11 +266,11 @@ quoted link
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 2\u8197?+\u8197?2\u8196?=\u8196?4\par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i x}\u8196?\u8712?\u8196?{\i y}\par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \u945?\u8197?\u8743?\u8197?\u969?\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i \u945?}\u8197?\u8743?\u8197?{\i \u969?}\par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab 223\par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i p}-Tree\par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's some display math: $\\frac\{d\}\{dx\}f(x)=\\lim_\{h\\to 0\}\\frac\{f(x+h)-f(x)\}\{h\}$\par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: \u945?\u8197?+\u8197?\u969?\u8197?\u215?\u8197?{\i x}{\super 2}.\sa180\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: {\i \u945?}\u8197?+\u8197?{\i \u969?}\u8197?\u215?\u8197?{\i x}{\super 2}.\sa180\par}
 {\pard \ql \f0 \sa180 \li0 \fi0 These shouldn\u8217't be math:\par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab To get the famous equation, write {\f1 $e = mc^2$}.\par}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab $22,000 is a {\i lot} of money. So is $34,000. (It worked if \u8220"lot\u8221" is emphasized.)\par}