[docbook-checkins] CVS: xsl/fo Makefile,1.7,1.8 component.xsl,1.10,1.11 division.xsl,1.9,1.10 fop.xsl,1.5,1.6 param.ent,1.20,1.21 param.xweb,1.22,1.23 xep.xsl,1.11,1.12

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

Update of /cvsroot/docbook/xsl/fo
In directory usw-pr-cvs1:/tmp/cvs-serv27262

Modified Files:
	Makefile component.xsl division.xsl fop.xsl param.ent 
	param.xweb xep.xsl 
Log Message:
Replace generate.*.toc and generate.*.lot with single generate.toc parameter.

Index: Makefile
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile	1 Mar 2002 17:25:26 -0000	1.7
--- Makefile	18 Mar 2002 13:39:11 -0000	1.8
***************
*** 2,5 ****
--- 2,8 ----
  XJPARSE=../../cvstools/xjparse
  
+ PARAMPROF=.param.profiled
+ PARAMSTRIP=.param.stripped
+ 
  include Makefile.param
  
***************
*** 7,20 ****
  
  param.html: param.xml
- 	../../cvstools/paramchk -m Makefile.param $<
  	$(XSLT) $< ../docsrc/lrefentry.xsl $@
  
  param.xml: param.xweb $(PARAMS)
  	../../cvstools/paramchk -m Makefile.param $<
! 	$(XSLT) $< ../../litprog/wdocbook.xsl $@
  
  param.xsl: param.xweb $(PARAMS)
  	../../cvstools/paramchk -m Makefile.param $<
! 	$(XSLT) $< ../../litprog/xtangle.xsl $@
  
  titlepage.templates.xsl: titlepage.templates.xml ../template/titlepage.xsl
--- 10,28 ----
  
  param.html: param.xml
  	$(XSLT) $< ../docsrc/lrefentry.xsl $@
  
  param.xml: param.xweb $(PARAMS)
  	../../cvstools/paramchk -m Makefile.param $<
! 	$(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=fo
! 	$(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
! 	$(XSLT) $(PARAMSTRIP) ../../litprog/wdocbook.xsl $@
! 	$(RM) $(PARAMPROF) $(PARAMSTRIP)
  
  param.xsl: param.xweb $(PARAMS)
  	../../cvstools/paramchk -m Makefile.param $<
! 	$(XSLT) $< ../profiling/profile.xsl $(PARAMPROF) profile.condition=fo
! 	$(XSLT) $(PARAMPROF) ../profiling/strip-attributes.xsl $(PARAMSTRIP) attributes=condition
! 	$(XSLT) $(PARAMSTRIP) ../../litprog/xtangle.xsl $@
! 	$(RM) $(PARAMPROF) $(PARAMSTRIP)
  
  titlepage.templates.xsl: titlepage.templates.xml ../template/titlepage.xsl
***************
*** 26,27 ****
--- 34,42 ----
  profile-docbook.xsl:
  	$(XSLT) docbook.xsl ../profiling/xsl2profile.xsl $@
+ 
+ clean:
+ 	$(RM) param.xml param.html param.xsl \
+               profile-docbook.xsl \
+               titlepage.templates.xsl
+ 	$(RM) Makefile.param
+ 	echo "# foo" > Makefile.param

Index: component.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/component.xsl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** component.xsl	14 Mar 2002 18:43:34 -0000	1.10
--- component.xsl	18 Mar 2002 13:39:11 -0000	1.11
***************
*** 178,184 ****
        <xsl:call-template name="component.separator"/>
        <xsl:call-template name="preface.titlepage"/>
!       <xsl:if test="$generate.component.toc">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
        <xsl:apply-templates/>
      </fo:flow>
--- 178,191 ----
        <xsl:call-template name="component.separator"/>
        <xsl:call-template name="preface.titlepage"/>
! 
!       <xsl:variable name="toc.params">
!         <xsl:call-template name="find.path.params">
!           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!         </xsl:call-template>
!       </xsl:variable>
!       <xsl:if test="contains($toc.params, 'toc')">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
+ 
        <xsl:apply-templates/>
      </fo:flow>
***************
*** 225,229 ****
        <xsl:call-template name="component.separator"/>
        <xsl:call-template name="chapter.titlepage"/>
!       <xsl:if test="$generate.component.toc">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
--- 232,242 ----
        <xsl:call-template name="component.separator"/>
        <xsl:call-template name="chapter.titlepage"/>
! 
!       <xsl:variable name="toc.params">
!         <xsl:call-template name="find.path.params">
!           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!         </xsl:call-template>
!       </xsl:variable>
!       <xsl:if test="contains($toc.params, 'toc')">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
***************
*** 266,270 ****
        <xsl:call-template name="component.separator"/>
        <xsl:call-template name="appendix.titlepage"/>
!       <xsl:if test="$generate.component.toc">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
--- 279,289 ----
        <xsl:call-template name="component.separator"/>
        <xsl:call-template name="appendix.titlepage"/>
! 
!       <xsl:variable name="toc.params">
!         <xsl:call-template name="find.path.params">
!           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!         </xsl:call-template>
!       </xsl:variable>
!       <xsl:if test="contains($toc.params, 'toc')">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
***************
*** 374,378 ****
      <fo:flow flow-name="xsl-region-body">
        <xsl:call-template name="article.titlepage"/>
!       <xsl:if test="$generate.component.toc">
          <xsl:call-template name="component.toc"/>
        </xsl:if>
--- 393,403 ----
      <fo:flow flow-name="xsl-region-body">
        <xsl:call-template name="article.titlepage"/>
! 
!       <xsl:variable name="toc.params">
!         <xsl:call-template name="find.path.params">
!           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!         </xsl:call-template>
!       </xsl:variable>
!       <xsl:if test="contains($toc.params, 'toc')">
          <xsl:call-template name="component.toc"/>
        </xsl:if>

Index: division.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/division.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** division.xsl	14 Mar 2002 18:43:34 -0000	1.9
--- division.xsl	18 Mar 2002 13:39:11 -0000	1.10
***************
*** 78,82 ****
    </xsl:if>
  
!   <xsl:if test="$generate.set.toc != '0'">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
--- 78,87 ----
    </xsl:if>
  
!   <xsl:variable name="toc.params">
!     <xsl:call-template name="find.path.params">
!       <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!     </xsl:call-template>
!   </xsl:variable>
!   <xsl:if test="contains($toc.params, 'toc')">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
***************
*** 149,153 ****
    <xsl:apply-templates select="dedication" mode="dedication"/>
  
!   <xsl:if test="$generate.book.toc != '0'">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
--- 154,163 ----
    <xsl:apply-templates select="dedication" mode="dedication"/>
  
!   <xsl:variable name="toc.params">
!     <xsl:call-template name="find.path.params">
!       <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!     </xsl:call-template>
!   </xsl:variable>
!   <xsl:if test="contains($toc.params, 'toc')">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
***************
*** 172,176 ****
    </xsl:if>
  
!   <xsl:if test="$generate.book.figure.lot != '0' and .//figure">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
--- 182,186 ----
    </xsl:if>
  
!   <xsl:if test="contains($toc.params,'figure') and .//figure">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
***************
*** 198,202 ****
    </xsl:if>
  
!   <xsl:if test="$generate.book.table.lot != '0' and .//table">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
--- 208,212 ----
    </xsl:if>
  
!   <xsl:if test="contains($toc.params,'table') and .//table">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
***************
*** 224,228 ****
    </xsl:if>
  
!   <xsl:if test="$generate.book.example.lot != '0' and .//example">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
--- 234,238 ----
    </xsl:if>
  
!   <xsl:if test="contains($toc.params,'example') and .//example">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
***************
*** 250,254 ****
    </xsl:if>
  
!   <xsl:if test="$generate.book.equation.lot != '0' and .//equation">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"
--- 260,264 ----
    </xsl:if>
  
!   <xsl:if test="contains($toc.params,'equation') and .//equation">
      <fo:page-sequence hyphenate="{$hyphenate}"
                        format="i"

Index: fop.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/fop.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fop.xsl	14 Mar 2002 18:43:34 -0000	1.5
--- fop.xsl	18 Mar 2002 13:39:11 -0000	1.6
***************
*** 57,62 ****
          </fox:label>
        </fox:outline>
!       <xsl:if test="(local-name(.) = 'set' and $generate.set.toc != 0)
!                     or (local-name(.) = 'book' and $generate.book.toc != 0)">
          <fox:outline internal-destination="toc...{$id}">
            <fox:label>
--- 57,67 ----
          </fox:label>
        </fox:outline>
! 
!       <xsl:variable name="toc.params">
!         <xsl:call-template name="find.path.params">
!           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!         </xsl:call-template>
!       </xsl:variable>
!       <xsl:if test="contains($toc.params, 'toc')">
          <fox:outline internal-destination="toc...{$id}">
            <fox:label>

Index: param.ent
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/param.ent,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** param.ent	14 Mar 2002 18:43:34 -0000	1.20
--- param.ent	18 Mar 2002 13:39:11 -0000	1.21
***************
*** 46,62 ****
  <!ENTITY funcsynopsis.style SYSTEM "../params/funcsynopsis.style.xml">
  <!ENTITY function.parens SYSTEM "../params/function.parens.xml">
- <!ENTITY generate.book.equation.lot SYSTEM "../params/generate.book.equation.lot.xml">
- <!ENTITY generate.book.example.lot SYSTEM "../params/generate.book.example.lot.xml">
- <!ENTITY generate.book.figure.lot SYSTEM "../params/generate.book.figure.lot.xml">
- <!ENTITY generate.book.table.lot SYSTEM "../params/generate.book.table.lot.xml">
- <!ENTITY generate.book.toc SYSTEM "../params/generate.book.toc.xml">
- <!ENTITY generate.component.toc SYSTEM "../params/generate.component.toc.xml">
- <!ENTITY generate.division.equation.lot SYSTEM "../params/generate.division.equation.lot.xml">
- <!ENTITY generate.division.example.lot SYSTEM "../params/generate.division.example.lot.xml">
- <!ENTITY generate.division.figure.lot SYSTEM "../params/generate.division.figure.lot.xml">
- <!ENTITY generate.division.table.lot SYSTEM "../params/generate.division.table.lot.xml">
- <!ENTITY generate.division.toc SYSTEM "../params/generate.division.toc.xml">
  <!ENTITY generate.index SYSTEM "../params/generate.index.xml">
! <!ENTITY generate.set.toc SYSTEM "../params/generate.set.toc.xml">
  <!ENTITY glossary.collection SYSTEM "../params/glossary.collection.xml">
  <!ENTITY glossterm.auto.link SYSTEM "../params/glossterm.auto.link.xml">
--- 46,51 ----
  <!ENTITY funcsynopsis.style SYSTEM "../params/funcsynopsis.style.xml">
  <!ENTITY function.parens SYSTEM "../params/function.parens.xml">
  <!ENTITY generate.index SYSTEM "../params/generate.index.xml">
! <!ENTITY generate.toc SYSTEM "../params/generate.toc.xml">
  <!ENTITY glossary.collection SYSTEM "../params/glossary.collection.xml">
  <!ENTITY glossterm.auto.link SYSTEM "../params/glossterm.auto.link.xml">

Index: param.xweb
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/param.xweb,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** param.xweb	14 Mar 2002 18:43:34 -0000	1.22
--- param.xweb	18 Mar 2002 13:39:11 -0000	1.23
***************
*** 86,105 ****
  &process.empty.source.toc;
  &process.source.toc;
! &generate.book.equation.lot;
! &generate.book.example.lot;
! &generate.book.figure.lot;
! &generate.book.table.lot;
! &generate.book.toc;
! &generate.set.toc;
! &generate.component.toc;
! &generate.division.equation.lot;
! &generate.division.example.lot;
! &generate.division.figure.lot;
! &generate.division.table.lot;
! &generate.division.toc;
  &generate.index;
  &toc.section.depth;
  &toc.indent.width;
  &toc.margin.properties;
  </reference>
  
--- 86,102 ----
  &process.empty.source.toc;
  &process.source.toc;
! &generate.toc;
  &generate.index;
  &toc.section.depth;
  &toc.indent.width;
  &toc.margin.properties;
+ 
+ <!--
+ annotate.toc;
+ bridgehead.in.toc;
+ manual.toc;
+ generate.section.toc.level;
+ -->
+ 
  </reference>
  
***************
*** 417,433 ****
  <src:fragref linkend="funcsynopsis.style.frag"/>
  <src:fragref linkend="function.parens.frag"/>
- <src:fragref linkend="generate.book.equation.lot.frag"/>
- <src:fragref linkend="generate.book.example.lot.frag"/>
- <src:fragref linkend="generate.book.figure.lot.frag"/>
- <src:fragref linkend="generate.book.table.lot.frag"/>
- <src:fragref linkend="generate.book.toc.frag"/>
- <src:fragref linkend="generate.component.toc.frag"/>
- <src:fragref linkend="generate.division.equation.lot.frag"/>
- <src:fragref linkend="generate.division.example.lot.frag"/>
- <src:fragref linkend="generate.division.figure.lot.frag"/>
- <src:fragref linkend="generate.division.table.lot.frag"/>
- <src:fragref linkend="generate.division.toc.frag"/>
  <src:fragref linkend="generate.index.frag"/>
! <src:fragref linkend="generate.set.toc.frag"/>
  <src:fragref linkend="glossary.collection.frag"/>
  <src:fragref linkend="glossterm.auto.link.frag"/>
--- 414,419 ----
  <src:fragref linkend="funcsynopsis.style.frag"/>
  <src:fragref linkend="function.parens.frag"/>
  <src:fragref linkend="generate.index.frag"/>
! <src:fragref linkend="generate.toc.frag"/>
  <src:fragref linkend="glossary.collection.frag"/>
  <src:fragref linkend="glossterm.auto.link.frag"/>

Index: xep.xsl
===================================================================
RCS file: /cvsroot/docbook/xsl/fo/xep.xsl,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** xep.xsl	14 Mar 2002 18:43:35 -0000	1.11
--- xep.xsl	18 Mar 2002 13:39:11 -0000	1.12
***************
*** 91,96 ****
          </rx:bookmark-label>
        </rx:bookmark>
!       <xsl:if test="(local-name(.) = 'set' and $generate.set.toc != 0)
!                     or (local-name(.) = 'book' and $generate.book.toc != 0)">
          <rx:bookmark internal-destination="toc...{$id}">
            <rx:bookmark-label>
--- 91,101 ----
          </rx:bookmark-label>
        </rx:bookmark>
! 
!       <xsl:variable name="toc.params">
!         <xsl:call-template name="find.path.params">
!           <xsl:with-param name="table" select="normalize-space($generate.toc)"/>
!         </xsl:call-template>
!       </xsl:variable>
!       <xsl:if test="contains($toc.params, 'toc')">
          <rx:bookmark internal-destination="toc...{$id}">
            <rx:bookmark-label>