From ada0e4d254299ae1e9d5c5beb2cccd49b9848fd5 Mon Sep 17 00:00:00 2001
From: Kevin Neufeld <kneufeld.ca@gmail.com>
Date: Fri, 1 Aug 2008 15:12:20 +0000
Subject: [PATCH] Reverted html markup for mathematical expressions in
 ST_Touches and ST_Crosses to a gif image.  It seems unicode markup does not
 work well for both IE and Firefox.  The next best thing to do is to get
 MathML markup working.

git-svn-id: http://svn.osgeo.org/postgis/trunk@2906 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/html/images/st_crosses-math.gif | Bin 0 -> 1923 bytes
 doc/html/images/st_touches-math.gif | Bin 0 -> 769 bytes
 doc/reference_new.xml               |  27 ++++++++++++++++++++-------
 3 files changed, 20 insertions(+), 7 deletions(-)
 create mode 100644 doc/html/images/st_crosses-math.gif
 create mode 100644 doc/html/images/st_touches-math.gif

diff --git a/doc/html/images/st_crosses-math.gif b/doc/html/images/st_crosses-math.gif
new file mode 100644
index 0000000000000000000000000000000000000000..306d119c9afe600b4ad9e04f8ba096cb4269c193
GIT binary patch
literal 1923
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
J7XuLh06S?yRXG3v

literal 0
HcmV?d00001

diff --git a/doc/html/images/st_touches-math.gif b/doc/html/images/st_touches-math.gif
new file mode 100644
index 0000000000000000000000000000000000000000..d22a581210d50e52a62a071198b18a36b065b650
GIT binary patch
literal 769
zcmV+c1OEI+Nk%w1VFdva0HOc@|NsBY%*>gYnPz5YGcz*)0000000000A^8LV00000
zEC2ui00jXO000C32)f+<Fv>}*y*TU5yZ>M)j$~<`XsWJk>%MR!4BHUUi$Ds&gEP90
z?FR^YW`%)HV61%tJfH@tEcP;mY%;qE5U!X(vKat>2DYpb?I=?MYKFMFaC2_gTcK<Y
z6E^~T40aWG3VMBoJu?7M9D;rTHVuCqYybsol?s~<beuGka(84iWla~C9&ingg{7hx
zSDA-h1sMVajkgWF4~dCIy1Q4o5x$MNNnnt|yAH?~H$aPJ!x+YI%CR|rUJ^LdIn@y}
z17B^;MQA-@3QX^4G^Up~=kaWCJzjGQ>N%(YT&qK?2rqs3&|xYj%F8}q2>B)PXU3j9
zRSRN?;=v040=GkgELJjgNMS}akUILfqOn*oNlT)=LpI4_HbFIM5MUCh5si+#blj7K
zBcx2C7v&N7)00z>p;el8j4~+H52!^SZWty`fi9JlK4tuxRYsq#3TR1121iR4orj1F
ztm@Q<5k>}KKEn&rsz4s1R276IsA-*#a?A*xr9&K@o~|fiGBSA9qG%%JInV`f+`0!*
z=1!KRbx=S_gSZako0tLTCR8^!{+E{7QyPLMszbO3PHa%MpEVkW(Psoh6hS86Nenn*
zJk5-j1g>EjkRZ%uJnhpv=%43A=+McY)-4xI+&VwVgs2f1u;{+&%f+K$89MAkE_&8c
zyk!T*fh2WKK@31r4=?PA@!uvqWFwq^!DV1i9&{jd9YBNJ!isN-fo4WX;r#QPPYsC$
zV17Mh7YKnC`GZ?y1XyR(Wi=%s%0coJbD9-qJ%COi3I&B?5sjUuL>A1%#m+lBN-&Kc
zJAq+hWX2W9$rlsVVPsgJOo_^qVni8(2%VtS!HAqdV5S9ScCw0_;GnSPm@yDCN(gq=
z5e%G8?rFlDiu}nZoh<~^Bp?tNdIW$c97=(sh!QI4q?A@_>7|%vs_CW{Bme+A%>O?#

literal 0
HcmV?d00001

diff --git a/doc/reference_new.xml b/doc/reference_new.xml
index 420685b14..11094c14a 100644
--- a/doc/reference_new.xml
+++ b/doc/reference_new.xml
@@ -2898,10 +2898,16 @@ st_area
 
       <para>In mathematical terms, this is expressed as:</para>
 
-      <para>
-        <equation>a.Crosses(b) &hArr; (dim(I(a) &cap; I(b)) &lt; max(dim(I(a)),dim(I(b))) 
-        &and; (a &cup; b &ne; a) &and; (a &cup; b &ne; b)</equation>
-      </para>
+      <remark>TODO: Insert appropriate MathML markup here or use a gif.  
+      Simple HTML markup does not work well in both IE and Firefox.</remark>
+      
+      <informalfigure>
+        <mediaobject>
+          <imageobject>
+            <imagedata fileref="images/st_crosses-math.gif" />
+          </imageobject>
+        </mediaobject>
+      </informalfigure>
       
       <para>The DE-9IM Intersection Matrix for the two geometries is:</para>
 
@@ -3706,9 +3712,16 @@ SELECT ST_AsText(ST_PointOnSurface('POLYGON((0 0, 0 5, 5 5, 5 0, 0 0))'::geometr
 
         <para>In mathematical terms, this predicate is expressed as:</para>
         
-        <para>
-          <equation>a.Touches(b) &hArr; (I(a) &cap; I(b) = &empty;) &and; (a &cap; b &ne; &empty;)</equation>
-        </para>
+        <remark>TODO: Insert appropriate MathML markup here or use a gif.  
+        Simple HTML markup does not work well in both IE and Firefox.</remark>
+      
+        <informalfigure>
+          <mediaobject>
+            <imageobject>
+              <imagedata fileref="images/st_touches-math.gif" />
+            </imageobject>
+          </mediaobject>
+        </informalfigure>
         
         <para>The allowable DE-9IM Intersection Matrices for the two geometries are:</para>
         
-- 
2.50.1