From: Norman W. <nw...@us...> - 2001-11-29 22:42:23
|
Update of /cvsroot/docbook/xsl/fo In directory usw-pr-cvs1:/tmp/cvs-serv17880/fo Modified Files: lists.xsl Log Message: Patch #478068: procedures with one step Index: lists.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/lists.xsl,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** lists.xsl 2001/11/29 15:00:14 1.10 --- lists.xsl 2001/11/29 22:42:20 1.11 *************** *** 401,408 **** <xsl:variable name="steps" select="step"/> ! <fo:block id="{$id}" ! space-before.optimum="1em" ! space-before.minimum="0.8em" ! space-before.maximum="1.2em"> <xsl:if test="./title"> <fo:block font-weight="bold"> --- 401,405 ---- <xsl:variable name="steps" select="step"/> ! <fo:block id="{$id}" xsl:use-attribute-sets="list.block.spacing"> <xsl:if test="./title"> <fo:block font-weight="bold"> *************** *** 440,450 **** <fo:list-item> <fo:list-item-label end-indent="label-end()"> ! <fo:block id="{$id}" ! space-before.optimum="1em" ! space-before.minimum="0.8em" ! space-before.maximum="1.2em"> ! <xsl:apply-templates select="." mode="number"> ! <xsl:with-param name="recursive" select="0"/> ! </xsl:apply-templates> </fo:block> </fo:list-item-label> --- 437,452 ---- <fo:list-item> <fo:list-item-label end-indent="label-end()"> ! <fo:block id="{$id}" xsl:use-attribute-sets="list.item.spacing"> ! <!-- dwc: fix for one step procedures. Use a bullet if there's no step 2 --> ! <xsl:choose> ! <xsl:when test="count(../step) = 1"> ! <xsl:text>•</xsl:text> ! </xsl:when> ! <xsl:otherwise> ! <xsl:apply-templates select="." mode="number"> ! <xsl:with-param name="recursive" select="0"/> ! </xsl:apply-templates>. ! </xsl:otherwise> ! </xsl:choose> </fo:block> </fo:list-item-label> |