You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2004/03/09 23:44:35 UTC

cvs commit: xml-fop/examples/fo/pagination basic2.fo basic1.fo

gmazza      2004/03/09 14:44:35

  Modified:    examples/fo/basic bordershorthand.fo corresprop.fo
                        inhprop.fo normal.fo normalex.fo
               examples/fo/pagination basic2.fo
  Removed:     examples/fo/pagination basic1.fo
  Log:
  Some consolidation of information about page-sequence-master and simple-page-master; removal of basic1.fo (not informative, also duplicated elsewhere.)
  
  Revision  Changes    Path
  1.3       +10 -19    xml-fop/examples/fo/basic/bordershorthand.fo
  
  Index: bordershorthand.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/fo/basic/bordershorthand.fo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- bordershorthand.fo	29 Jan 2003 16:07:18 -0000	1.2
  +++ bordershorthand.fo	9 Mar 2004 22:44:34 -0000	1.3
  @@ -10,15 +10,6 @@
   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
     <fo:layout-master-set>
  -  <!-- fo:layout-master-set defines in its children the page layout:
  -       the pagination and layout specifications
  -       - page-masters: have the role of describing the intended subdivisions
  -                       of a page and the geometry of these subdivisions
  -       - page-sequence-masters: have the role of describing the sequence
  -                                of page-masters that will be used to generate
  -                                pages during the formatting of an fo:page-sequence
  -
  -  -->
   
       <!-- layout for the first page -->
       <fo:simple-page-master master-name="first"
  @@ -46,16 +37,16 @@
         <fo:region-after extent="1.5cm"/>
       </fo:simple-page-master>
   
  -<fo:page-sequence-master master-name="basicPSM" >
  -  <fo:repeatable-page-master-alternatives>
  -    <fo:conditional-page-master-reference master-reference="first"
  -      page-position="first" />
  -    <fo:conditional-page-master-reference master-reference="rest"
  -      page-position="rest" />
  -    <!-- recommended fallback procedure -->
  -    <fo:conditional-page-master-reference master-reference="rest" />
  -  </fo:repeatable-page-master-alternatives>
  -</fo:page-sequence-master>
  +    <fo:page-sequence-master master-name="basicPSM" >
  +      <fo:repeatable-page-master-alternatives>
  +        <fo:conditional-page-master-reference master-reference="first"
  +          page-position="first" />
  +        <fo:conditional-page-master-reference master-reference="rest"
  +          page-position="rest" />
  +        <!-- recommended fallback procedure -->
  +        <fo:conditional-page-master-reference master-reference="rest" />
  +      </fo:repeatable-page-master-alternatives>
  +    </fo:page-sequence-master>
   
     </fo:layout-master-set>
     <!-- end: defines page layout -->
  
  
  
  1.3       +0 -9      xml-fop/examples/fo/basic/corresprop.fo
  
  Index: corresprop.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/fo/basic/corresprop.fo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- corresprop.fo	29 Jan 2003 16:07:18 -0000	1.2
  +++ corresprop.fo	9 Mar 2004 22:44:34 -0000	1.3
  @@ -10,15 +10,6 @@
   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
     <fo:layout-master-set>
  -  <!-- fo:layout-master-set defines in its children the page layout:
  -       the pagination and layout specifications
  -       - page-masters: have the role of describing the intended subdivisions
  -                       of a page and the geometry of these subdivisions
  -       - page-sequence-masters: have the role of describing the sequence
  -                                of page-masters that will be used to generate
  -                                pages during the formatting of an fo:page-sequence
  -
  -  -->
   
       <!-- layout for the first page -->
       <fo:simple-page-master master-name="first"
  
  
  
  1.3       +0 -9      xml-fop/examples/fo/basic/inhprop.fo
  
  Index: inhprop.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/fo/basic/inhprop.fo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- inhprop.fo	29 Jan 2003 16:07:20 -0000	1.2
  +++ inhprop.fo	9 Mar 2004 22:44:34 -0000	1.3
  @@ -10,15 +10,6 @@
   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
     <fo:layout-master-set>
  -  <!-- fo:layout-master-set defines in its children the page layout:
  -       the pagination and layout specifications
  -       - page-masters: have the role of describing the intended subdivisions
  -                       of a page and the geometry of these subdivisions
  -       - page-sequence-masters: have the role of describing the sequence
  -                                of page-masters that will be used to generate
  -                                pages during the formatting of an fo:page-sequence
  -
  -  -->
   
       <!-- layout for the first page -->
       <fo:simple-page-master master-name="first"
  
  
  
  1.4       +0 -9      xml-fop/examples/fo/basic/normal.fo
  
  Index: normal.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/fo/basic/normal.fo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- normal.fo	22 Feb 2004 13:37:06 -0000	1.3
  +++ normal.fo	9 Mar 2004 22:44:34 -0000	1.4
  @@ -10,15 +10,6 @@
   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
     <fo:layout-master-set>
  -  <!-- fo:layout-master-set defines in its children the page layout:
  -       the pagination and layout specifications
  -       - page-masters: have the role of describing the intended subdivisions
  -                       of a page and the geometry of these subdivisions
  -       - page-sequence-masters: have the role of describing the sequence
  -                                of page-masters that will be used to generate
  -                                pages during the formatting of an fo:page-sequence
  -
  -  -->
   
       <!-- layout for the first page -->
       <fo:simple-page-master master-name="first"
  
  
  
  1.4       +0 -9      xml-fop/examples/fo/basic/normalex.fo
  
  Index: normalex.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/fo/basic/normalex.fo,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- normalex.fo	22 Feb 2004 13:37:06 -0000	1.3
  +++ normalex.fo	9 Mar 2004 22:44:34 -0000	1.4
  @@ -10,15 +10,6 @@
   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
     <fo:layout-master-set>
  -  <!-- fo:layout-master-set defines in its children the page layout:
  -       the pagination and layout specifications
  -       - page-masters: have the role of describing the intended subdivisions
  -                       of a page and the geometry of these subdivisions
  -       - page-sequence-masters: have the role of describing the sequence
  -                                of page-masters that will be used to generate
  -                                pages during the formatting of an fo:page-sequence
  -
  -  -->
   
       <!-- layout for the first page -->
       <fo:simple-page-master master-name="first"
  
  
  
  1.3       +20 -5     xml-fop/examples/fo/pagination/basic2.fo
  
  Index: basic2.fo
  ===================================================================
  RCS file: /home/cvs/xml-fop/examples/fo/pagination/basic2.fo,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- basic2.fo	29 Jan 2003 16:07:50 -0000	1.2
  +++ basic2.fo	9 Mar 2004 22:44:35 -0000	1.3
  @@ -1,12 +1,26 @@
   <?xml version="1.0" encoding="utf-8"?>
   
  +<!-- This example shows the simplest use of an fo:page-sequence-master (PSM), 
  +    having only a single fo:simple-page-master-reference.
  +    
  +    Note that because only a single fo:simple-page-master-reference is being
  +    used, this PSM can actually be omitted.  Instead, the fo:page-sequence's 
  +    master-reference can be set directly to the master-name attribute 
  +    ("SPM_Name") of the fo:simple-page-master (SPM).
  +    
  +    Also note that using a single fo:single-page-master-reference (as opposed 
  +    to a fo:repeatable-page-master-reference) within the PSM limits you 
  +    to one (1) page for the referencing fo:page-sequence.  If the fo:page-sequence's
  +    master-reference is set to the master-name of the SPM, however, the number
  +    of pages that can be output using that SPM is unbounded.
  +-->
   <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
   
     <!-- defines page layout -->
     <fo:layout-master-set>
   
       <!-- layout for the first page -->
  -    <fo:simple-page-master master-name="only"
  +    <fo:simple-page-master master-name="SPM_Name"
                     page-height="29.7cm"
                     page-width="21cm"
                     margin-top="1cm"
  @@ -18,14 +32,15 @@
         <fo:region-after extent="1.5cm"/>
       </fo:simple-page-master>
   
  -  <fo:page-sequence-master master-name="single">
  -    <fo:single-page-master-reference master-reference="only"/>
  +  <fo:page-sequence-master master-name="PSM_Name">
  +    <fo:single-page-master-reference master-reference="SPM_Name"/>
     </fo:page-sequence-master>
     </fo:layout-master-set>
     <!-- end: defines page layout -->
   
  -  <!-- actual layout -->
  -  <fo:page-sequence master-reference="single" initial-page-number="1">
  +  <!-- actual layout, note master-reference can alternatively be set to
  +       SPM_Name as mentioned above -->
  +  <fo:page-sequence master-reference="PSM_Name" initial-page-number="1">
   
       <!-- usage of page layout -->
       <!-- header -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: fop-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: fop-cvs-help@xml.apache.org