Merged revisions 660979,660998,661276,661310,661999,662009,662203 via svnmerge from

https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r660979 | vhennebert | 2008-05-28 16:24:23 +0100 (Wed, 28 May 2008) | 3 lines
  
  Bugzilla 37579: added support for footnotes in lists and table bodies (not header nor footer).
  This is /not/ to be considered a final fix: similar code is duplicated over several classes (LineLayoutManager, ListItemLayoutManager and to less extent TableStepper). Footnotes should probably be handled another way.
........
  r660998 | maxberger | 2008-05-28 17:10:32 +0100 (Wed, 28 May 2008) | 1 line
  
  Implemented Font auto-selection word-by-word
........
  r661276 | vhennebert | 2008-05-29 10:58:06 +0100 (Thu, 29 May 2008) | 2 lines
  
  Set svn:keywords and svn:eol-style properties for files added in revision 660998
........
  r661310 | maxberger | 2008-05-29 13:03:48 +0100 (Thu, 29 May 2008) | 1 line
  
  Added docs for my recent commit (word-by-word character selection)
........
  r661999 | adelmelle | 2008-05-31 11:56:05 +0100 (Sat, 31 May 2008) | 3 lines
  
  Bugzilla 45097:
  Leading/trailing white-space not removed from nested inline-content when there is no preceding/following text.
........
  r662009 | maxberger | 2008-05-31 12:45:55 +0100 (Sat, 31 May 2008) | 1 line
  
  Code Cleanups (no functional change)
........
  r662203 | maxberger | 2008-06-01 12:57:33 +0100 (Sun, 01 Jun 2008) | 1 line
  
  More code Cleanups (no functional changes)
........


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

1 files changed, 32 insertions, 18 deletions

diff --git a/src/documentation/content/xdocs/trunk/fonts.xml b/src/documentation/content/xdocs/trunk/fonts.xml
index 30b72ffac..e713fe08a 100644
--- a/src/documentation/content/xdocs/trunk/fonts.xml
+++ b/src/documentation/content/xdocs/trunk/fonts.xml
@@ -22,7 +22,7 @@
     <title>Apache FOP: Fonts</title>
     <version>$Revision$</version>
     <authors>
-      <person name="Jeremias Märki" email=""/>
+      <person name="Jeremias M&#xE4;rki" email=""/>
       <person name="Tore Engvig" email=""/>
       <person name="Adrian Cumiskey" email=""/>
       <person name="Max Berger" email=""/>
@@ -96,14 +96,14 @@
           <td>yes (used for layout but not for output)</td>
           <td>no</td>
         </tr>
-        <!--tr> NOT AVAILABLE
+<!--tr> NOT AVAILABLE
           <td>MIF</td>
           <td>n/a (font metrics not needed)</td>
           <td>n/a</td>
           <td>n/a</td>
           <td>n/a</td>
         </tr-->
-        <!--tr> NOT AVAILABLE
+<!--tr> NOT AVAILABLE
           <td>SVG</td>
           <td>if available from OS</td>
           <td>yes</td>
@@ -163,7 +163,6 @@
         PDF or PostScript.
       </p>
     </section>
-    
     <section id="custom">
       <title>Custom Fonts</title>
       <p>
@@ -184,11 +183,14 @@
         Basic information about fonts can be found at:
       </p>
       <ul>
-        <li><a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a></li>
-        <li><a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a></li>
+        <li>
+          <a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a>
+        </li>
+        <li>
+          <a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a>
+        </li>
       </ul>
     </section>
-    
     <section id="basics">
       <title>Basic font configuration</title>
       <p>
@@ -220,7 +222,6 @@
         not possible to easily configure fonts from Java code.
       </note>
     </section>
-    
     <section id="advanced">
       <title>Advanced font configuration</title>
       <p>
@@ -359,7 +360,7 @@
             relative to the base directory.
           </li>
         </ul>
-        <!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
+<!--note>Cocoon users will need to setup the config, see FOPSerializer for more information.</note-->
       </section>
       <section id="autodetect">
         <title>Auto-Detect and auto-embed feature</title>
@@ -425,14 +426,14 @@
         </ul>
       </section>
       <section id="substitution">
-         <title>Substitution</title>
-         <p>When a &lt;substitutions/&gt; section is defined in the configuration, FOP will re-map any font-family references found in your FO input to a given substitution font.</p>
-         <ul>
-            <li>If a &lt;substitution/&gt; is declared, it is mandatory that both a &lt;from/&gt; and &lt;to/&gt; child element is declared with a font-family attribute.</li>
-            <li>Both font-weight and font-style are optional attributes, if they are provided then a value of 'normal' is assumed.</li>
-         </ul>
-         <p>For example you could make all FO font-family references to 'Arial' with weights between 700 and 900 reference the normal 'Arial Black' font.</p>
-         <source><![CDATA[
+        <title>Substitution</title>
+        <p>When a &lt;substitutions/&gt; section is defined in the configuration, FOP will re-map any font-family references found in your FO input to a given substitution font.</p>
+        <ul>
+          <li>If a &lt;substitution/&gt; is declared, it is mandatory that both a &lt;from/&gt; and &lt;to/&gt; child element is declared with a font-family attribute.</li>
+          <li>Both font-weight and font-style are optional attributes, if they are provided then a value of 'normal' is assumed.</li>
+        </ul>
+        <p>For example you could make all FO font-family references to 'Arial' with weights between 700 and 900 reference the normal 'Arial Black' font.</p>
+        <source><![CDATA[
 <fop version="1.0">
    <fonts>
       <substitutions>
@@ -448,7 +449,7 @@
    </fonts>
 </fop>]]></source>
       </section>
-      <!-- The following section should no longer be required
+<!-- The following section should no longer be required
       <section id="embedding-base14">
         <title>Explicitly embedding the base 14 fonts</title>
         <p>
@@ -474,5 +475,18 @@
   [..]]]></source>
       </section-->
     </section>
+    <section id="selection">
+      <title>Font Selection Strategies</title>
+      <p>
+          There are two font selection strategies: character-by-character or auto. The default is auto.</p>
+      <p>Auto selected the first font from the list which is able to display the most characters in a given word. This means (assume font A has characters for abclmn, font B for lnmxyz, fontlist is A,B):</p>
+      <ul>
+        <li>aaa lll xxx would be displayed in fonts A A B</li>
+        <li>aaaxx would be displayed in font A</li>
+        <li>aaaxxx would be displayed in font A</li>
+        <li>aaaxxxx would be displayed in font B</li>
+      </ul>
+      <p>Character-by-Character is NOT yet supported!</p>
+    </section>
   </body>
 </document>