Adjusted/corrected alignment of adominition marker in PS/non-TTY output.

diff --git a/xsl/manpages/block.xsl b/xsl/manpages/block.xsl
index 37e75a4814ece72ae598dc16e8d190a31ba98448..0fc9fdcaa6de2699ab0360abcf72005076e406b1 100644 (file)
--- a/xsl/manpages/block.xsl
+++ b/xsl/manpages/block.xsl
@@ -17,14 +17,12 @@
 <!-- ==================================================================== -->
 
 <xsl:template match="caution|important|note|tip|warning">
-  <xsl:call-template name="roff-if-start">
-    <xsl:with-param name="condition">n</xsl:with-param>
-  </xsl:call-template>
-  <xsl:text>.sp&#10;</xsl:text>
   <xsl:call-template name="roff-if-end"/>
   <xsl:text>.RS 4&#10;</xsl:text>
   <xsl:text>.BM yellow&#10;</xsl:text>
+  <xsl:call-template name="pinch.together"/>
   <xsl:text>.ps +1&#10;</xsl:text>
+  <xsl:text>.PP&#10;</xsl:text>
   <xsl:call-template name="make.bold.title"/>
   <xsl:text>.ps -1&#10;</xsl:text>
   <xsl:text>.br&#10;</xsl:text>

diff --git a/xsl/manpages/other.xsl b/xsl/manpages/other.xsl
index 354c376f5119f86cbc72cb6bb793ff770d2d9de4..c6adc6506184358845cc93c99e6dedf29696766b 100644 (file)
--- a/xsl/manpages/other.xsl
+++ b/xsl/manpages/other.xsl
@@ -833,7 +833,6 @@ db:manvolnum
     <xsl:text>.de BM
 .if t \{\
 .br
-.in +2n
 .ll -2n
 .gcolor red
 .di BX
@@ -843,12 +842,11 @@ db:manvolnum
 .if t \{\
 .br
 .di
-.in
 .ll
 .gcolor
 .nr BH \\n(dn
 .ne \\n(BHu
-\M[\\$1]\D'P -1n 0 0 \\n(BHu -3n 0 0 -\\n(BHu'\M[]
+\M[\\$1]\D'P -.5n 0 0 \\n(BHu -(\\n[.i]u - \\n(INu - .5n) 0 0 -\\n(BHu'\M[]
 .in 0
 .nf
 .BX