diff options
| author | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2007-12-02 00:36:32 +0000 |
|---|---|---|
| committer | fiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b> | 2007-12-02 00:36:32 +0000 |
| commit | d1832da9e104d61aa6ee0161aefeabf4aef9bbd2 (patch) | |
| tree | 2971739743b16e10d1333b5a6ad9f7b4bf12f4c3 /tests | |
| parent | 8e872f9f7d89dcc1f16309afd7a50945f2c154ee (diff) | |
| download | pandoc-d1832da9e104d61aa6ee0161aefeabf4aef9bbd2.tar.gz | |
Added Text.Pandoc.Readers.TeXMath and changed default handling of math.
+ Text.Pandoc.Readers.TeXMath exports readTeXMath, which reads raw TeX
math and outputs a string of pandoc inlines that tries to render it
as far as possible, lapsing into literal TeX when needed.
+ Added Text.Pandoc.Readers.TeXMath to pandoc.cabal + ghc66 version.
+ Modified writers so that readTeXMath is used for default HTMl output
in HTML, S5, RTF, Docbook.
+ Updated README with information about how math is rendered in all formats.
+ Updated test suite.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1129 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/s5.basic.html | 28 | ||||
| -rw-r--r-- | tests/s5.fragment.html | 28 | ||||
| -rw-r--r-- | tests/s5.inserts.html | 28 | ||||
| -rw-r--r-- | tests/writer.docbook | 14 | ||||
| -rw-r--r-- | tests/writer.html | 58 | ||||
| -rw-r--r-- | tests/writer.man | 14 | ||||
| -rw-r--r-- | tests/writer.rtf | 14 |
7 files changed, 153 insertions, 31 deletions
diff --git a/tests/s5.basic.html b/tests/s5.basic.html index d5c670a0a..611818f7f 100644 --- a/tests/s5.basic.html +++ b/tests/s5.basic.html @@ -780,7 +780,33 @@ window.onresize = function(){setTimeout('fontScale()', 50);}</script> >Math</h1 ><ul ><li - >\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</li + >\frac{<em + >d</em + >}{<em + >dx</em + >}<em + >f</em + >(<em + >x</em + >)=\lim<sub + ><em + >h</em + > → <em + >0</em + ></sub + >\frac{<em + >f</em + >(<em + >x</em + >+<em + >h</em + >)-<em + >f</em + >(<em + >x</em + >)}{<em + >h</em + >}</li ></ul ></div> </div> diff --git a/tests/s5.fragment.html b/tests/s5.fragment.html index b82aa290b..00166ea12 100644 --- a/tests/s5.fragment.html +++ b/tests/s5.fragment.html @@ -10,6 +10,32 @@ >Math</h1 ><ul ><li - >\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</li + >\frac{<em + >d</em + >}{<em + >dx</em + >}<em + >f</em + >(<em + >x</em + >)=\lim<sub + ><em + >h</em + > → <em + >0</em + ></sub + >\frac{<em + >f</em + >(<em + >x</em + >+<em + >h</em + >)-<em + >f</em + >(<em + >x</em + >)}{<em + >h</em + >}</li ></ul > diff --git a/tests/s5.inserts.html b/tests/s5.inserts.html index 33cd4ffe1..9575c44f4 100644 --- a/tests/s5.inserts.html +++ b/tests/s5.inserts.html @@ -27,7 +27,33 @@ STUFF INSERTED >Math</h1 ><ul ><li - >\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</li + >\frac{<em + >d</em + >}{<em + >dx</em + >}<em + >f</em + >(<em + >x</em + >)=\lim<sub + ><em + >h</em + > → <em + >0</em + ></sub + >\frac{<em + >f</em + >(<em + >x</em + >+<em + >h</em + >)-<em + >f</em + >(<em + >x</em + >)}{<em + >h</em + >}</li ></ul >STUFF INSERTED </body diff --git a/tests/writer.docbook b/tests/writer.docbook index fe44e437b..870898e50 100644 --- a/tests/writer.docbook +++ b/tests/writer.docbook @@ -891,38 +891,38 @@ These should not be escaped: \$ \\ \> \[ \{ </listitem> <listitem> <para> - <literal>2+2=4</literal> + <emphasis>2</emphasis>+<emphasis>2</emphasis>=<emphasis>4</emphasis> </para> </listitem> <listitem> <para> - <literal>x \in y</literal> + <emphasis>x</emphasis> ∈ <emphasis>y</emphasis> </para> </listitem> <listitem> <para> - <literal>\alpha \wedge \omega</literal> + α ∧ ω </para> </listitem> <listitem> <para> - <literal>223</literal> + <emphasis>223</emphasis> </para> </listitem> <listitem> <para> - <literal>p</literal>-Tree + <emphasis>p</emphasis>-Tree </para> </listitem> <listitem> <para> - <literal>\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</literal> + \frac{<emphasis>d</emphasis>}{<emphasis>dx</emphasis>}<emphasis>f</emphasis>(<emphasis>x</emphasis>)=\lim<subscript><emphasis>h</emphasis> → <emphasis>0</emphasis></subscript>\frac{<emphasis>f</emphasis>(<emphasis>x</emphasis>+<emphasis>h</emphasis>)-<emphasis>f</emphasis>(<emphasis>x</emphasis>)}{<emphasis>h</emphasis>} </para> </listitem> <listitem> <para> Here's one that has a line break in it: - <literal>\alpha + \omega \times x^2</literal>. + α+ω × <emphasis>x</emphasis><superscript>2</superscript>. </para> </listitem> </itemizedlist> diff --git a/tests/writer.html b/tests/writer.html index 752d93690..b22dd36f8 100644 --- a/tests/writer.html +++ b/tests/writer.html @@ -762,19 +762,63 @@ Blah ><li ></li ><li - >2+2=4</li + ><em + >2</em + >+<em + >2</em + >=<em + >4</em + ></li ><li - >x \in y</li + ><em + >x</em + > ∈ <em + >y</em + ></li ><li - >\alpha \wedge \omega</li + >α ∧ ω</li ><li - >223</li + ><em + >223</em + ></li ><li - >p-Tree</li + ><em + >p</em + >-Tree</li ><li - >\frac{d}{dx}f(x)=\lim_{h\to 0}\frac{f(x+h)-f(x)}{h}</li + >\frac{<em + >d</em + >}{<em + >dx</em + >}<em + >f</em + >(<em + >x</em + >)=\lim<sub + ><em + >h</em + > → <em + >0</em + ></sub + >\frac{<em + >f</em + >(<em + >x</em + >+<em + >h</em + >)-<em + >f</em + >(<em + >x</em + >)}{<em + >h</em + >}</li ><li - >Here’s one that has a line break in it: \alpha + \omega \times x^2.</li + >Here’s one that has a line break in it: α+ω × <em + >x</em + ><sup + >2</sup + >.</li ></ul ><p >These shouldn’t be math:</p diff --git a/tests/writer.man b/tests/writer.man index 4a74f0800..13ae18927 100644 --- a/tests/writer.man +++ b/tests/writer.man @@ -576,20 +576,20 @@ Ellipses\&...and\&...and\&...\. .IP \[bu] 2 .IP \[bu] 2 .IP \[bu] 2 -2+2=4 +\f[B]2+2=4\f[] .IP \[bu] 2 -x\ \\in\ y +\f[B]x\ \\in\ y\f[] .IP \[bu] 2 -\\alpha\ \\wedge\ \\omega +\f[B]\\alpha\ \\wedge\ \\omega\f[] .IP \[bu] 2 -223 +\f[B]223\f[] .IP \[bu] 2 -p-Tree +\f[B]p\f[]-Tree .IP \[bu] 2 -\\frac{d}{dx}f(x)=\\lim_{h\\to\ 0}\\frac{f(x+h)-f(x)}{h} +\f[B]\\frac{d}{dx}f(x)=\\lim_{h\\to\ 0}\\frac{f(x+h)-f(x)}{h}\f[] .IP \[bu] 2 Here's one that has a line break in it: -\\alpha\ +\ \\omega\ \\times\ x^2\. +\f[B]\\alpha\ +\ \\omega\ \\times\ x^2\f[]\. .PP These shouldn't be math: .IP \[bu] 2 diff --git a/tests/writer.rtf b/tests/writer.rtf index c3f0fac3f..895902e8d 100644 --- a/tests/writer.rtf +++ b/tests/writer.rtf @@ -252,13 +252,13 @@ quoted link {\pard \ql \f0 \sa180 \li0 \fi0 \b \fs36 LaTeX\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 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i 2} +{\i 2} ={\i 4} \par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i x} \u8201?\u8712?\u8201?{\i y} \par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab \u945?\u8201?\u8743?\u8201?\u969?\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab {\i 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 \\frac\{{\i d} \}\{{\i dx} \}{\i f} ({\i x} )=\\lim{\sub {\i h} \u8201?\u8594?\u8201?{\i 0} } \\frac\{{\i f} ({\i x} +{\i h} )-{\i f} ({\i x} )\}\{{\i h} \}\par} +{\pard \ql \f0 \sa0 \li360 \fi-360 \bullet \tx360\tab Here\u8217's one that has a line break in it: \u945?+\u969?\u8201?\u215?\u8201?{\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} |