tex4ht-1.0.2009_04_18_1145

git-svn-id: svn://tug.org/texlive/trunk@12767 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 158 insertions, 15 deletions

diff --git a/Master/texmf-dist/tex4ht/xtpipes/docbook.4xt b/Master/texmf-dist/tex4ht/xtpipes/docbook.4xt
index 816e67013a5..59e0b426cc8 100644
--- a/Master/texmf-dist/tex4ht/xtpipes/docbook.4xt
+++ b/Master/texmf-dist/tex4ht/xtpipes/docbook.4xt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE xtpipes SYSTEM "xtpipes.dtd" >
-<xtpipes preamble="yes" signature="docbook.4xt (2008-08-25-15:33)">
+<xtpipes preamble="yes" signature="docbook.4xt (2008-11-14-02:41)">
    <sax content-handler="xtpipes.util.ScriptsManager"
         lexical-handler="xtpipes.util.ScriptsManagerLH" >
      <script element="ulink" >
@@ -8,6 +8,7 @@
       <![CDATA[
    <xsl:stylesheet version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:db="http://docbook.org/ns/docbook"
    >
       <xsl:output omit-xml-declaration = "yes" />
 
@@ -39,6 +40,7 @@
       <![CDATA[
    <xsl:stylesheet version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:db="http://docbook.org/ns/docbook"
    >
       <xsl:output omit-xml-declaration = "yes" />
 
@@ -64,6 +66,7 @@
       <![CDATA[
    <xsl:stylesheet version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:db="http://docbook.org/ns/docbook"
    >
       <xsl:output omit-xml-declaration = "yes" />
 
@@ -138,6 +141,10 @@
    <dom name="." xml="." method="cline" class="tex4ht.DbUtilities" />
 </script>
 
+     <script element="para" >
+   <dom name="." xml="." method="para" class="tex4ht.DbUtilities" />
+</script>
+
    </sax>
 </xtpipes>
 
diff --git a/Master/texmf-dist/tex4ht/xtpipes/oo-math.4xt b/Master/texmf-dist/tex4ht/xtpipes/oo-math.4xt
index 43020ceb494..814980e3e03 100644
--- a/Master/texmf-dist/tex4ht/xtpipes/oo-math.4xt
+++ b/Master/texmf-dist/tex4ht/xtpipes/oo-math.4xt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE xtpipes SYSTEM "xtpipes.dtd" >
-<xtpipes preamble="yes" signature="oo-math.4xt (2008-07-15-16:02)">
+<xtpipes preamble="yes" signature="oo-math.4xt (2009-03-11-03:09)">
    <sax content-handler="xtpipes.util.ScriptsManager,tex4ht.OomFilter"
         lexical-handler="xtpipes.util.ScriptsManagerLH" >
       <script element="math:mtable" >
diff --git a/Master/texmf-dist/tex4ht/xtpipes/oo-text.4xt b/Master/texmf-dist/tex4ht/xtpipes/oo-text.4xt
index e3ec991825d..1b13a657056 100644
--- a/Master/texmf-dist/tex4ht/xtpipes/oo-text.4xt
+++ b/Master/texmf-dist/tex4ht/xtpipes/oo-text.4xt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE xtpipes SYSTEM "xtpipes.dtd" >
-<xtpipes preamble="yes" signature="oo-text.4xt (2008-07-15-16:02)">
+<xtpipes preamble="yes" signature="oo-text.4xt (2009-03-11-03:09)">
    <sax content-handler="xtpipes.util.ScriptsManager,tex4ht.OoFilter"
         lexical-handler="xtpipes.util.ScriptsManagerLH" >
       <script element="t4htlink" >
@@ -206,27 +206,27 @@
    and
      (count(child::text:p) = count(child::*))
  ]" >
-   <xsl:copy>
+   <!--xsl:copy>
       <xsl:attribute name="text:style-name">
           <xsl:text>start_</xsl:text>
          <xsl:value-of select="@text:style-name" />
-      </xsl:attribute>
+      </xsl:attribute-->
       <xsl:comment>
           <xsl:text>start </xsl:text>
           <xsl:value-of select=" @text:style-name " />
      </xsl:comment>
-   </xsl:copy>
+   <!--/xsl:copy-->
        <xsl:apply-templates select="*|text()|comment()" mode="nested-p" />
-   <xsl:copy>
+   <!--xsl:copy>
       <xsl:attribute name="text:style-name">
-          <xsl:text>end_</xsl:text>
+          <xsl:text>end</xsl:text>
          <xsl:value-of select="@text:style-name" />
-      </xsl:attribute>
+      </xsl:attribute-->
       <xsl:comment>
-          <xsl:text>end </xsl:text>
+          <xsl:text>end_</xsl:text>
           <xsl:value-of select=" @text:style-name " />
      </xsl:comment>
-   </xsl:copy>
+   <!--/xsl:copy-->
 </xsl:template>
 <xsl:template match="*[not(text:p)]|text()|comment()" mode="nested-p" >
   <xsl:copy/>
@@ -244,6 +244,19 @@
       <xsl:apply-templates select="*|text()|comment()" />
   </xsl:copy>
 </xsl:template>
+<xsl:template
+    match="text:p[
+              parent::text:p/@text:style-name='printthebibliography-dd'
+          ]"
+    mode="nested-p" >
+  <xsl:copy>
+      <xsl:attribute name="text:style-name">
+         <xsl:value-of select="'printthebibliography-dd'" />
+      </xsl:attribute>
+      <xsl:apply-templates select="@*[ name() != 'text:style-name' ]" />
+      <xsl:apply-templates select="*|text()|comment()" />
+  </xsl:copy>
+</xsl:template>
 
    <xsl:template match="text:p[  child::text:span[
                        starts-with(@text:style-name, 'multicolumn-')
@@ -273,7 +286,7 @@
 
       </script>
       <script element="text:h" >
-         <set name="algorithmic" >
+         <set name="headers" >
    <![CDATA[
    <xsl:stylesheet version="1.0"
       xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@@ -320,6 +333,13 @@
    <xsl:value-of select="translate(.,' ','&#xA0;')"/>
 </xsl:template>
 
+   <xsl:template match="text:h[
+     (@text:style-name='printthebibliography-dt')
+     and
+     (normalize-space()='')
+]" >
+</xsl:template>
+
          <xsl:template match="*|@*|text()|comment()" >
         <xsl:copy>
           <xsl:apply-templates select="*|@*|text()|comment()" />
@@ -329,7 +349,7 @@
 ]]>
 
 </set>
-<xslt name="." xml="." xsl="algorithmic" />
+<xslt name="." xml="." xsl="headers" />
 
       </script>
    </sax>
diff --git a/Master/texmf-dist/tex4ht/xtpipes/xhtml.4xt b/Master/texmf-dist/tex4ht/xtpipes/xhtml.4xt
index bf81aa7d0eb..e0abc478dc3 100644
--- a/Master/texmf-dist/tex4ht/xtpipes/xhtml.4xt
+++ b/Master/texmf-dist/tex4ht/xtpipes/xhtml.4xt
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE xtpipes SYSTEM "xtpipes.dtd" >
-<xtpipes preamble="yes" signature="xhtml.4xt (2008-06-28-21:47)">
+<xtpipes preamble="yes" signature="xhtml.4xt (2008-09-21-01:51)">
    <sax content-handler="xtpipes.util.ScriptsManager"
         lexical-handler="xtpipes.util.ScriptsManagerLH" >
      <script element="table::tabular" >
diff --git a/Master/texmf-dist/tex4ht/xtpipes/xhtmml.4xt b/Master/texmf-dist/tex4ht/xtpipes/xhtmml.4xt
new file mode 100755
index 00000000000..95bcf6e049a
--- /dev/null
+++ b/Master/texmf-dist/tex4ht/xtpipes/xhtmml.4xt
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE xtpipes SYSTEM "xtpipes.dtd" >
+<xtpipes preamble="yes" signature="xhtmml.4xt (2009-01-20-21:08)">
+   <sax content-handler="xtpipes.util.ScriptsManager"
+        lexical-handler="xtpipes.util.ScriptsManagerLH" >
+     <script element="p" >
+   <dom name="." xml="." method="p" class="tex4ht.XhtmmlUtilities" />
+</script>
+<script element="div" >
+   <dom name="." xml="." method="p" class="tex4ht.XhtmmlUtilities" />
+</script>
+
+     <script element="li" >
+   <dom name="." xml="." method="li" class="tex4ht.XhtmmlUtilities" />
+</script>
+
+     <script element="table" >
+   <dom name="." xml="." method="table" class="tex4ht.XhtmmlUtilities" />
+</script>
+
+     <script element="mrow" >
+   <dom name="." xml="." method="mrow" class="tex4ht.XhtmmlUtilities" />
+</script>
+
+     <script element="math" >
+   <dom name="." xml="." method="math" class="tex4ht.XhtmmlUtilities" />
+   <set name="math-mstyle" >
+   <![CDATA[
+   <xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:h="http://www.w3.org/1999/xhtml"
+      xmlns:m="http://www.w3.org/1998/Math/MathML"
+   >
+      <xsl:output omit-xml-declaration = "yes" method="xml" />
+
+   <xsl:template match=" m:* [
+      not(self::m:math)
+    and
+      child::m:mstyle[
+           @mathvariant
+         and
+           child::text()
+         and
+           (count(child::m:*) = 0)
+      ]
+    and
+      (count(child::m:*) = 1)
+    and
+      not(@mathvariant)
+] " >
+  <xsl:copy>
+     <xsl:apply-templates select="@*" />
+     <xsl:apply-templates select="m:mstyle/@*" />
+     <xsl:apply-templates select="m:mstyle/text()" />
+  </xsl:copy>
+</xsl:template>
+
+         <xsl:template match="*|@*|text()|comment()" >
+        <xsl:copy>
+          <xsl:apply-templates select="*|@*|text()|comment()" />
+        </xsl:copy>
+      </xsl:template>
+   </xsl:stylesheet>
+]]>
+
+</set>
+<xslt name="." xml="." xsl="math-mstyle" />
+
+</script>
+
+     <script element="mstyle" >
+   <set name="mstyle" >
+      <![CDATA[
+   <xsl:stylesheet version="1.0"
+      xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+      xmlns:h="http://www.w3.org/1999/xhtml"
+      xmlns:m="http://www.w3.org/1998/Math/MathML"
+   >
+      <xsl:output omit-xml-declaration = "yes" method="xml" />
+
+      <xsl:template match=" m:mstyle [
+                  @mathvariant
+             and
+                  child::m:*[ not(@mathvariant) ]
+             and
+                  (count(child::m:*) = 1)
+] " >
+  <xsl:element name="{name(child::m:*[1])}">
+    <xsl:attribute name="mathvariant" >
+         <xsl:value-of select="@mathvariant" />
+    </xsl:attribute>
+    <xsl:apply-templates select="child::m:*/@*" />
+    <xsl:apply-templates select="
+        child::m:*/*
+        | child::m:*/text()
+        | child::m:*/comment()
+      "
+    />
+  </xsl:element>
+</xsl:template>
+
+            <xsl:template match="*|@*|text()|comment()" >
+        <xsl:copy>
+          <xsl:apply-templates select="*|@*|text()|comment()" />
+        </xsl:copy>
+      </xsl:template>
+   </xsl:stylesheet>
+]]>
+
+   </set>
+   <xslt name="." xml="." xsl="mstyle" />
+</script>
+
+   </sax>
+</xtpipes>
+
diff --git a/Master/texmf-dist/tex4ht/xtpipes/xtpipes-map.dtd b/Master/texmf-dist/tex4ht/xtpipes/xtpipes-map.dtd
index b930b635a00..bb7889d576a 100644
--- a/Master/texmf-dist/tex4ht/xtpipes/xtpipes-map.dtd
+++ b/Master/texmf-dist/tex4ht/xtpipes/xtpipes-map.dtd
@@ -1,4 +1,4 @@
-<!-- xtpipes-map.dtd (2008-07-25-00:35) -->
+<!-- xtpipes-map.dtd (2009-01-27-22:19) -->
 <!ELEMENT xtpipes-map (when | processing-instruction
                             | select
                             | command-line)*  >