Reverted html markup for mathematical expressions in ST_Touches and ST_Crosses to...

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 (file)
index 0000000..306d119
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 (file)
index 0000000..d22a581
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 420685b148fe977c7300a57ea00b256320b5e8ed..11094c14af8b68133295ca52b17cca23cb658727 100644 (file)
--- 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>\r
+        <mediaobject>\r
+          <imageobject>\r
+            <imagedata fileref="images/st_crosses-math.gif" />\r
+          </imageobject>\r
+        </mediaobject>\r
+      </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>\r
+          <mediaobject>\r
+            <imageobject>\r
+              <imagedata fileref="images/st_touches-math.gif" />\r
+            </imageobject>\r
+          </mediaobject>\r
+        </informalfigure>
         
         <para>The allowable DE-9IM Intersection Matrices for the two geometries are:</para>