[mal2html] Addressed RTL issues

6 files changed, 261 insertions, 278 deletions

diff --git a/xslt/docbook/html/db2html-css.xsl b/xslt/docbook/html/db2html-css.xsl
index b87bfca..398afd6 100644
--- a/xslt/docbook/html/db2html-css.xsl
+++ b/xslt/docbook/html/db2html-css.xsl
@@ -102,7 +102,7 @@ body {
   margin: 0px; padding: 12px;
   background-color: </xsl:text><xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
   min-height: 100%;
-  direction: </xsl:text><xsl:call-template name="l10n.direction"/><xsl:text>;
+  direction: </xsl:text><xsl:value-of select="$direction"/><xsl:text>;
 }
 div, p, pre, blockquote { margin: 0; padding: 0; }
 p img { vertical-align: middle; }
@@ -302,7 +302,8 @@ div.warning-inner { background-image: url("</xsl:text>
   <xsl:value-of select="$theme.icon.admon.warning"/><xsl:text>"); }
 div.blockquote {
   <!-- FIXME: i18n -->
-  background-image: url('../../../data/icons/yelp-watermark-blockquote-201C.png');
+  background-image: url('</xsl:text>
+    <xsl:value-of select="$theme.watermark.blockquote"/><xsl:text>');
   background-repeat: no-repeat;
   background-position: top </xsl:text><xsl:value-of select="$left"/><xsl:text>;
   padding: 0.5em;
diff --git a/xslt/mallard/html/mal2html-block.xsl b/xslt/mallard/html/mal2html-block.xsl
index 266f02d..2a67dcc 100644
--- a/xslt/mallard/html/mal2html-block.xsl
+++ b/xslt/mallard/html/mal2html-block.xsl
@@ -29,141 +29,6 @@ REMARK: Describe this module
 
 
 <!--**==========================================================================
-mal2html.block.css
-Outputs CSS that controls the appearance of block elements
-
-REMARK: Describe this template
--->
-<xsl:template name="mal2html.block.css">
-<xsl:text>
-div.title {
-  margin: 0 0 0.2em 0;
-  font-weight: bold;
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-div.desc { margin: 0 0 0.2em 0; }
-div.desc-listing, div.desc-synopsis { font-style: italic; }
-div.desc-figure { margin: 0.2em 0 0 0; }
-pre.code {
-  background: url('</xsl:text>
-    <xsl:value-of select="$theme.watermark.code"/><xsl:text>') no-repeat top right;
-  border: solid 2px </xsl:text>
-    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
-  padding: 0.5em 1em 0.5em 1em;
-}
-div.example {
-  border-left: solid 4px </xsl:text>
-    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
-  padding-left: 1em;
-}
-div.figure {
-  margin-left: 1.72em;
-  padding: 4px;
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-  border: solid 1px </xsl:text>
-    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
-}
-div.figure-contents {
-  margin: 0;
-  padding: 0.5em 1em 0.5em 1em;
-  text-align: center;
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text"/><xsl:text>;
-  border: solid 1px </xsl:text>
-    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.background"/><xsl:text>;
-}
-div.listing-contents { margin: 0; padding: 0; }
-div.note {
-  padding: 0.5em 6px 0.5em 6px;
-  border-top: solid 1px </xsl:text>
-    <xsl:value-of select="$theme.color.red_border"/><xsl:text>;
-  border-bottom: solid 1px </xsl:text>
-    <xsl:value-of select="$theme.color.red_border"/><xsl:text>;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
-}
-div.note-inner {
-  margin: 0;
-  min-height: </xsl:text><xsl:value-of select="$theme.icon.admon.size"/><xsl:text>px;
-  padding-left: </xsl:text>
-    <xsl:value-of select="$theme.icon.admon.size + 12"/><xsl:text>px;
-  background-position: left top;
-  background-repeat: no-repeat;
-  background-image: url("</xsl:text>
-    <xsl:value-of select="$theme.icon.admon.note"/><xsl:text>");
-}
-div.note-advanced div.note-inner { <!-- background-image: url("</xsl:text>
-  <xsl:value-of select="$theme.icon.admon.advanced"/><xsl:text>"); --> }
-div.note-bug div.note-inner { background-image: url("</xsl:text>
-  <xsl:value-of select="$theme.icon.admon.bug"/><xsl:text>"); }
-div.note-important div.note-inner { background-image: url("</xsl:text>
-  <xsl:value-of select="$theme.icon.admon.important"/><xsl:text>"); }
-div.note-tip div.note-inner { background-image: url("</xsl:text>
-  <xsl:value-of select="$theme.icon.admon.tip"/><xsl:text>"); }
-div.note-warning div.note-inner { background-image: url("</xsl:text>
-  <xsl:value-of select="$theme.icon.admon.warning"/><xsl:text>"); }
-div.note-contents { margin: 0; padding: 0; }
-div.quote-inner {
-  margin: 0;
-  <!-- FIXME: i18n -->
-  background-image: url('</xsl:text>
-    <xsl:value-of select="$theme.watermark.blockquote"/><xsl:text>');
-  background-repeat: no-repeat;
-  background-position: top left;
-  padding: 0.5em;
-  padding-left: 4em;
-}
-div.title-quote {
-  margin-left: 4em;
-}
-blockquote {
-  margin: 0; padding: 0;
-}
-div.cite-comment {
-  margin-top: 0.5em;
-  color: </xsl:text><xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-div.cite-quote {
-  margin-top: 0.5em;
-  color: </xsl:text><xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-div.cite-quote::before {
-  <!-- FIXME: i18n -->
-  content: '&#x2015; ';
-}
-pre.screen {
-  padding: 0.5em 1em 0.5em 1em;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
-  border: solid 2px </xsl:text>
-    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
-}
-div.synopsis-contents {
-  margin: 0;
-  padding: 0.5em 1em 0.5em 1em;
-  border-top: solid 2px;
-  border-bottom: solid 2px;
-  border-color: </xsl:text>
-    <xsl:value-of select="$theme.color.blue_border"/><xsl:text>;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
-}
-div.synopsis pre.code {
-  background: none;
-  border: none;
-  padding: 0;
-}
-</xsl:text>
-</xsl:template>
-
-
-<!--**==========================================================================
 mal2html.pre
 
 FIXME
diff --git a/xslt/mallard/html/mal2html-css.xsl b/xslt/mallard/html/mal2html-css.xsl
index 71b3a97..cf96b16 100644
--- a/xslt/mallard/html/mal2html-css.xsl
+++ b/xslt/mallard/html/mal2html-css.xsl
@@ -81,19 +81,28 @@ This template calls *{mal2html.css.custom} at the end.  That template may be use
 by extension stylesheets to extend or override the CSS.
 -->
 <xsl:template name="mal2html.css.content">
-  <xsl:call-template name="mal2html.block.css"/>
-  <xsl:call-template name="mal2html.inline.css"/>
-  <xsl:call-template name="mal2html.list.css"/>
-  <xsl:call-template name="mal2html.table.css"/>
-<xsl:text>
+  <xsl:variable name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:variable>
+  <xsl:variable name="left">
+    <xsl:call-template name="l10n.align.start">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="right">
+    <xsl:call-template name="l10n.align.end">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:text>
 html { height: 100%; }
 body {
-  direction: </xsl:text><xsl:call-template name="l10n.direction"/><xsl:text>;
   margin: 0px;
   background-color: </xsl:text>
     <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
   padding: 12px;
   min-height: 100%;
+  direction: </xsl:text><xsl:value-of select="$direction"/><xsl:text>;
 }
 ul, ol, dl, dd { margin: 0; }
 div, pre, p, li, dt { margin: 1em 0 0 0; padding: 0; }
@@ -128,7 +137,10 @@ div.copyrights {
     <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
 }
 div.section { margin-top: 2.4em; clear: both; }
-div.section div.section { margin-top: 1.72em; margin-left: 1.72em; }
+div.section div.section {
+  margin-top: 1.72em;
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.72em;
+}
 div.section div.section div.section { margin-top: 1.44em; }
 div.header {
   margin: 0;
@@ -157,14 +169,18 @@ li.autolink { margin: 0.5em 0 0 0; padding: 0 0 0 1em; list-style-type: none; }
 
 div.linktrail {
   font-size: 0.83em;
-  padding-left: 1.2em;
   margin: 0 1px 0.2em 1px;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.2em;
   color: </xsl:text>
     <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
 }
 
 td.twocolumnleft { width: 48%; vertical-align: top; padding: 0; margin: 0; }
-td.twocolumnright { width: 52%; vertical-align: top; padding: 0 0 0 1em; margin: 0; }
+td.twocolumnright {
+  width: 52%; vertical-align: top;
+  margin: 0; padding: 0;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1em;
+}
 
 div.pagelink div.title {
   font-size: 1em;
@@ -190,6 +206,224 @@ div.pagelinksep {
   border-bottom: solid 1px </xsl:text>
     <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
 }
+
+div.title {
+  margin: 0 0 0.2em 0;
+  font-weight: bold;
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+}
+div.desc { margin: 0 0 0.2em 0; }
+div.desc-listing, div.desc-synopsis { font-style: italic; }
+div.desc-figure { margin: 0.2em 0 0 0; }
+pre.code {
+  /* FIXME: In RTL locales, we really want to align this left, but the watermark
+   * we have is designed to fit in the top right corner.  Either we need a new
+   * watermark, or we need a separate RTL version.
+   */
+  background: url('</xsl:text>
+    <xsl:value-of select="$theme.watermark.code"/><xsl:text>') no-repeat top right;
+  border: solid 2px </xsl:text>
+    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
+  padding: 0.5em 1em 0.5em 1em;
+}
+div.example {
+  border-</xsl:text><xsl:value-of select="$left"/><xsl:text>: solid 4px </xsl:text>
+    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1em;
+}
+div.figure {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.72em;
+  padding: 4px;
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
+}
+div.figure-contents {
+  margin: 0;
+  padding: 0.5em 1em 0.5em 1em;
+  text-align: center;
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text"/><xsl:text>;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.background"/><xsl:text>;
+}
+div.listing-contents { margin: 0; padding: 0; }
+div.note {
+  padding: 0.5em 6px 0.5em 6px;
+  border-top: solid 1px </xsl:text>
+    <xsl:value-of select="$theme.color.red_border"/><xsl:text>;
+  border-bottom: solid 1px </xsl:text>
+    <xsl:value-of select="$theme.color.red_border"/><xsl:text>;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
+}
+div.note-inner {
+  margin: 0;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: </xsl:text>
+    <xsl:value-of select="$theme.icon.admon.size + 12"/><xsl:text>px;
+  background-position: </xsl:text><xsl:value-of select="$left"/><xsl:text> top;
+  background-repeat: no-repeat;
+  min-height: </xsl:text><xsl:value-of select="$theme.icon.admon.size"/><xsl:text>px;
+  background-image: url("</xsl:text>
+    <xsl:value-of select="$theme.icon.admon.note"/><xsl:text>");
+}
+div.note-advanced div.note-inner { <!-- background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.advanced"/><xsl:text>"); --> }
+div.note-bug div.note-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.bug"/><xsl:text>"); }
+div.note-important div.note-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.important"/><xsl:text>"); }
+div.note-tip div.note-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.tip"/><xsl:text>"); }
+div.note-warning div.note-inner { background-image: url("</xsl:text>
+  <xsl:value-of select="$theme.icon.admon.warning"/><xsl:text>"); }
+div.note-contents { margin: 0; padding: 0; }
+div.quote-inner {
+  margin: 0;
+  background-image: url('</xsl:text>
+    <xsl:value-of select="$theme.watermark.blockquote"/><xsl:text>');
+  background-repeat: no-repeat;
+  background-position: top </xsl:text><xsl:value-of select="$left"/><xsl:text>;
+  padding: 0.5em;
+  padding-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 4em;
+}
+div.title-quote {
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 4em;
+}
+blockquote { margin: 0; padding: 0; }
+div.cite-comment {
+  margin-top: 0.5em;
+  color: </xsl:text><xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+}
+div.cite-quote {
+  margin-top: 0.5em;
+  color: </xsl:text><xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+}
+div.cite-quote::before {
+  <!-- FIXME: i18n -->
+  content: '&#x2015; ';
+}
+pre.screen {
+  padding: 0.5em 1em 0.5em 1em;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
+  border: solid 2px </xsl:text>
+    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
+}
+div.synopsis-contents {
+  margin: 0;
+  padding: 0.5em 1em 0.5em 1em;
+  border-top: solid 2px;
+  border-bottom: solid 2px;
+  border-color: </xsl:text>
+    <xsl:value-of select="$theme.color.blue_border"/><xsl:text>;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
+}
+div.synopsis pre.code {
+  background: none;
+  border: none;
+  padding: 0;
+}
+
+div.list-contents { margin: 0; padding: 0; }
+div.title-list { margin-bottom: 0.5em; }
+ol.list, ul.list { margin: 0; padding: 0; }
+li.item-list { margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.44em; }
+
+div.steps-contents {
+  margin: 0;
+  padding: 0.5em 1em 0.5em 1em;
+  border-top: solid 2px;
+  border-bottom: solid 2px;
+  border-color: </xsl:text>
+    <xsl:value-of select="$theme.color.blue_border"/><xsl:text>;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
+}
+div.steps-contents div.steps-contents {
+  padding: 0;
+  border: none;
+  background-color: none;
+}
+ol.steps, ul.steps { margin: 0; padding: 0; }
+li.item-steps { margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.44em; }
+
+div.terms-contents { margin: 0; }
+dt.item-next { margin-top: 0; }
+dd.item-terms {
+  margin-top: 0.2em;
+  margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.44em;
+}
+
+ul.tree {
+  margin: 0; padding: 0;
+  list-style-type: none;
+}
+li.item-tree { margin: 0; padding: 0; }
+div.item-tree { margin: 0; padding: 0; }
+ul.tree ul.tree { margin-</xsl:text><xsl:value-of select="$left"/><xsl:text>: 1.44em; }
+div.tree-lines ul.tree { margin-left: 0; }
+
+table.table {
+  border-collapse: collapse;
+  border-color: #555753;
+  border-width: 1px;
+}
+table.table td {
+  padding: 0.1em 0.5em 0.1em 0.5em;
+  border-color: #888a85;
+  border-width: 1px;
+  vertical-align: top;
+}
+
+span.app { font-style: italic; }
+span.cmd {
+  font-family: monospace;
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
+  padding: 0 0.2em 0 0.2em;
+}
+span.code { font-family: monospace; }
+span.em { font-style: italic; }
+span.email { color: red; }
+span.file { font-family: monospace; }
+span.gui, span.guiseq { color: </xsl:text>
+  <xsl:value-of select="$theme.color.text_light"/><xsl:text>; }
+span.input { font-family: monospace; }
+span.hi {
+  background-color: </xsl:text>
+    <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
+}
+span.key {
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+  border: solid 1px </xsl:text>
+    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
+  padding: 0 0.2em 0 0.2em;
+}
+span.keyseq {
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+}
+span.output { font-family: monospace; }
+pre.screen span.output {
+  color: </xsl:text>
+    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
+}
+pre.screen span.output-error {
+<!-- FIXME: theme -->
+  color: #ff0000;
+}
+pre.screen span.output-prompt { font-weight: bold; }
+span.sys { font-family: monospace; }
+span.var { font-style: italic; }
 </xsl:text>
 <xsl:call-template name="mal2html.css.editor"/>
 <xsl:call-template name="mal2html.css.custom"/>
@@ -214,10 +448,23 @@ Outputs CSS for editor mode
 FIXME
 -->
 <xsl:template name="mal2html.css.editor">
+  <xsl:variable name="direction">
+    <xsl:call-template name="l10n.direction"/>
+  </xsl:variable>
+  <xsl:variable name="left">
+    <xsl:call-template name="l10n.align.start">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="right">
+    <xsl:call-template name="l10n.align.end">
+      <xsl:with-param name="direction" select="$direction"/>
+    </xsl:call-template>
+  </xsl:variable>
 <xsl:text>
 div.version {
   position: absolute;
-  right: 12px;
+  </xsl:text><xsl:value-of select="$right"/><xsl:text>: 12px;
   opacity: 0.2;
   margin-top: -1em;
   padding: 0.5em 1em 0.5em 1em;
@@ -261,7 +508,7 @@ div.comment {
     <xsl:value-of select="$theme.color.red_background"/><xsl:text>;
 }
 div.comment div.comment {
-  margin: 1em 0 0 1em;
+  margin: 1em 1em 0 1em;
 }
 div.comment div.cite {
   margin: 0 0 0.5em 0;
diff --git a/xslt/mallard/html/mal2html-inline.xsl b/xslt/mallard/html/mal2html-inline.xsl
index 1db0bf2..b29166e 100644
--- a/xslt/mallard/html/mal2html-inline.xsl
+++ b/xslt/mallard/html/mal2html-inline.xsl
@@ -87,61 +87,6 @@ REMARK: Document this template
 </xsl:template>
 
 
-
-
-<!--**==========================================================================
-mal2html.inline.css
-Outputs CSS that controls the appearance of inline elements
-
-REMARK: Describe this template
--->
-<xsl:template name="mal2html.inline.css">
-<xsl:text>
-span.app { font-style: italic; }
-span.cmd {
-  font-family: monospace;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.gray_background"/><xsl:text>;
-  padding: 0 0.2em 0 0.2em;
-}
-span.code { font-family: monospace; }
-span.em { font-style: italic; }
-span.email { color: red; }
-span.file { font-family: monospace; }
-span.gui, span.guiseq { color: </xsl:text>
-  <xsl:value-of select="$theme.color.text_light"/><xsl:text>; }
-span.input { font-family: monospace; }
-span.hi {
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
-}
-span.key {
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-  border: solid 1px </xsl:text>
-    <xsl:value-of select="$theme.color.gray_border"/><xsl:text>;
-  padding: 0 0.2em 0 0.2em;
-}
-span.keyseq {
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-span.output { font-family: monospace; }
-pre.screen span.output {
-  color: </xsl:text>
-    <xsl:value-of select="$theme.color.text_light"/><xsl:text>;
-}
-pre.screen span.output-error {
-<!-- FIXME: theme -->
-  color: #ff0000;
-}
-pre.screen span.output-prompt { font-weight: bold; }
-span.sys { font-family: monospace; }
-span.var { font-style: italic; }
-</xsl:text>
-</xsl:template>
-
-
 <!-- == Matched Templates == -->
 
 <!-- = app = -->
diff --git a/xslt/mallard/html/mal2html-list.xsl b/xslt/mallard/html/mal2html-list.xsl
index 0fddd53..cac1a93 100644
--- a/xslt/mallard/html/mal2html-list.xsl
+++ b/xslt/mallard/html/mal2html-list.xsl
@@ -28,58 +28,6 @@ REMARK: Describe this module
 -->
 
 
-<!--**==========================================================================
-mal2html.list.css
-Outputs CSS that controls the appearance of lists
-
-REMARK: Describe this template
--->
-<xsl:template name="mal2html.list.css">
-<xsl:text>
-div.list-contents { margin: 0; padding: 0; }
-div.title-list { margin-bottom: 0.5em; }
-ol.list, ul.list { margin: 0; padding: 0; }
-li.item-list { margin-left: 1.44em; }
-
-div.steps-contents {
-  margin: 0;
-  padding: 0.5em 1em 0.5em 1em;
-  border-top: solid 2px;
-  border-bottom: solid 2px;
-  border-color: </xsl:text>
-    <xsl:value-of select="$theme.color.blue_border"/><xsl:text>;
-  background-color: </xsl:text>
-    <xsl:value-of select="$theme.color.yellow_background"/><xsl:text>;
-}
-div.steps-contents div.steps-contents {
-  padding: 0;
-  border: none;
-  background-color: none;
-}
-ol.steps, ul.steps { margin: 0; padding: 0; }
-li.item-steps { margin-left: 1.44em; }
-
-div.terms-contents { margin: 0; }
-dt.item-next { margin-top: 0; }
-dd.item-terms {
-  margin-top: 0.2em;
-  margin-left: 1.44em;
-}
-
-ul.tree {
-  margin: 0; padding: 0;
-  list-style-type: none;
-}
-li.item-tree { margin: 0; padding: 0; }
-div.item-tree { margin: 0; padding: 0; }
-ul.tree ul.tree {
-  margin-left: 1.44em;
-}
-div.tree-lines ul.tree { margin-left: 0; }
-</xsl:text>
-</xsl:template>
-
-
 <!-- = list = -->
 <xsl:template mode="mal2html.block.mode" match="mal:list">
   <xsl:param name="first_child" select="not(preceding-sibling::*)"/>
diff --git a/xslt/mallard/html/mal2html-table.xsl b/xslt/mallard/html/mal2html-table.xsl
index 561d419..7a70098 100644
--- a/xslt/mallard/html/mal2html-table.xsl
+++ b/xslt/mallard/html/mal2html-table.xsl
@@ -30,29 +30,6 @@ REMARK: Describe this module
 -->
 
 
-<!--**==========================================================================
-mal2html.table.css
-Outputs CSS that controls the appearance of tables
-
-REMARK: Describe this template
--->
-<xsl:template name="mal2html.table.css">
-<xsl:text>
-table.table {
-  border-collapse: collapse;
-  border-color: #555753;
-  border-width: 1px;
-}
-table.table td {
-  padding: 0.1em 0.5em 0.1em 0.5em;
-  border-color: #888a85;
-  border-width: 1px;
-  vertical-align: top;
-}
-</xsl:text>
-</xsl:template>
-
-
 <!-- == Matched Templates == -->
 
 <!-- = table = -->