updates text-align/text-align-last values to xsl 2000 spec

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

6 files changed, 43 insertions, 23 deletions

diff --git a/docs/examples/fo/border.fo b/docs/examples/fo/border.fo
index c1e7aa56d..6e77e537c 100644
--- a/docs/examples/fo/border.fo
+++ b/docs/examples/fo/border.fo
@@ -122,10 +122,10 @@
                                 <fo:block text-align="start">DESCRIPTION</fo:block>
                             </fo:table-cell>
                             <fo:table-cell border-width="1pt" border-color="blue" border-style="solid" padding="3pt">
-                                <fo:block text-align="centered">RATE</fo:block>
+                                <fo:block text-align="center">RATE</fo:block>
                             </fo:table-cell>
                             <fo:table-cell border-width="1pt" border-color="orange" border-style="solid" padding="2pt">
-                                <fo:block text-align="centered">AMOUNT</fo:block>
+                                <fo:block text-align="center">AMOUNT</fo:block>
                             </fo:table-cell>
                         </fo:table-row>
                         <fo:table-row line-height="12pt">
diff --git a/docs/examples/fo/extensive.fo b/docs/examples/fo/extensive.fo
index 7641ee47e..6b858ab62 100644
--- a/docs/examples/fo/extensive.fo
+++ b/docs/examples/fo/extensive.fo
@@ -8,11 +8,11 @@
 <fo:flow>
 <fo:block>A Block</fo:block>
 <fo:block text-align="end">An End Aligned Block</fo:block>
-<fo:block text-align="centered">A Centered Block</fo:block>
+<fo:block text-align="center">A Centered Block</fo:block>
 <fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks. Alignment is default.</fo:block>
 <fo:block text-align="end">This is a multiple line block that extends over more than one line. There should be appropriate line breaks. Alignment is end.</fo:block>
-<fo:block text-align="centered">This is a multiple line block that extends over more than one line. There should be appropriate line breaks. Alignment is centered.</fo:block>
-<fo:block text-align="justified">This is a multiple line block that extends over more than one line. There should be appropriate line breaks. I'm going to keep going so I can get three lines to check how all but the last justify. There, that should do it. Alignment is justified.</fo:block>
+<fo:block text-align="center">This is a multiple line block that extends over more than one line. There should be appropriate line breaks. Alignment is centered.</fo:block>
+<fo:block text-align="justify">This is a multiple line block that extends over more than one line. There should be appropriate line breaks. I'm going to keep going so I can get three lines to check how all but the last justify. There, that should do it. Alignment is justified.</fo:block>
 <fo:block>A block for comparison</fo:block>
 <fo:block space-before.optimum="12pt">A block with 12pt space-before</fo:block>
 <fo:block>A block for comparison</fo:block>
@@ -33,7 +33,7 @@
 <fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">And again for the page break, text before<fo:block space-before.optimum="12pt" space-after.optimum="12pt">A block within a block with 50pt start-intent</fo:block>Text after</fo:block>
 <fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">Text before<fo:block space-before.optimum="12pt" space-after.optimum="12pt">A block with 50pt start-indent within a block with 50pt start-intent</fo:block>Text after</fo:block>
 <fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="50pt">Text before<fo:block space-before.optimum="12pt" space-after.optimum="12pt" start-indent="100pt">A block with 100pt start-indent within a block with 50pt start-intent</fo:block>Text after</fo:block>
-<fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justified">
+<fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justify">
 <fo:list-item>
 <fo:list-item-label><fo:block>&#x2022;</fo:block></fo:list-item-label>
 <fo:list-item-body><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block></fo:list-item-body>
@@ -43,7 +43,7 @@
 <fo:list-item-body><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block></fo:list-item-body>
 </fo:list-item>
 </fo:list-block>
-<fo:list-block start-indent="50pt" provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justified">
+<fo:list-block start-indent="50pt" provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justify">
 <fo:list-item>
 <fo:list-item-label><fo:block>&#x2022;</fo:block></fo:list-item-label>
 <fo:list-item-body><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks. The list-block has a start-indent of 50pt and a text-align of justified.</fo:block></fo:list-item-body>
@@ -53,7 +53,7 @@
 <fo:list-item-body><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block><fo:block>This is a second multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block><fo:block>This is a third multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block></fo:list-item-body>
 </fo:list-item>
 </fo:list-block>
-<fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justified">
+<fo:list-block provisional-distance-between-starts="12pt" space-before.optimum="12pt" text-align="justify">
 <fo:list-item>
 <fo:list-item-label><fo:block>&#x2022;</fo:block></fo:list-item-label>
 <fo:list-item-body><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block><fo:block start-indent="100pt">This is a multiple line block with start-indent 100pt that extends over more than one line. There should be appropriate line breaks.</fo:block><fo:block>This is a multiple line block that extends over more than one line. There should be appropriate line breaks.</fo:block></fo:list-item-body>
diff --git a/docs/examples/fo/images.fo b/docs/examples/fo/images.fo
index 9126f5633..a1b9d43b8 100644
--- a/docs/examples/fo/images.fo
+++ b/docs/examples/fo/images.fo
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<fo:root font-family="Times Roman" font-size="12pt" text-align="justified" xmlns:fo="http://www.w3.org/1999/XSL/Format">
+<fo:root font-family="Times Roman" font-size="12pt" text-align="justify" xmlns:fo="http://www.w3.org/1999/XSL/Format">
 <fo:layout-master-set>
 <fo:simple-page-master master-name="right"
 	margin-top="75pt" margin-bottom="25pt" margin-left="100pt" margin-right="50pt">
@@ -31,7 +31,7 @@
 <fo:page-sequence id="N2528" master-name="psmOddEven">
 
 <fo:static-content flow-name="xsl-after">
-	<fo:block text-align-last="centered" font-size="10pt">
+	<fo:block text-align-last="center" font-size="10pt">
 		<fo:page-number/>
 	</fo:block>
 </fo:static-content>
@@ -47,5 +47,5 @@
 
 <fo:page-sequence id="N2561" master-name="psmOddEven">
 <fo:static-content flow-name="xsl-after">
-<fo:block text-align-last="centered" font-size="10pt"><fo:page-number/></fo:block></fo:static-content><fo:flow><fo:block font-size="18pt" font-weight="bold">A. Appendix</fo:block></fo:flow></fo:page-sequence></fo:root>
+<fo:block text-align-last="center" font-size="10pt"><fo:page-number/></fo:block></fo:static-content><fo:flow><fo:block font-size="18pt" font-weight="bold">A. Appendix</fo:block></fo:flow></fo:page-sequence></fo:root>
 	  
diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo
index 46315d8cb..2c74a8a92 100644
--- a/docs/examples/fo/link.fo
+++ b/docs/examples/fo/link.fo
@@ -24,22 +24,28 @@
     <fo:flow flow-name="xsl-body">
 
       <!-- Normal text -->
-      <fo:block text-align="centered">1. <fo:simple-link external-destination="normal.pdf">normal.pdf</fo:simple-link>
+      <fo:block text-align="center">0. Normal text without link
+      </fo:block>
+
+
+      <!-- Normal text -->
+      <fo:block text-align="center"
+                font-family="serif">1. <fo:simple-link external-destination="normal.pdf">normal.pdf</fo:simple-link>
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">---</fo:block>
+      <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">
+      <fo:block text-align="center">
         2. A one line example (text-align='start'): <fo:simple-link external-destination="normal.pdf">normal.pdf</fo:simple-link>
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">---</fo:block>
+      <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="start">
+      <fo:block text-align="start" hyphenate="true">
         3. A multiline text (text-align='start'). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
         enable generic SGML to be served, received, and processed on the Web in the way that is now possible with HTML. XML
         has been designed for ease of implementation and for interoperability with both SGML and HTML. For further information 
@@ -47,10 +53,10 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">---</fo:block>
+      <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">
+      <fo:block text-align="center">
         4. A multiline text (text-align='centered'). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
         enable generic SGML to be served, received, and processed on the Web in the way that is now possible with HTML. XML
         has been designed for ease of implementation and for interoperability with both SGML and HTML. For further information 
@@ -58,7 +64,7 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">---</fo:block>
+      <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
       <fo:block text-align="end">
@@ -69,7 +75,7 @@
       </fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="centered">---</fo:block>
+      <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
       <fo:block text-align="start"
diff --git a/docs/examples/fo/normal.fo b/docs/examples/fo/normal.fo
index 7e78dafc4..5facd2807 100644
--- a/docs/examples/fo/normal.fo
+++ b/docs/examples/fo/normal.fo
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!-- example for a simple fo file. At the beginning the page layout is set. 
+Below fo:root there is always 
+- a single fo:layout-master-set which defines one or more page layouts
+- an optional fo:declarations,
+- and a sequence of one or more fo:page-sequences containing the text and formatting instructions -->
+
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-  <!-- defines page layout -->
   <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"
@@ -67,7 +81,7 @@
             space-after.optimum="15pt"
             background-color="blue"
             color="white"
-            text-align="centered"
+            text-align="center"
             padding-top="3pt">
         Extensible Markup Language (XML) 1.0
       </fo:block>
diff --git a/docs/examples/fo/readme.fo b/docs/examples/fo/readme.fo
index b6b078980..823e33129 100644
--- a/docs/examples/fo/readme.fo
+++ b/docs/examples/fo/readme.fo
@@ -66,7 +66,7 @@ This is not the latest Fop documentation, but just an fo example. FOP - p. <fo:p
 
 
 <fo:flow flow-name="xsl-body">
-<fo:block font-size="18pt" font-family="sans-serif" line-height="24pt" space-after.optimum="15pt" background-color="blue" color="white" text-align="centered" padding-top="3pt">FOP: An Open-Source XSL Formatter and Renderer</fo:block>
+<fo:block font-size="18pt" font-family="sans-serif" line-height="24pt" space-after.optimum="15pt" background-color="blue" color="white" text-align="center" padding-top="3pt">FOP: An Open-Source XSL Formatter and Renderer</fo:block>
 <fo:block id="sec1" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >A) 
       What is FOP?</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif">FOP is the world's first print formatter driven by XSL formatting