- Changes to make block indents not nest

* xslt/docbook/html/db2html-admon.xsl:
* xslt/docbook/html/db2html-block.xsl:
* xslt/docbook/html/db2html-css.xsl:
* xslt/docbook/html/db2html-table.xsl:
- Changes to make block indents not nest

5 files changed, 70 insertions, 37 deletions

diff --git a/ChangeLog b/ChangeLog
index 1907059..54a958f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2005-08-01  Shaun McCance  <shaunm@gnome.org>
 
+	* xslt/docbook/html/db2html-admon.xsl:
+	* xslt/docbook/html/db2html-block.xsl:
+	* xslt/docbook/html/db2html-css.xsl:
+	* xslt/docbook/html/db2html-table.xsl:
+	- Changes to make block indents not nest
+
+2005-08-01  Shaun McCance  <shaunm@gnome.org>
+
 	* xslt/docbook/common/db-label.xsl:
 	* xslt/docbook/common/db-xref.xsl:
 	* xslt/gettext/l10n.xml.in:
diff --git a/xslt/docbook/html/db2html-admon.xsl b/xslt/docbook/html/db2html-admon.xsl
index 99621f8..aba94fb 100644
--- a/xslt/docbook/html/db2html-admon.xsl
+++ b/xslt/docbook/html/db2html-admon.xsl
@@ -90,7 +90,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:template name="db2html.admon">
   <xsl:param name="node" select="."/>
-  <div class="admonition {local-name(.)}">
+  <div class="admonition block-indent {local-name(.)}">
     <xsl:apply-templates select="$node/node()"/>
   </div>
 </xsl:template>
@@ -138,8 +138,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       <xsl:value-of select="$db2html.admon.graphics_extension"/><xsl:text>");
     }
     div[class~="admonition"] {
-      margin-left: 2em;
-      margin-right: 2em;
       padding-top: 4px;
       padding-bottom: 4px;
       padding-left: </xsl:text>
diff --git a/xslt/docbook/html/db2html-block.xsl b/xslt/docbook/html/db2html-block.xsl
index ffe80d5..ef96cfd 100644
--- a/xslt/docbook/html/db2html-block.xsl
+++ b/xslt/docbook/html/db2html-block.xsl
@@ -82,6 +82,12 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     Format a block-level element
   </purpose>
   <parameter>
+    <name>indent</name>
+    <purpose>
+      Whether this block should be indented
+    </purpose>
+  </parameter>
+  <parameter>
     <name>verbatim</name>
     <purpose>
       Whether to maintain whitespace verbatim
@@ -90,25 +96,20 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 </template>
 
 <xsl:template name="db2html.block">
+  <xsl:param name="indent" select="false()"/>
   <xsl:param name="verbatim" select="false()"/>
-  <div class="{local-name(.)}">
+  <div>
+    <xsl:attribute name="class">
+      <xsl:value-of select="local-name(.)"/>
+      <xsl:if test="$indent">
+        <xsl:text> block-indent</xsl:text>
+      </xsl:if>
+      <xsl:if test="$verbatim">
+        <xsl:text> block-verbatim</xsl:text>
+      </xsl:if>
+    </xsl:attribute>
     <xsl:call-template name="db2html.anchor"/>
-    <xsl:choose>
-      <xsl:when test="$verbatim">
-        <xsl:variable name="style">
-          <xsl:if test="$verbatim">
-            <xsl:text>white-space: pre; </xsl:text>
-          </xsl:if>
-        </xsl:variable>
-        <xsl:attribute name="style">
-          <xsl:value-of select="$style"/>
-        </xsl:attribute>
-        <xsl:apply-templates/>
-      </xsl:when>
-      <xsl:otherwise>
-        <xsl:apply-templates/>
-      </xsl:otherwise>
-    </xsl:choose>
+    <xsl:apply-templates/>
   </div>
 </xsl:template>
 
@@ -123,7 +124,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 </template>
 
 <xsl:template name="db2html.blockquote">
-  <div class="{local-name(.)}">
+  <div class="{local-name(.)} block-indent">
     <xsl:apply-templates select="title"/>
     <blockquote class="{local-name(.)}">
       <xsl:apply-templates
@@ -158,9 +159,16 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   <purpose>
     Format an element in a <xmltag>pre</xmltag> tag
   </purpose>
+  <parameter>
+    <name>indent</name>
+    <purpose>
+      Whether this block should be indented
+    </purpose>
+  </parameter>
 </template>
 
 <xsl:template name="db2html.pre">
+  <xsl:param name="indent" select="false()"/>
   <!-- FIXME:
   @width
   @language
@@ -168,7 +176,13 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
   @format
   @startinglinenumber
   -->
-  <div class="{local-name(.)}">
+  <div>
+    <xsl:attribute name="class">
+      <xsl:value-of select="local-name(.)"/>
+      <xsl:if test="$indent">
+        <xsl:text> block-indent</xsl:text>
+      </xsl:if>
+    </xsl:attribute>
     <xsl:call-template name="db2html.anchor"/>
     <xsl:if test="@linenumbering = 'numbered'">
       <pre class="linenumbering" style="float: left; text-align: right;"><xsl:call-template name="db.linenumbering"/></pre>
@@ -215,10 +229,18 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:template name="db2html.block.css">
   <xsl:text>
-    div[class~="figure"] { margin-left: 2em; margin-right: 1em; }
-    pre[class~="programlisting"] {
+    *[class~="block-indent"] {
       margin-left: 2em;
       margin-right: 1em;
+    }
+    *[class~="block-indent"] *[class~="block-indent"] {
+      margin-left: 0em;
+      margin-right: 0em;
+    }
+    *[class~="block-verbatim"] {
+      white-space: pre;
+    }
+    pre[class~="programlisting"] {
       padding: 6px;
       -moz-border-radius: 8px;
       overflow: auto;</xsl:text>
@@ -234,8 +256,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       <xsl:text>
     }
     pre[class~="screen"] {
-      margin-left: 2em;
-      margin-right: 1em;
       padding: 6px;
       -moz-border-radius: 8px;
       overflow: auto;</xsl:text>
@@ -251,8 +271,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       <xsl:text>
     }
     pre[class~="synopsis"] {
-      margin-left: 2em;
-      margin-right: 1em;
       overflow: auto;
     }
     pre[class~="linenumbering"] {
@@ -266,7 +284,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
       padding-right: 0.4em;
       padding-left: 0.4em;
     }
-    blockquote[class~="blockquote"] { margin-left: 2em; margin-right: 1em; }
     dt[class~="glossterm"] { margin-left: 0em; }
     dd + dt[class~="glossterm"] { margin-top: 2em; }
     dd[class~="glossdef"]
@@ -325,12 +342,16 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <!-- = example = -->
 <xsl:template match="example">
-  <xsl:call-template name="db2html.block"/>
+  <xsl:call-template name="db2html.block">
+    <xsl:with-param name="indent" select="true()"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = figure = -->
 <xsl:template match="figure">
-  <xsl:call-template name="db2html.block"/>
+  <xsl:call-template name="db2html.block">
+    <xsl:with-param name="indent" select="true()"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = formalpara = -->
@@ -443,12 +464,16 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <!-- = programlisting = -->
 <xsl:template match="programlisting">
-  <xsl:call-template name="db2html.pre"/>
+  <xsl:call-template name="db2html.pre">
+    <xsl:with-param name="indent" select="true()"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = screen = -->
 <xsl:template match="screen">
-  <xsl:call-template name="db2html.pre"/>
+  <xsl:call-template name="db2html.pre">
+    <xsl:with-param name="indent" select="true()"/>
+  </xsl:call-template>
 </xsl:template>
 
 <!-- = simpara = -->
@@ -458,7 +483,9 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <!-- = synopsis = -->
 <xsl:template match="synopsis">
-  <xsl:call-template name="db2html.pre"/>
+  <xsl:call-template name="db2html.pre">
+    <xsl:with-param name="indent" select="true()"/>
+  </xsl:call-template>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl
index cea8949..eb7da72 100644
--- a/xslt/docbook/html/db2html-css.xsl
+++ b/xslt/docbook/html/db2html-css.xsl
@@ -79,7 +79,8 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
     }
     div + * { margin-top: 1em; }
     p   + * { margin-top: 1em; }
-    p &gt; div { margin-top: 1em; }
+    p &gt; div { margin-top: 1em; margin-bottom: 1em; }
+    p &gt; div + div { margin-top: 0em; }
     p { text-align: justify; }
     <xsl:call-template name="db2html.css.custom"/>
   </style>
diff --git a/xslt/docbook/html/db2html-table.xsl b/xslt/docbook/html/db2html-table.xsl
index ca8ecea..895cfc5 100644
--- a/xslt/docbook/html/db2html-table.xsl
+++ b/xslt/docbook/html/db2html-table.xsl
@@ -56,7 +56,6 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <xsl:template name="db2html.table.css">
   <xsl:text>
-    div[class~="table"] { margin-left: 2em; }
     table {
       border-collapse: collapse;
       border: solid 1px;
@@ -307,7 +306,7 @@ Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 <!-- = table = -->
 <xsl:template match="table | informaltable">
-  <div class="table">
+  <div class="table block-indent">
     <xsl:call-template name="db2html.anchor"/>
     <xsl:apply-templates select="title"/>
     <!-- FIXME: I have no idea what I'm supposed to do with textobject -->