Modified writer tests for new Math and TeX output.

git-svn-id: https://pandoc.googlecode.com/svn/trunk@1119 788f1e2b-df1e-0410-8736-df70ead52e1b

6 files changed, 36 insertions, 65 deletions

diff --git a/tests/writer.docbook b/tests/writer.docbook
index 6235838ed..fe44e437b 100644
--- a/tests/writer.docbook
+++ b/tests/writer.docbook
@@ -883,48 +883,46 @@ These should not be escaped:  \$ \\ \> \[ \{
     <itemizedlist>
       <listitem>
         <para>
-          <literal>\cite[22-23]{smith.1899}</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>\doublespacing</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>$2+2=4$</literal>
+          <literal>2+2=4</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>$x \in y$</literal>
+          <literal>x \in y</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>$\alpha \wedge \omega$</literal>
+          <literal>\alpha \wedge \omega</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>$223$</literal>
+          <literal>223</literal>
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>$p$</literal>-Tree
+          <literal>p</literal>-Tree
         </para>
       </listitem>
       <listitem>
         <para>
-          <literal>$\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}$</literal>
+          <literal>\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</literal>
         </para>
       </listitem>
       <listitem>
         <para>
           Here's one that has a line break in it:
-          <literal>$\alpha + \omega \times x^2$</literal>.
+          <literal>\alpha + \omega \times x^2</literal>.
         </para>
       </listitem>
     </itemizedlist>
@@ -954,11 +952,6 @@ These should not be escaped:  \$ \\ \&gt; \[ \{
       Here's a LaTeX table:
     </para>
     <para>
-      <literal>\begin{tabular}{|l|l|}\hline
-Animal &amp; Number \\ \hline
-Dog    &amp; 2      \\
-Cat    &amp; 1      \\ \hline
-\end{tabular}</literal>
     </para>
   </section>
   <section>
diff --git a/tests/writer.html b/tests/writer.html
index c461522d5..a7a40df91 100644
--- a/tests/writer.html
+++ b/tests/writer.html
@@ -758,9 +758,9 @@ Blah
     >LaTeX</h1
     ><ul
     ><li
-      >\cite[22-23]{smith.1899}</li
+      ></li
       ><li
-      >\doublespacing</li
+      ></li
       ><li
       >$2+2=4$</li
       ><li
@@ -797,11 +797,7 @@ Blah
     ><p
     >Here&rsquo;s a LaTeX table:</p
     ><p
-    >\begin{tabular}{|l|l|}\hline
-Animal &amp; Number \\ \hline
-Dog    &amp; 2      \\
-Cat    &amp; 1      \\ \hline
-\end{tabular}</p
+    ></p
     ><hr
      /><h1 id="special-characters"
     >Special Characters</h1
diff --git a/tests/writer.man b/tests/writer.man
index da98d2980..4a74f0800 100644
--- a/tests/writer.man
+++ b/tests/writer.man
@@ -574,24 +574,22 @@ Ellipses\&...and\&...and\&...\.
    *   *   *   *   *
 .SH LaTeX
 .IP \[bu] 2
-\\cite[22-23]{smith\.1899}
 .IP \[bu] 2
-\\doublespacing
 .IP \[bu] 2
-$2+2=4$
+2+2=4
 .IP \[bu] 2
-$x\ \\in\ y$
+x\ \\in\ y
 .IP \[bu] 2
-$\\alpha\ \\wedge\ \\omega$
+\\alpha\ \\wedge\ \\omega
 .IP \[bu] 2
-$223$
+223
 .IP \[bu] 2
-$p$-Tree
+p-Tree
 .IP \[bu] 2
-$\\frac{d}{dx}f(x)=\\lim_{h\\to\ 0}\\frac{f(x+h)-f(x)}{h}$
+\\frac{d}{dx}f(x)=\\lim_{h\\to\ 0}\\frac{f(x+h)-f(x)}{h}
 .IP \[bu] 2
 Here's one that has a line break in it:
-$\\alpha\ +\ \\omega\ \\times\ x^2$\.
+\\alpha\ +\ \\omega\ \\times\ x^2\.
 .PP
 These shouldn't be math:
 .IP \[bu] 2
@@ -604,11 +602,6 @@ Escaped \f[B]$\f[]: $73 \f[I]this should be emphasized\f[] 23$\.
 .PP
 Here's a LaTeX table:
 .PP
-\\begin{tabular}{|l|l|}\\hline
-Animal\ &\ Number\ \\\\\ \\hline
-Dog\ \ \ \ &\ 2\ \ \ \ \ \ \\\\
-Cat\ \ \ \ &\ 1\ \ \ \ \ \ \\\\\ \\hline
-\\end{tabular}
 .PP
    *   *   *   *   *
 .SH Special Characters
diff --git a/tests/writer.native b/tests/writer.native
index 3566c3ebf..da7929861 100644
--- a/tests/writer.native
+++ b/tests/writer.native
@@ -297,13 +297,13 @@ Pandoc (Meta [Str "Pandoc",Space,Str "Test",Space,Str "Suite"] ["John MacFarlane
 , BulletList
   [ [ Plain [TeX "\\cite[22-23]{smith.1899}"] ]
   , [ Plain [TeX "\\doublespacing"] ]
-  , [ Plain [TeX "$2+2=4$"] ]
-  , [ Plain [TeX "$x \\in y$"] ]
-  , [ Plain [TeX "$\\alpha \\wedge \\omega$"] ]
-  , [ Plain [TeX "$223$"] ]
-  , [ Plain [TeX "$p$",Str "-",Str "Tree"] ]
-  , [ Plain [TeX "$\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}$"] ]
-  , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,TeX "$\\alpha + \\omega \\times x^2$",Str "."] ] ]
+  , [ Plain [Math "2+2=4"] ]
+  , [ Plain [Math "x \\in y"] ]
+  , [ Plain [Math "\\alpha \\wedge \\omega"] ]
+  , [ Plain [Math "223"] ]
+  , [ Plain [Math "p",Str "-",Str "Tree"] ]
+  , [ Plain [Math "\\frac{d}{dx}f(x)=\\lim_{h\\to 0}\\frac{f(x+h)-f(x)}{h}"] ]
+  , [ Plain [Str "Here",Apostrophe,Str "s",Space,Str "one",Space,Str "that",Space,Str "has",Space,Str "a",Space,Str "line",Space,Str "break",Space,Str "in",Space,Str "it:",Space,Math "\\alpha + \\omega \\times x^2",Str "."] ] ]
 , Para [Str "These",Space,Str "shouldn",Apostrophe,Str "t",Space,Str "be",Space,Str "math:"]
 , BulletList
   [ [ Plain [Str "To",Space,Str "get",Space,Str "the",Space,Str "famous",Space,Str "equation,",Space,Str "write",Space,Code "$e = mc^2$",Str "."] ]
diff --git a/tests/writer.rst b/tests/writer.rst
index 78ebd3ebf..e0815de8b 100644
--- a/tests/writer.rst
+++ b/tests/writer.rst
@@ -642,8 +642,8 @@ LaTeX
 =====
 
 
--  \cite[22-23]{smith.1899}
--  \doublespacing
+- 
+- 
 -  $2+2=4$
 -  $x \in y$
 -  $\alpha \wedge \omega$
@@ -664,14 +664,7 @@ These shouldn't be math:
 Here's a LaTeX table:
 
 
-.. raw:: latex
 
-   \begin{tabular}{|l|l|}\hline
-   Animal & Number \\ \hline
-   Dog    & 2      \\
-   Cat    & 1      \\ \hline
-   \end{tabular}
-   
 --------------
 
 Special Characters
diff --git a/tests/writer.rtf b/tests/writer.rtf
index ea815ef17..c3f0fac3f 100644
--- a/tests/writer.rtf
+++ b/tests/writer.rtf
@@ -250,25 +250,21 @@ quoted link
 {\pard \ql \f0 \sa180 \li0 \fi0 Ellipses\u8230?and\u8230?and\u8230?.\par}
 {\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par}
 {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 LaTeX\par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 \\cite[22-23]\{smith.1899\}\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 \\doublespacing\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $2+2=4$\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $x \\in y$\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $\\alpha \\wedge \\omega$\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $223$\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $p$\cf0 } -Tree\par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 $\\frac\{d\}\{dx\}f(x)=\\lim_\{h\\to 0\}\\frac\{f(x+h)-f(x)\}\{h\}$\cf0 } \par}
-{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: {\cf1 $\\alpha + \\omega \\times x^2$\cf0 } .\sa180\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 2+2=4\cf0 } \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 x \\in y\cf0 } \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 \\alpha \\wedge \\omega\cf0 } \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 223\cf0 } \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 p\cf0 } -Tree\par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\cf1 \\frac\{d\}\{dx\}f(x)=\\lim_\{h\\to 0\}\\frac\{f(x+h)-f(x)\}\{h\}\cf0 } \par}
+{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: {\cf1 \\alpha + \\omega \\times x^2\cf0 } .\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}
 {\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Escaped {\f1 $} : $73 {\i this should be emphasized}  23$.\sa180\par}
 {\pard \ql \f0 \sa180 \li0 \fi0 Here\u8217's a LaTeX table:\par}
-{\pard \ql \f0 \sa180 \li0 \fi0 {\cf1 \\begin\{tabular\}\{|l|l|\}\\hline
-Animal & Number \\\\ \\hline
-Dog    & 2      \\\\
-Cat    & 1      \\\\ \\hline
-\\end\{tabular\}\cf0 } \par}
+{\pard \ql \f0 \sa180 \li0 \fi0 \par}
 {\pard \qc \f0 \sa180 \li0 \fi0 \emdash\emdash\emdash\emdash\emdash\par}
 {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 Special Characters\par}
 {\pard \ql \f0 \sa180 \li0 \fi0 Here is some unicode:\par}