Reworked output for admonitions (caution, important, note, tip,

warning). In TTY output, admonitions now get indented. In non-TTY
output, a colored marker (yellow) is displayed next to them.

diff --git a/xsl/manpages/block.xsl b/xsl/manpages/block.xsl
index 2dd4647a3bbfa9e022d471ea0017448fc7c878ed..81c3f953c1c3cef485cfd2d2c1138a040480e258 100644 (file)
--- a/xsl/manpages/block.xsl
+++ b/xsl/manpages/block.xsl
@@ -17,9 +17,23 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="caution|important|note|tip|warning">
-  <xsl:call-template name="nested-section-title"/>
+  <xsl:call-template name="roff-if-start">
+    <xsl:with-param name="condition">n</xsl:with-param>
+  </xsl:call-template>
+  <xsl:call-template name="roff-if-end"/>
+  <xsl:text>.RS 4&#10;</xsl:text>
+  <xsl:text>.BM yellow&#10;</xsl:text>
+  <xsl:text>.PP&#10;</xsl:text>
+  <xsl:text>.sp -1&#10;</xsl:text>
+  <xsl:text>.ps +1&#10;</xsl:text>
+  <xsl:call-template name="make.bold.title"/>
+  <xsl:text>&#10;</xsl:text>
   <xsl:apply-templates/>
   <xsl:text>&#10;</xsl:text>
+  <xsl:text>.sp .5v&#10;</xsl:text>
+  <xsl:text>.EM yellow&#10;</xsl:text>
+  <xsl:text>.RE -4n&#10;</xsl:text>
+  <xsl:text>.sp .5v&#10;</xsl:text>
 </xsl:template> 
 
 <xsl:template match="formalpara">
@@ -173,10 +187,10 @@
         <xsl:when test="self::literallayout|self::programlisting|self::screen">
           <!-- * if this is a literallayout|programlisting|screen, then we -->
           <!-- * put a background behind it in non-TTY output -->
-          <xsl:text>.BB&#10;</xsl:text>
+          <xsl:text>.BB lightgray&#10;</xsl:text>
           <xsl:apply-templates/>
           <xsl:text>&#10;</xsl:text>
-          <xsl:text>.EB&#10;</xsl:text>
+          <xsl:text>.EB lightgray&#10;</xsl:text>
         </xsl:when>
         <xsl:otherwise>
           <!-- * otherwise this is not a literallayout|programlisting|screen, -->