using leader-length instead of maximum

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@193916 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 94 insertions, 43 deletions

diff --git a/docs/examples/fo/leader.fo b/docs/examples/fo/leader.fo
index 1e147f9b9..818ee4ade 100644
--- a/docs/examples/fo/leader.fo
+++ b/docs/examples/fo/leader.fo
@@ -49,21 +49,21 @@
       <!-- Inserts a leader (space)   -->
       <fo:block text-align="start">Entry 1 
         <fo:leader leader-pattern="space" 
-                   leader-length.maximum="6cm"/>p. 12
+                   leader-length="6cm"/>p. 12
       </fo:block>
 
       <!-- Inserts a leader (space)   -->
       <fo:block text-align="start">Entry 2 
         <fo:leader leader-pattern="space" 
-                   leader-length.maximum="6cm"/>p. 24
+                   leader-length="6cm"/>p. 24
       </fo:block>
 
       <!-- Inserts a leader (space)   -->
       <fo:block text-align="start">Left side  
         <fo:leader leader-pattern="space" 
-                   leader-length.maximum="5.5cm"/>middle
+                   leader-length="5.5cm"/>middle
         <fo:leader leader-pattern="space" 
-                   leader-length.maximum="5.5cm"/>right side
+                   leader-length="5.5cm"/>right side
       </fo:block>
 
 
@@ -79,13 +79,13 @@
       <!-- Inserts a leader (dots)   -->
       <fo:block text-align="start">Entry 1 
         <fo:leader leader-pattern="dots" 
-                   leader-length.maximum="6cm"/>p. 12
+                   leader-length="6cm"/>p. 12
       </fo:block>
 
       <!-- Inserts a leader (dots)   -->
       <fo:block text-align="start">Entry 2 
         <fo:leader leader-pattern="dots" 
-                   leader-length.maximum="6cm"/>p. 24
+                   leader-length="6cm"/>p. 24
       </fo:block>
 
 
@@ -102,14 +102,14 @@
       <fo:block text-align="start">Entry 1 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="5pt"
-                   leader-length.maximum="6cm"/>p. 12
+                   leader-length="6cm"/>p. 12
       </fo:block>
 
       <!-- Inserts a leader (dots)   -->
       <fo:block text-align="start">Entry 2 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="5pt"
-                   leader-length.maximum="6cm"/>p. 24
+                   leader-length="6cm"/>p. 24
       </fo:block>
 
 
@@ -117,14 +117,14 @@
       <fo:block text-align="start">Entry 1 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
-                   leader-length.maximum="6cm"/>p. 12
+                   leader-length="6cm"/>p. 12
       </fo:block>
 
       <!-- Inserts a leader (dots)   -->
       <fo:block text-align="start">Entry 2 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
-                   leader-length.maximum="6cm"/>p. 24
+                   leader-length="6cm"/>p. 24
       </fo:block>
 
       <fo:block font-size="12pt" 
@@ -147,7 +147,7 @@
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="5pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="6cm"/>p. 12
+                   leader-length="6cm"/>p. 12
       </fo:block>
 
       <!-- Inserts a leader (dots)   -->
@@ -155,7 +155,7 @@
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="5pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="6cm"/>p. 24
+                   leader-length="6cm"/>p. 24
       </fo:block>
 
       <!-- Inserts a leader (dots)   -->
@@ -163,7 +163,7 @@
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="5pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="6cm"/>p. 36
+                   leader-length="6cm"/>p. 36
       </fo:block>
 
       <!-- Inserts a leader (dots)   -->
@@ -171,7 +171,7 @@
         <fo:leader leader-pattern="dots" 
                    leader-alignment="reference-area"
                    leader-pattern-width="5pt"
-                   leader-length.maximum="6cm"/>p. 48
+                   leader-length="6cm"/>p. 48
       </fo:block>
 
 
@@ -179,7 +179,7 @@
       <fo:block text-align="start">1 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
-                   leader-length.maximum="6cm"
+                   leader-length="6cm"
                    leader-alignment="reference-area"/>p. 12
       </fo:block>
 
@@ -187,7 +187,7 @@
       <fo:block text-align="start">Entry 2 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
-                   leader-length.maximum="6cm"
+                   leader-length="6cm"
                    leader-alignment="reference-area"/>p. 24
       </fo:block>
 
@@ -196,7 +196,7 @@
       <fo:block text-align="start">Entry 3 is longer 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
-                   leader-length.maximum="6cm"
+                   leader-length="6cm"
                    leader-alignment="reference-area"/>p. 36
       </fo:block>
 
@@ -204,7 +204,7 @@
       <fo:block text-align="start">Entry 4 is even longer 
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
-                   leader-length.maximum="6cm"
+                   leader-length="6cm"
                    leader-alignment="reference-area"/>p. 48
       </fo:block>
 
@@ -234,7 +234,7 @@
               <fo:block text-align="start">Entry 1 
                 <fo:leader leader-pattern="dots" 
                            leader-pattern-width="5pt"
-                           leader-length.maximum="6cm"/>p. 12
+                           leader-length="6cm"/>p. 12
               </fo:block>
             </fo:block>
           </fo:list-item-body>
@@ -253,7 +253,7 @@
               <fo:block text-align="start">Entry 2 
                 <fo:leader leader-pattern="dots" 
                            leader-pattern-width="5pt"
-                           leader-length.maximum="6cm"/>p. 24
+                           leader-length="6cm"/>p. 24
               </fo:block>
             </fo:block>
           </fo:list-item-body>
@@ -283,7 +283,7 @@
               <fo:block text-align="start"> 
                 <fo:leader leader-pattern="dots" 
                            leader-pattern-width="8pt"
-                           leader-length.maximum="6cm"/>
+                           leader-length="6cm"/>
               </fo:block>
           </fo:table-cell>
           <fo:table-cell ><fo:block>p. 12</fo:block></fo:table-cell>
@@ -294,7 +294,7 @@
               <fo:block text-align="start"> 
                 <fo:leader leader-pattern="dots" 
                            leader-pattern-width="8pt"
-                           leader-length.maximum="6cm"/>
+                           leader-length="6cm"/>
               </fo:block>
           </fo:table-cell>
           <fo:table-cell ><fo:block>p. 24</fo:block></fo:table-cell>
@@ -305,7 +305,7 @@
               <fo:block text-align="start"> 
                 <fo:leader leader-pattern="dots" 
                            leader-pattern-width="8pt"
-                           leader-length.maximum="6cm"/>
+                           leader-length="6cm"/>
               </fo:block>
           </fo:table-cell>
           <fo:table-cell ><fo:block>p. 36</fo:block></fo:table-cell>
@@ -456,7 +456,58 @@
                    space-after.optimum="12pt"> 
         <fo:leader leader-pattern="rule" 
                    rule-thickness="1.0pt"
-                   leader-length.maximum="6cm"/> 
+                   leader-length="6cm"/> 
+      </fo:block>
+
+      <!-- Inserts a leader (rule). Because leader is an inline fo you have 
+           to wrap it into a block element  -->
+      <fo:block text-align="center"
+                   space-before.optimum="12pt"
+                   space-after.optimum="12pt"> 
+        <fo:leader leader-pattern="rule" 
+                   rule-thickness="2.0pt"
+                   leader-length="6cm"/>
+      </fo:block>
+
+      <!-- Inserts a leader (rule). Because leader is an inline fo you have 
+           to wrap it into a block element  -->
+      <fo:block text-align="center"
+                   space-before.optimum="12pt"
+                   space-after.optimum="12pt"> 
+        <fo:leader leader-pattern="rule" 
+                   rule-thickness="3.0pt"
+                   leader-length="6cm"/>
+      </fo:block>
+
+      <!-- Inserts a leader (rule). Because leader is an inline fo you have 
+           to wrap it into a block element  -->
+      <fo:block text-align="center"
+                   space-before.optimum="12pt"
+                   space-after.optimum="12pt"> 
+        <fo:leader leader-pattern="rule" 
+                   rule-thickness="4.0pt"
+                   leader-length="6cm"/>
+      </fo:block>
+
+
+      <!-- Normal text -->
+      <fo:block font-size="12pt" 
+                font-family="sans-serif" 
+                line-height="15pt"
+                space-before.optimum="5pt"
+                space-after.optimum="3pt"
+                text-align="start">
+        Here are 4 fo:leader with increasing rule-thickness (1pt, 2pt, 3pt, 4pt) and leader-length: 25%, 50%, 75%, 100%
+      </fo:block>
+
+      <!-- Inserts a leader (rule). Because leader is an inline fo you have 
+           to wrap it into a block element  -->
+      <fo:block text-align="center"
+                   space-before.optimum="12pt"
+                   space-after.optimum="12pt"> 
+        <fo:leader leader-pattern="rule" 
+                   rule-thickness="1.0pt"
+                   leader-length="25%"/> 
       </fo:block>
 
       <!-- Inserts a leader (rule). Because leader is an inline fo you have 
@@ -466,7 +517,7 @@
                    space-after.optimum="12pt"> 
         <fo:leader leader-pattern="rule" 
                    rule-thickness="2.0pt"
-                   leader-length.maximum="6cm"/>
+                   leader-length="50%"/>
       </fo:block>
 
       <!-- Inserts a leader (rule). Because leader is an inline fo you have 
@@ -476,7 +527,7 @@
                    space-after.optimum="12pt"> 
         <fo:leader leader-pattern="rule" 
                    rule-thickness="3.0pt"
-                   leader-length.maximum="6cm"/>
+                   leader-length="75%"/>
       </fo:block>
 
       <!-- Inserts a leader (rule). Because leader is an inline fo you have 
@@ -486,7 +537,7 @@
                    space-after.optimum="12pt"> 
         <fo:leader leader-pattern="rule" 
                    rule-thickness="4.0pt"
-                   leader-length.maximum="6cm"/>
+                   leader-length="100%"/>
       </fo:block>
 
 
@@ -503,7 +554,7 @@
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-length.minimum="2cm"
-                   leader-length.maximum="5cm"/>Here is some longer text. Here is some longer text. 
+                   leader-length.optimum="5cm"/>Here is some longer text. Here is some longer text. 
       Here is some longer text. Here is some longer text. Here is some longer text. 
       </fo:block>
 
@@ -512,7 +563,7 @@
         <fo:leader leader-pattern="dots" 
                    leader-pattern-width="5pt"
                    leader-length.minimum="2cm"
-                   leader-length.maximum="5cm"/>Here is some longer text. Here is some longer text. 
+                   leader-length.optimum="5cm"/>Here is some longer text. Here is some longer text. 
       Here is some longer text. Here is some longer text. Here is some longer text. 
       </fo:block>
 
@@ -520,7 +571,7 @@
       Here is some longer text. Here comes the leader (dots): 
         <fo:leader leader-pattern="dots" 
                    leader-length.minimum="2cm"
-                   leader-length.maximum="5cm"/>Here is some longer text. Here is some longer text. 
+                   leader-length.optimum="5cm"/>Here is some longer text. Here is some longer text. 
       Here is some longer text. Here is some longer text. Here is some longer text. 
       </fo:block>
 
@@ -529,7 +580,7 @@
       Here is some longer text. Here comes the leader (rule): 
         <fo:leader leader-pattern="rule" 
                    leader-length.minimum="2cm"
-                   leader-length.maximum="5cm"/>Here is some longer text. Here is some longer text. 
+                   leader-length.optimum="5cm"/>Here is some longer text. Here is some longer text. 
       Here is some longer text. Here is some longer text. Here is some longer text. 
       </fo:block>
 
@@ -537,7 +588,7 @@
       Here is some longer text. Here comes the leader (space): 
         <fo:leader leader-pattern="space" 
                    leader-length.minimum="2cm"
-                   leader-length.maximum="5cm"/>Here is some longer text. Here is some longer text. 
+                   leader-length.optimum="5cm"/>Here is some longer text. Here is some longer text. 
       Here is some longer text. Here is some longer text. Here is some longer text. 
       </fo:block>
 
@@ -557,7 +608,7 @@
       leader-pattern="dots"
       leader-pattern-width="8pt"
       leader-alignment="reference-area"
-      leader-length.maximum="14cm"
+      leader-length.optimum="14cm"
       </fo:block>
 
 
@@ -573,7 +624,7 @@
         <fo:table-cell><fo:block text-align="start">What is FOP?<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block></fo:table-cell>
+                   leader-length="14cm"/></fo:block></fo:table-cell>
         <fo:table-cell><fo:block text-align="end">1</fo:block></fo:table-cell>
         </fo:table-row>
 
@@ -583,7 +634,7 @@
         <fo:table-cell><fo:block text-align="start">Downloading FOP<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block></fo:table-cell>
+                   leader-length="14cm"/></fo:block></fo:table-cell>
         <fo:table-cell><fo:block text-align="end">2</fo:block></fo:table-cell>
         </fo:table-row>
 
@@ -592,7 +643,7 @@
         <fo:table-cell><fo:block text-align="start">Running FOP<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block></fo:table-cell>
+                   leader-length="14cm"/></fo:block></fo:table-cell>
         <fo:table-cell><fo:block text-align="end">3</fo:block></fo:table-cell>
         </fo:table-row>
 
@@ -601,7 +652,7 @@
         <fo:table-cell><fo:block text-align="start">Embedding FOP<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block></fo:table-cell>
+                   leader-length="14cm"/></fo:block></fo:table-cell>
         <fo:table-cell><fo:block text-align="end">4</fo:block></fo:table-cell>
         </fo:table-row>
 
@@ -610,7 +661,7 @@
         <fo:table-cell><fo:block text-align="start">What is Implemented?<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block></fo:table-cell>
+                   leader-length="14cm"/></fo:block></fo:table-cell>
         <fo:table-cell><fo:block text-align="end">5</fo:block></fo:table-cell>
         </fo:table-row>
 
@@ -686,27 +737,27 @@
 <fo:block text-align="start">What is FOP?<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block>
+                   leader-length="14cm"/></fo:block>
 
 <fo:block text-align="start">Downloading FOP<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block>
+                   leader-length="14cm"/></fo:block>
 
 <fo:block text-align="start">Running FOP<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block>
+                   leader-length="14cm"/></fo:block>
 
 <fo:block text-align="start">Embedding FOP<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block>
+                   leader-length="14cm"/></fo:block>
 
 <fo:block text-align="start">What is Implemented?<fo:leader leader-pattern="dots" 
                    leader-pattern-width="8pt"
                    leader-alignment="reference-area"
-                   leader-length.maximum="14cm"/></fo:block>
+                   leader-length="14cm"/></fo:block>