Add language attribute with hyphenation.

Add a block to show justified text.
PR:
Obtained from:
Submitted by:
Reviewed by:

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

diff --git a/docs/examples/fo/link.fo b/docs/examples/fo/link.fo
index 52bb78713c2bcfad1c8266321aff1c0bec021c2e..e47d3ce8e4a1617980c7b0397895cba3dbc4a435 100644 (file)
--- a/docs/examples/fo/link.fo
+++ b/docs/examples/fo/link.fo
@@ -2,123 +2,134 @@
 
 <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
 
-  <!-- defines page layout -->
-  <fo:layout-master-set>
-    <fo:simple-page-master master-name="first" 
-                           page-height="29.7cm" page-width="21cm" 
-                           margin-top="1cm" 
-                           margin-bottom="2cm" 
-                           margin-left="2.5cm" 
-                           margin-right="2.5cm">
-      <fo:region-body margin-top="3cm"/>
-      <fo:region-before extent="3cm"/>
-      <fo:region-after extent="1.5cm"/>
-    </fo:simple-page-master>
-  </fo:layout-master-set>
-  <!-- end: defines page layout -->
-
-  <!-- actual layout -->
-  <fo:page-sequence master-name="first">
-
-    <!-- text body -->
-    <fo:flow flow-name="xsl-region-body">
-
-      <!-- Normal text -->
-      <fo:block text-align="center">0. Normal text without link
-      </fo:block>
-
-
-      <!-- Normal text -->
-      <fo:block text-align="center"
-                font-family="serif">1. <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="center">---</fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="center">
-        2. A one line example (text-align='start'): <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="center">---</fo:block>
-
-      <!-- Normal text -->
-      <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 
-        go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="center">---</fo:block>
-
-      <!-- Normal text -->
-      <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 
-        go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="center">---</fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="end">
-        5. A multiline text (text-align='end'). 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 
-        go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="center">---</fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="start"
-                space-before.optimum="6pt" 
-                line-height="24pt"
-                font-family="serif"
-                padding-top="3pt"
-                >
-        6. A multiline text (text-align='start', space-before.optimum=6pt, font-family=serif padding-top="3pt"). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
-        enable <fo:basic-link external-destination="normal.pdf">generic</fo:basic-link> 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 
-        go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-      <!-- Normal text -->
-      <fo:block text-align="start"
-                space-before.optimum="6pt" 
-                line-height="24pt"
-                font-family="serif"
-                padding-top="3pt"
-                >
-        7. A multiline text (text-align='start', space-before.optimum=6pt, font-family=serif, padding-top="3pt"). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
-        enable <fo:basic-link external-destination="normal.pdf">generic</fo:basic-link> 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 
-        go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
-
-
-      <!-- Normal text -->
+       <!-- defines page layout -->
+       <fo:layout-master-set>
+               <fo:simple-page-master master-name="first"
+                                                                                                        page-height="29.7cm" page-width="21cm"
+                                                                                                        margin-top="1cm"
+                                                                                                        margin-bottom="2cm"
+                                                                                                        margin-left="2.5cm"
+                                                                                                        margin-right="2.5cm">
+                       <fo:region-body margin-top="3cm"/>
+                       <fo:region-before extent="3cm"/>
+                       <fo:region-after extent="1.5cm"/>
+               </fo:simple-page-master>
+       </fo:layout-master-set>
+       <!-- end: defines page layout -->
+
+       <!-- actual layout -->
+       <fo:page-sequence master-name="first">
+
+               <!-- text body -->
+               <fo:flow flow-name="xsl-region-body">
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">0. Normal text without link
+                       </fo:block>
+
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center"
+                                                               font-family="serif">1. <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">---</fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">
+                               2. A one line example (text-align='start'): <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">---</fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="start" hyphenate="true" language="en">
+                               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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">---</fo:block>
+
+                       <!-- Normal text -->
+                       <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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">---</fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="end">
+                               5. A multiline text (text-align='end'). 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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">---</fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="justify" hyphenate="true" language="en">
+                               6. A multiline text (text-align='justify'). 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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="center">---</fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="start"
+                                                               space-before.optimum="6pt"
+                                                               line-height="24pt"
+                                                               font-family="serif"
+                                                               padding-top="3pt"
+                                                               >
+                               7. A multiline text (text-align='start', space-before.optimum=6pt, font-family=serif padding-top="3pt"). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
+                               enable <fo:basic-link external-destination="normal.pdf">generic</fo:basic-link> 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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+                       <!-- Normal text -->
+                       <fo:block text-align="start"
+                                                               space-before.optimum="6pt"
+                                                               line-height="24pt"
+                                                               font-family="serif"
+                                                               padding-top="3pt"
+                                                               >
+                               8. A multiline text (text-align='start', space-before.optimum=6pt, font-family=serif, padding-top="3pt"). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
+                               enable <fo:basic-link external-destination="normal.pdf">generic</fo:basic-link> 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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
+
+
+                       <!-- Normal text -->
 <!--      <fo:block text-align="start"
-                space-before.optimum="6pt" 
-                line-height="24pt"
-                font-family="serif"
-                padding-top="3pt"
-                >
-        8. A multiline text (text-align='start', space-before.optimum=6pt, font-family=serif, padding-top="3pt"). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
-        enable <fo:basic-link external-destination="normal.pdf">generic</fo:basic-link> 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 
-        go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
-      </fo:block>
+                                                               space-before.optimum="6pt"
+                                                               line-height="24pt"
+                                                               font-family="serif"
+                                                               padding-top="3pt"
+                                                               >
+                               8. A multiline text (text-align='start', space-before.optimum=6pt, font-family=serif, padding-top="3pt"). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
+                               enable <fo:basic-link external-destination="normal.pdf">generic</fo:basic-link> 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
+                               go to <fo:basic-link external-destination="normal.pdf">normal.pdf</fo:basic-link>
+                       </fo:block>
 -->
 
 
-    </fo:flow>
-  </fo:page-sequence>
+               </fo:flow>
+       </fo:page-sequence>
 </fo:root>