From: Kevin Neufeld <kneufeld.ca@gmail.com>
Date: Fri, 1 Aug 2008 15:12:20 +0000 (+0000)
Subject: Reverted html markup for mathematical expressions in ST_Touches and ST_Crosses to... 
X-Git-Tag: 1.4.0b1~795
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ada0e4d254299ae1e9d5c5beb2cccd49b9848fd5;p=postgis

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
---

diff --git a/doc/html/images/st_crosses-math.gif b/doc/html/images/st_crosses-math.gif
new file mode 100644
index 000000000..306d119c9
Binary files /dev/null and b/doc/html/images/st_crosses-math.gif differ
diff --git a/doc/html/images/st_touches-math.gif b/doc/html/images/st_touches-math.gif
new file mode 100644
index 000000000..d22a58121
Binary files /dev/null and b/doc/html/images/st_touches-math.gif differ
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>