[doc] Slightly modified faq.xsl to avoid libxslt bug 377440, and

moved the addition of special CSS comments for XML compatibility
from update-faq to faq.xsl file. Removed the now useless
s/GMP_RND/MPFR_RND/ rewriting in update-faq.
(merged changesets r8458,8460 from the trunk)

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/3.1@8463 280ebfd0-de03-0410-8827-d642c229c3f4

2 files changed, 4 insertions, 10 deletions

diff --git a/doc/faq.xsl b/doc/faq.xsl
index a9ea41511..6a724e455 100644
--- a/doc/faq.xsl
+++ b/doc/faq.xsl
@@ -17,7 +17,7 @@ wget -q -O - http://www.mpfr.org/faq.html | \
 <xsl:stylesheet version="1.0"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:h="http://www.w3.org/1999/xhtml"
-                exclude-result-prefixes="h">
+                xmlns="http://www.w3.org/1999/xhtml">
 
 <xsl:output method="xml"
             encoding="iso-8859-1"
@@ -67,8 +67,7 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
     <xsl:text>&#10;</xsl:text>
     <xsl:copy-of select="h:title"/>
     <xsl:text>&#10;</xsl:text>
-    <h:style type="text/css"><xsl:text disable-output-escaping="yes">
-&styles;</xsl:text></h:style>
+    <style type="text/css"><xsl:text disable-output-escaping="yes">/*&lt;![CDATA[*/&#10;&styles;/*]]&gt;*/</xsl:text></style>
     <xsl:text>&#10;</xsl:text>
   </xsl:copy>
 </xsl:template>
diff --git a/doc/update-faq b/doc/update-faq
index 65ab13c59..985357506 100755
--- a/doc/update-faq
+++ b/doc/update-faq
@@ -1,9 +1,4 @@
 #!/bin/sh
 
-# Contains a workaround for the libxslt bug 377440
-#   http://bugzilla.gnome.org/show_bug.cgi?id=377440
-
-wget -q -O - http://www.mpfr.org/faq.html | xsltproc --nodtdattr faq.xsl - | \
-  perl -pe 's,(<(h:)?style.*),<style type="text/css">/*<![CDATA[*/,;
-            s,(</(h:)?style>),/*]]>*/</style>,;
-            s,GMP_RND,MPFR_RND,g;' > FAQ.html
+wget -q -O - http://www.mpfr.org/faq.html | \
+  xsltproc --nodtdattr faq.xsl - > FAQ.html