From: Robert S. <bob...@us...> - 2002-11-15 06:21:51
|
Update of /cvsroot/docbook/xsl/fo In directory usw-pr-cvs1:/tmp/cvs-serv12537 Modified Files: admon.xsl Log Message: Changed graphical.admonition template from an fo:table to an fo:list-block, so it works in both FOP and XEP. Index: admon.xsl =================================================================== RCS file: /cvsroot/docbook/xsl/fo/admon.xsl,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -r1.5 -r1.6 *** admon.xsl 6 May 2002 22:27:35 -0000 1.5 --- admon.xsl 15 Nov 2002 05:16:28 -0000 1.6 *************** *** 64,99 **** <xsl:call-template name="object.id"/> </xsl:variable> <fo:block id="{$id}"> ! <fo:table> ! <fo:table-body> ! <fo:table-row> ! <fo:table-cell number-rows-spanned="2"> <fo:block> ! <fo:external-graphic width="auto" height="auto"> <xsl:attribute name="src"> <xsl:call-template name="admon.graphic"/> </xsl:attribute> - <xsl:attribute name="content-width"> - <xsl:call-template name="admon.graphic.width"/> - </xsl:attribute> </fo:external-graphic> </fo:block> ! </fo:table-cell> ! <fo:table-cell> <fo:block xsl:use-attribute-sets="admonition.title.properties"> <xsl:apply-templates select="." mode="object.title.markup"/> </fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell number-columns-spanned="2"> <fo:block xsl:use-attribute-sets="admonition.properties"> <xsl:apply-templates/> </fo:block> ! </fo:table-cell> ! </fo:table-row> ! </fo:table-body> ! </fo:table> </fo:block> </xsl:template> --- 64,96 ---- <xsl:call-template name="object.id"/> </xsl:variable> + <xsl:variable name="graphic.width"> + <xsl:call-template name="admon.graphic.width"/> + </xsl:variable> <fo:block id="{$id}"> ! <fo:list-block provisional-distance-between-starts="{$graphic.width} + 18pt" ! provisional-label-separation="18pt" ! xsl:use-attribute-sets="list.block.spacing"> ! <fo:list-item> ! <fo:list-item-label end-indent="label-end()"> <fo:block> ! <fo:external-graphic width="auto" height="auto" ! content-width="{$graphic.width}" > <xsl:attribute name="src"> <xsl:call-template name="admon.graphic"/> </xsl:attribute> </fo:external-graphic> </fo:block> ! </fo:list-item-label> ! <fo:list-item-body start-indent="body-start()"> <fo:block xsl:use-attribute-sets="admonition.title.properties"> <xsl:apply-templates select="." mode="object.title.markup"/> </fo:block> <fo:block xsl:use-attribute-sets="admonition.properties"> <xsl:apply-templates/> </fo:block> ! </fo:list-item-body> ! </fo:list-item> ! </fo:list-block> </fo:block> </xsl:template> |