[docbook-checkins] CVS: xsl/html biblio.xsl,1.12,1.13 inline.xsl,1.23,1.24 param.ent,1.50,1.51 param.xweb,1.53,1.54

[Norman W. <nw...@us...>]

Update of /cvsroot/docbook/xsl/html
In directory usw-pr-cvs1:/tmp/cvs-serv8877

Modified Files:
	biblio.xsl inline.xsl param.ent param.xweb 
Log Message:
Support menuchoice.menu.separator, menuchoice.separator, and bibliography.numbered

Index: biblio.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/biblio.xsl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** biblio.xsl	9 Jul 2002 12:31:49 -0000	1.12
--- biblio.xsl	19 Jul 2002 11:00:54 -0000	1.13
***************
*** 164,167 ****
--- 164,172 ----
  
    <xsl:choose>
+     <xsl:when test="$bibliography.numbered != 0">
+       <xsl:text>[</xsl:text>
+       <xsl:number from="bibliography" count="biblioentry|bibliomixed" format="1"/>
+       <xsl:text>] </xsl:text>
+     </xsl:when>
      <xsl:when test="local-name($node/child::*[1]) = 'abbrev'">
        <xsl:text>[</xsl:text>

Index: inline.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/html/inline.xsl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** inline.xsl	16 Jul 2002 21:25:30 -0000	1.23
--- inline.xsl	19 Jul 2002 11:00:54 -0000	1.24
***************
*** 931,937 ****
          <xsl:when test="name($node)='guimenuitem'
                          or name($node)='guisubmenu'">
!           <xsl:text>-&gt;</xsl:text>
          </xsl:when>
!         <xsl:otherwise>+</xsl:otherwise>
        </xsl:choose>
        <xsl:apply-templates select="$node"/>
--- 931,939 ----
          <xsl:when test="name($node)='guimenuitem'
                          or name($node)='guisubmenu'">
!           <xsl:value-of select="$menuchoice.menu.separator"/>
          </xsl:when>
!         <xsl:otherwise>
!           <xsl:value-of select="$menuchoice.separator"/>
!         </xsl:otherwise>
        </xsl:choose>
        <xsl:apply-templates select="$node"/>

Index: param.ent
===================================================================
RCS file: /cvsroot/docbook/xsl/html/param.ent,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -r1.50 -r1.51
*** param.ent	18 Jul 2002 11:18:42 -0000	1.50
--- param.ent	19 Jul 2002 11:00:54 -0000	1.51
***************
*** 207,208 ****
--- 207,211 ----
  <!ENTITY html.cellpadding SYSTEM "../params/html.cellpadding.xml">
  <!ENTITY html.cellspacing SYSTEM "../params/html.cellspacing.xml">
+ <!ENTITY menuchoice.separator SYSTEM "../params/menuchoice.separator.xml">
+ <!ENTITY menuchoice.menu.separator SYSTEM "../params/menuchoice.menu.separator.xml">
+ <!ENTITY bibliography.numbered SYSTEM "../params/bibliography.numbered.xml">

Index: param.xweb
===================================================================
RCS file: /cvsroot/docbook/xsl/html/param.xweb,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -r1.53 -r1.54
*** param.xweb	18 Jul 2002 11:18:42 -0000	1.53
--- param.xweb	19 Jul 2002 11:00:54 -0000	1.54
***************
*** 209,212 ****
--- 209,213 ----
  &biblioentry.item.separator;
  &bibliography.collection;
+ &bibliography.numbered;
  </reference>
  
***************
*** 236,239 ****
--- 237,242 ----
  &use.svg;
  &use.role.as.xrefstyle;
+ &menuchoice.separator;
+ &menuchoice.menu.separator;
  </reference>
  
***************
*** 374,377 ****
--- 377,381 ----
  <src:fragref linkend="biblioentry.item.separator.frag"/>
  <src:fragref linkend="bibliography.collection.frag"/>
+ <src:fragref linkend="bibliography.numbered.frag"/>
  <src:fragref linkend="bridgehead.in.toc.frag"/>
  <src:fragref linkend="callout.defaultcolumn.frag"/>
***************
*** 481,484 ****
--- 485,490 ----
  <src:fragref linkend="manifest.frag"/>
  <src:fragref linkend="manual.toc.frag"/>
+ <src:fragref linkend="menuchoice.menu.separator.frag"/>
+ <src:fragref linkend="menuchoice.separator.frag"/>
  <src:fragref linkend="navig.graphics.extension.frag"/>
  <src:fragref linkend="navig.graphics.frag"/>