Updated docbook-xsl-snapshot to r6830

git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/new-xsl@8151 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

docbook-xsl-snapshot/VERSION

@@ -17,7 +17,7 @@
 <fm:project>
   <fm:Project>DocBook</fm:Project>
   <fm:Branch>XSL Stylesheets</fm:Branch>
-  <fm:Version>snapshot_6823</fm:Version>
+  <fm:Version>snapshot_6830</fm:Version>
 <!--
   <fm:License>MIT/X Consortium License</fm:License>
 -->

docbook-xsl-snapshot/fo/fo-patch-for-fop.xsl

@@ -1,64 +0,0 @@
-<?xml version="1.0"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:fo="http://www.w3.org/1999/XSL/Format"
-                xmlns:fox="http://xml.apache.org/fop/extensions"
-                version="1.0">
-
-<!-- ********************************************************************
-     $Id$
-     ********************************************************************
-
-     This file is part of the DocBook XSL Stylesheet distribution.
-     See ../README or http://docbook.sf.net/ for copyright
-     and other information.
-
-     ******************************************************************** -->
-
-<xsl:output method="xml"/>
-
-<xsl:template match="*">
-  <xsl:element name="{name(.)}">
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<xsl:template match="fo:page-sequence
-                     |fo:single-page-master-reference
-                     |fo:repeatable-page-master-reference
-                     |fo:conditional-page-master-reference">
-  <xsl:element name="{name(.)}">
-    <xsl:for-each select="@*">
-      <xsl:choose>
-        <xsl:when test="name(.) = 'master-reference'">
-          <xsl:attribute name="master-name">
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:attribute name="{name(.)}">
-            <xsl:value-of select="."/>
-          </xsl:attribute>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:for-each>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-<!-- a clever idea that doesn't quite work. fop 0.20.1 doesn't understand % -->
-<!-- and fop 0.20.2 doesn't work for me at all... -->
-<xsl:template match="fo:table-column">
-  <xsl:element name="{name(.)}">
-    <xsl:if test="not(@column-width)">
-      <xsl:attribute name="column-width">
-        <xsl:value-of select="100 div count(../fo:table-column)"/>
-        <xsl:text>%</xsl:text>
-      </xsl:attribute>
-    </xsl:if>
-    <xsl:copy-of select="@*"/>
-    <xsl:apply-templates/>
-  </xsl:element>
-</xsl:template>
-
-</xsl:stylesheet>

docbook-xsl-snapshot/xhtml/lists.xsl

@@ -354,6 +354,7 @@
     </xsl:call-template>
 
     <td>
+      <p>
       <xsl:call-template name="anchor"/>
       <xsl:choose>
         <xsl:when test="$presentation = 'bold'">
@@ -381,6 +382,7 @@
           <xsl:value-of select="$separator"/>
         </xsl:otherwise>
       </xsl:choose>
+      </p>
     </td>
     <td>
       <xsl:apply-templates select="listitem"/>
@@ -925,10 +927,12 @@
         </xsl:call-template>
 
         <td width="5%" valign="top" align="left">
-          <xsl:call-template name="anchor"/>
-          <xsl:call-template name="callout.arearefs">
-            <xsl:with-param name="arearefs" select="@arearefs"/>
-          </xsl:call-template>
+          <p>
+            <xsl:call-template name="anchor"/>
+            <xsl:call-template name="callout.arearefs">
+              <xsl:with-param name="arearefs" select="@arearefs"/>
+            </xsl:call-template>
+          </p>
         </td>
         <td valign="top" align="left">
           <xsl:apply-templates/>

docbook-xsl-snapshot/xhtml/qandaset.xsl

@@ -161,9 +161,9 @@
       </xsl:variable>
 
       <xsl:if test="string-length($label.content) &gt; 0">
-        <b>
+        <p><b>
           <xsl:copy-of select="$label.content"/>
-        </b>
+        </b></p>
       </xsl:if>
     </td>
     <td align="left" valign="top">
@@ -198,9 +198,9 @@
         <xsl:apply-templates select="." mode="label.markup"/>
       </xsl:variable>
       <xsl:if test="string-length($answer.label) &gt; 0">
-        <b>
+        <p><b>
           <xsl:copy-of select="$answer.label"/>
-        </b>
+        </b></p>
       </xsl:if>
     </td>
     <td align="left" valign="top">

lfs.css

@@ -357,10 +357,6 @@ div.revhistory td {
   margin: 0.25em;
 }
 
-.variablelist td p {
-  margin-top: 0;
-}
-
 
 /* variablelist as list */
 dl {