Remove MathML from documentation. It's not really being used for any math.

git-svn-id: http://svn.osgeo.org/postgis/trunk@10663 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 10c20696179c22509bf4aa95a0015a2e8512a208..aaf4d02bc0d57b5e804e9d764f1991868f9ec297 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -26,7 +26,6 @@ translations = it_IT pt_BR
 POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
 POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
 POSTGIS_MICRO_VERSION=@POSTGIS_MICRO_VERSION@
-MATHML2_DTD=@MATHML2_DTD@
 
 INSTALL=@INSTALL@
 INSTALL_DATA=@INSTALL_DATA@
@@ -186,8 +185,7 @@ tiger_geocoder_cheatsheet.html: ./xsl/tiger_geocoder_cheatsheet.html.xsl $(XML_I
        $(XSLTPROC) ./xsl/tiger_geocoder_cheatsheet.html.xsl postgis-out.xml > $@
 
 postgis-out.xml: postgis.xml Makefile
-       $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g" $< | \
-       $(PERL) -lpe "s'@@MATHML_PATH@@'${MATHML2_DTD}'g" > $@
+       $(PERL) -lpe "s'@@LAST_RELEASE_VERSION@@'${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}'g" $< > $@
 
 chunked-html: postgis-out.xml Makefile images $(XML_INPUTS)
        $(XSLTPROC) $(XSLTPROC_COMMONOPTS) $(XSLTPROC_HTMLOPTS) \

diff --git a/doc/postgis.xml b/doc/postgis.xml
index 5b9967850c49e86ed7d05caa69e16f414a4814b3..4ce38c8e3dc930cb796505083988f8d98e800d37 100644 (file)
--- a/doc/postgis.xml
+++ b/doc/postgis.xml
@@ -2,14 +2,6 @@
 <!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
                     "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
 
-<!-- Add MathML Support -->
-<!ENTITY % MATHML.prefixed "INCLUDE">
-<!ENTITY % MATHML.prefix "mml">
-<!ENTITY % equation.content "(alt?, (graphic+|mediaobject+|mml:math))">
-<!ENTITY % inlineequation.content "(alt?, (inlinegraphic+|inlinemediaobject+|mml:math))">
-<!ENTITY % mathml PUBLIC "-//W3C//DTD MathML 2.0//EN" "@@MATHML_PATH@@">
-%mathml;
-
 <!-- This value is automatically generated by the Makefile -->
 <!ENTITY last_release_version "@@LAST_RELEASE_VERSION@@">
 

diff --git a/doc/using_postgis_dataman.xml b/doc/using_postgis_dataman.xml
index 69b46575b67ec4ca85f6563bde87910ef58db464..ae7ca4255be302c23d682850fdd26b8481063d5d 100644 (file)
--- a/doc/using_postgis_dataman.xml
+++ b/doc/using_postgis_dataman.xml
@@ -1367,133 +1367,24 @@ gisdb=# SELECT
               <tbody>
                 <row>
                   <entry><emphasis role="bold">Interior</emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          I(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">I(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          I(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">B(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          I(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">E(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( I(a) ∩ I(b) )</inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( I(a) ∩ B(b) )</inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( I(a) ∩ E(b) )</inlineequation></emphasis></entry>
                 </row>
-
                 <row>
                   <entry><emphasis role="bold">Boundary</emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          B(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">I(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          B(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">B(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          B(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">E(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( B(a) ∩ I(b) )</inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( B(a) ∩ B(b) )</inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( B(a) ∩ E(b) )</inlineequation></emphasis></entry>
                 </row>
-
                 <row>
                   <entry><emphasis role="bold">Exterior</emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          E(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">I(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          E(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">B(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
-
-                  <entry><emphasis><inlineequation>
-                      <mml:math display="block">
-                        <mml:mrow>
-                          <mml:mtext mathvariant="italic">dim(
-                          E(a)</mml:mtext>
-
-                          <mml:mo>∩</mml:mo>
-
-                          <mml:mtext mathvariant="italic">E(b) )</mml:mtext>
-                        </mml:mrow>
-                      </mml:math>
-                    </inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( E(a) ∩ I(b) )</inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( E(a) ∩ B(b) )</inlineequation></emphasis></entry>
+                  <entry><emphasis><inlineequation>dim( E(a) ∩ E(b) )</inlineequation></emphasis></entry>
                 </row>
               </tbody>
+              
             </tgroup>
           </informaltable>