xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jerem...@apache.org
Subject svn commit: r752164 [3/4] - in /xmlgraphics/site/deploy/fop: ./ 0.94/ 0.95/ dev/ dev/design/ dev/svg/ trunk/
Date Tue, 10 Mar 2009 16:59:29 GMT
Modified: xmlgraphics/site/deploy/fop/linkmap.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/linkmap.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/linkmap.html (original)
+++ xmlgraphics/site/deploy/fop/linkmap.html Tue Mar 10 16:58:52 2009
@@ -1480,7 +1480,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/linkmap.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/linkmap.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/linkmap.pdf (original) and xmlgraphics/site/deploy/fop/linkmap.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/maillist.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/maillist.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/maillist.html (original)
+++ xmlgraphics/site/deploy/fop/maillist.html Tue Mar 10 16:58:52 2009
@@ -417,7 +417,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/maillist.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/maillist.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/maillist.pdf (original) and xmlgraphics/site/deploy/fop/maillist.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/news.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/news.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/news.html (original)
+++ xmlgraphics/site/deploy/fop/news.html Tue Mar 10 16:58:52 2009
@@ -696,7 +696,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/news.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/news.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/news.pdf (original) and xmlgraphics/site/deploy/fop/news.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/quickstartguide.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/quickstartguide.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/quickstartguide.html (original)
+++ xmlgraphics/site/deploy/fop/quickstartguide.html Tue Mar 10 16:58:52 2009
@@ -385,7 +385,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/quickstartguide.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/quickstartguide.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Binary files - no diff available.

Modified: xmlgraphics/site/deploy/fop/resources.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/resources.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/resources.html (original)
+++ xmlgraphics/site/deploy/fop/resources.html Tue Mar 10 16:58:52 2009
@@ -678,7 +678,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/resources.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/resources.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/resources.pdf (original) and xmlgraphics/site/deploy/fop/resources.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/status.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/status.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/status.html (original)
+++ xmlgraphics/site/deploy/fop/status.html Tue Mar 10 16:58:52 2009
@@ -581,7 +581,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/status.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/status.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/status.pdf (original) and xmlgraphics/site/deploy/fop/status.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/team.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/team.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/team.html (original)
+++ xmlgraphics/site/deploy/fop/team.html Tue Mar 10 16:58:52 2009
@@ -477,7 +477,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/team.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/team.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/team.pdf (original) and xmlgraphics/site/deploy/fop/team.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/anttask.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/anttask.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/anttask.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/anttask.html Tue Mar 10 16:58:52 2009
@@ -489,7 +489,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/anttask.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/anttask.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/anttask.pdf (original) and xmlgraphics/site/deploy/fop/trunk/anttask.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/compiling.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/compiling.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/compiling.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/compiling.html Tue Mar 10 16:58:52 2009
@@ -390,7 +390,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/compiling.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/compiling.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/compiling.pdf (original) and xmlgraphics/site/deploy/fop/trunk/compiling.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/configuration.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/configuration.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/configuration.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/configuration.html Tue Mar 10 16:58:52 2009
@@ -401,6 +401,21 @@
       
 <tr>
         
+<td colspan="1" rowspan="1">prefer-renderer</td>
+        <td colspan="1" rowspan="1">boolean (true, false)</td>
+        <td colspan="1" rowspan="1">
+          By default, FOP prefers the newer output implementations based on the
+          <span class="codefrag">IFDocumentHandler</span> interface. If no such implementation can be found for
+          a given MIME type, it looks for an implementation of the <span class="codefrag">Renderer</span> interface.
+          If necessary, you can invert the lookup order to prefer the Renderer variant over the
+          IFDocumentHandler variant by setting this value to true. 
+        </td>
+        <td colspan="1" rowspan="1">false</td>
+      
+</tr>
+      
+<tr>
+        
 <td colspan="1" rowspan="1">use-cache</td>
         <td colspan="1" rowspan="1">boolean (true, false)</td>
         <td colspan="1" rowspan="1">All fonts information that has been gathered as a result of "directory"
@@ -464,7 +479,7 @@
 &lt;/fop&gt;</pre>
 </div>
   
-<a name="N1017F"></a><a name="renderers"></a>
+<a name="N1019C"></a><a name="renderers"></a>
 <h2 class="underlined_10">Renderer configuration</h2>
 <div class="section">
 <p>
@@ -499,7 +514,7 @@
       The details on the font configuration can be found on the separate <a href="fonts.html">Fonts</a> page.
       Note especially the section entitled <a href="fonts.html#register">Register Fonts with FOP</a>.
     </p>
-<a name="N1019A"></a><a name="pdf-renderer"></a>
+<a name="N101B7"></a><a name="pdf-renderer"></a>
 <h3 class="underlined_5">Special Settings for the PDF Renderer</h3>
 <p>
         The configuration element for the PDF renderer contains two elements. One is for the font configuration
@@ -572,7 +587,7 @@
          &lt;noannotations/&gt;
       &lt;/encryption-params&gt;
     &lt;/renderer&gt;</pre>
-<a name="N101C1"></a><a name="ps-renderer"></a>
+<a name="N101DE"></a><a name="ps-renderer"></a>
 <h3 class="underlined_5">Special Settings for the PostScript Renderer</h3>
 <p>
         Besides the normal font configuration (the same "fonts" element as for the PDF renderer) the PostScript
@@ -595,7 +610,7 @@
         &lt;/font&gt;
       &lt;/fonts&gt;
     &lt;/renderer&gt;</pre>
-<a name="N101CF"></a><a name="pcl-renderer"></a>
+<a name="N101EC"></a><a name="pcl-renderer"></a>
 <h3 class="underlined_5">Special Settings for the PCL Renderer</h3>
 <p>
         Non-standard fonts for the PCL renderer are made available through the Java2D subsystem which means that
@@ -622,7 +637,7 @@
         If the mix of painting methods results in unwelcome output, you can set this
         to "bitmap" which causes all text to be rendered as bitmaps.
       </p>
-<a name="N101E6"></a><a name="afp-renderer"></a>
+<a name="N10203"></a><a name="afp-renderer"></a>
 <h3 class="underlined_5">Special Settings for the AFP Renderer</h3>
 <p>
       
@@ -650,7 +665,7 @@
 </div>
 
         
-<a name="N10203"></a><a name="When+it+does+not+work"></a>
+<a name="N10220"></a><a name="When+it+does+not+work"></a>
 <h2 class="underlined_10">When it does not work</h2>
 <div class="section">
 <p>FOP searches the configuration file for the information it
@@ -693,7 +708,7 @@
 </div>
   
 <span class="version">
-          version 721430</span>
+          version 747015</span>
 </div>
 <!--+
     |end content
@@ -711,7 +726,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/configuration.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/configuration.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/configuration.pdf (original) and xmlgraphics/site/deploy/fop/trunk/configuration.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/configuration.xml?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/configuration.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/configuration.xml Tue Mar 10 16:58:52 2009
@@ -17,7 +17,7 @@
 <document>
   <header>
     <title>Apache FOP: Configuration</title>
-    <version>$Revision: 721430 $</version>
+    <version>$Revision: 747015 $</version>
   </header>
 
   <body>
@@ -149,6 +149,18 @@
         <td colspan="1" rowspan="1">"height" 11 inches, "width" 8.26 inches</td>
       </tr>
       <tr>
+        <td colspan="1" rowspan="1">prefer-renderer</td>
+        <td colspan="1" rowspan="1">boolean (true, false)</td>
+        <td colspan="1" rowspan="1">
+          By default, FOP prefers the newer output implementations based on the
+          <code>IFDocumentHandler</code> interface. If no such implementation can be found for
+          a given MIME type, it looks for an implementation of the <code>Renderer</code> interface.
+          If necessary, you can invert the lookup order to prefer the Renderer variant over the
+          IFDocumentHandler variant by setting this value to true. 
+        </td>
+        <td colspan="1" rowspan="1">false</td>
+      </tr>
+      <tr>
         <td colspan="1" rowspan="1">use-cache</td>
         <td colspan="1" rowspan="1">boolean (true, false)</td>
         <td colspan="1" rowspan="1">All fonts information that has been gathered as a result of "directory"

Modified: xmlgraphics/site/deploy/fop/trunk/embedding.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/embedding.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/embedding.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/embedding.html Tue Mar 10 16:58:52 2009
@@ -1118,7 +1118,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/embedding.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/embedding.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/embedding.pdf (original) and xmlgraphics/site/deploy/fop/trunk/embedding.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/events.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/events.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/events.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/events.html Tue Mar 10 16:58:52 2009
@@ -680,7 +680,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/events.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/events.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Binary files - no diff available.

Modified: xmlgraphics/site/deploy/fop/trunk/extensions.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/extensions.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/extensions.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/extensions.html Tue Mar 10 16:58:52 2009
@@ -490,7 +490,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/extensions.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/extensions.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/extensions.pdf (original) and xmlgraphics/site/deploy/fop/trunk/extensions.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/fonts.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/fonts.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/fonts.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/fonts.html Tue Mar 10 16:58:52 2009
@@ -232,7 +232,7 @@
 <a href="#truetype-metrics">TrueType Font Metrics</a>
 </li>
 <li>
-<a href="#truetype-collections-metrics">TrueType Collections Font Metrics</a>
+<a href="#truetype-collections-metrics">TrueType Collections</a>
 </li>
 <li>
 <a href="#register">Register Fonts with FOP</a>
@@ -675,7 +675,7 @@
         </div>
 </div>
 <a name="N102A4"></a><a name="truetype-collections-metrics"></a>
-<h3 class="underlined_5">TrueType Collections Font Metrics</h3>
+<h3 class="underlined_5">TrueType Collections</h3>
 <p>TrueType collections (.ttc files) contain more than one font.
           To create metrics files for these fonts, you must specify which font in the collection should be generated, by using the "-ttcname" option with the TTFReader.</p>
 <p>To get a list of the fonts in a collection, just start the TTFReader as if it were a normal TrueType file (without the -ttcname option).
@@ -687,9 +687,12 @@
 <p>
           Alternatively, the individual sub-fonts of a TrueType Collections can be selected
           using the "sub-font" attribute on the "font" element. That means that generating
-          an XML font metrics file for TrueType collections is not necessary anymore.
+          an XML font metrics file for TrueType collections is not necessary anymore. Example:
         </p>
-<a name="N102BB"></a><a name="register"></a>
+<pre class="code">&lt;font embed-url="gulim.ttc" sub-font="GulimChe"&gt;
+  &lt;font-triplet name="GulimChe" style="normal" weight="normal"/&gt;
+&lt;/font&gt;</pre>
+<a name="N102BF"></a><a name="register"></a>
 <h3 class="underlined_5">Register Fonts with FOP</h3>
 <p>You must tell FOP how to find and use the font metrics files by registering them in the <a href="configuration.html">FOP Configuration</a>. Add entries for your custom fonts, regardless of font type, to the configuration file in a manner similar to the following:</p>
 <pre class="code">
@@ -760,7 +763,7 @@
           </li>
         
 </ul>
-<a name="N10306"></a><a name="autodetect"></a>
+<a name="N1030A"></a><a name="autodetect"></a>
 <h3 class="underlined_5">Auto-Detect and auto-embed feature</h3>
 <p>When the "auto-detect" flag is set in the configuration, FOP will automatically search for fonts in the default paths for your operating system.</p>
 <p>FOP will also auto-detect fonts which are available in the classpath, if they are described as "application/x-font" in the MANIFEST.MF file. For example, if your .jar file contains font/myfont.ttf:</p>
@@ -769,7 +772,7 @@
           Name: font/myfont.ttf
           Content-Type: application/x-font</pre>
 <p>This feature allows you to create JAR files containing fonts. The JAR files can be added to fop by providem them in the classpath, e.g. copying them into the lib/ directory.</p>
-<a name="N1031A"></a><a name="embedding"></a>
+<a name="N1031E"></a><a name="embedding"></a>
 <h3 class="underlined_5">Embedding</h3>
 <p>
           By default, all fonts are embedded if an output format supports font embedding. In some
@@ -827,10 +830,12 @@
 <li>When embedding PostScript fonts, the entire font is always embedded.</li>
           
 <li>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
-          original font, containing only the glyphs used, is embedded in the output document.</li>
+          original font, containing only the glyphs used, is embedded in the output document.
+          That's the default, but if you specify encoding-mode="single-byte" (see above), the
+          complete font is embedded.</li>
         
 </ul>
-<a name="N10355"></a><a name="substitution"></a>
+<a name="N10359"></a><a name="substitution"></a>
 <h3 class="underlined_5">Substitution</h3>
 <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>
@@ -858,7 +863,7 @@
 &lt;/fop&gt;</pre>
 </div>
     
-<a name="N10372"></a><a name="selection"></a>
+<a name="N10376"></a><a name="selection"></a>
 <h2 class="underlined_10">Font Selection Strategies</h2>
 <div class="section">
 <p>
@@ -882,7 +887,7 @@
 <font size="-2">by&nbsp;Jeremias M&auml;rki,&nbsp;Tore Engvig,&nbsp;Adrian Cumiskey,&nbsp;Max Berger</font>
 </p>
 <span class="version">
-          version 731248</span>
+          version 748794</span>
 </div>
 <!--+
     |end content
@@ -900,7 +905,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/fonts.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/fonts.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/fonts.pdf (original) and xmlgraphics/site/deploy/fop/trunk/fonts.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/fonts.xml?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/fonts.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/fonts.xml Tue Mar 10 16:58:52 2009
@@ -17,7 +17,7 @@
 <document>
   <header>
     <title>Apache FOP: Fonts</title>
-    <version>$Revision: 731248 $</version>
+    <version>$Revision: 748794 $</version>
     <authors>
       <person name="Jeremias Märki" email=""/>
       <person name="Tore Engvig" email=""/>
@@ -341,7 +341,7 @@
         </warning>
       </section>
       <section id="truetype-collections-metrics">
-        <title>TrueType Collections Font Metrics</title>
+        <title>TrueType Collections</title>
         <p>TrueType collections (.ttc files) contain more than one font.
           To create metrics files for these fonts, you must specify which font in the collection should be generated, by using the "-ttcname" option with the TTFReader.</p>
         <p>To get a list of the fonts in a collection, just start the TTFReader as if it were a normal TrueType file (without the -ttcname option).
@@ -353,8 +353,11 @@
         <p>
           Alternatively, the individual sub-fonts of a TrueType Collections can be selected
           using the "sub-font" attribute on the "font" element. That means that generating
-          an XML font metrics file for TrueType collections is not necessary anymore.
+          an XML font metrics file for TrueType collections is not necessary anymore. Example:
         </p>
+        <source xml:space="preserve"><![CDATA[<font embed-url="gulim.ttc" sub-font="GulimChe">
+  <font-triplet name="GulimChe" style="normal" weight="normal"/>
+</font>]]></source>
       </section>
       <section id="register">
         <title>Register Fonts with FOP</title>
@@ -471,7 +474,9 @@
             This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</li>
           <li>When embedding PostScript fonts, the entire font is always embedded.</li>
           <li>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
-          original font, containing only the glyphs used, is embedded in the output document.</li>
+          original font, containing only the glyphs used, is embedded in the output document.
+          That's the default, but if you specify encoding-mode="single-byte" (see above), the
+          complete font is embedded.</li>
         </ul>
       </section>
       <section id="substitution">

Modified: xmlgraphics/site/deploy/fop/trunk/graphics.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/graphics.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/graphics.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/graphics.html Tue Mar 10 16:58:52 2009
@@ -816,7 +816,7 @@
 <a name="N10434"></a><a name="svg-font-selection"></a>
 <h4>Font selection notes</h4>
 <p>
-            Apache Batik uses the AWT/Java2D subsystem as font source while FOP has its on font
+            Apache Batik uses the AWT/Java2D subsystem as font source while FOP has its own font
             subsystem. Great care has been taken that font selection does the best possible choices.
             But it must be noted when creating PDF or PostScript that a font used in SVG graphics
             needs to be registered with the operating system as well as in FOP's configuration.
@@ -953,7 +953,7 @@
 </div>
   
 <span class="version">
-          version 722132</span>
+          version 732299</span>
 </div>
 <!--+
     |end content
@@ -971,7 +971,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/graphics.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/graphics.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/graphics.pdf (original) and xmlgraphics/site/deploy/fop/trunk/graphics.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/graphics.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/graphics.xml?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/graphics.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/graphics.xml Tue Mar 10 16:58:52 2009
@@ -17,7 +17,7 @@
 <document>
   <header>
     <title>Apache FOP: Graphics Formats</title>
-    <version>$Revision: 722132 $</version>
+    <version>$Revision: 732299 $</version>
   </header>
   <body>
     <section id="introduction">
@@ -458,7 +458,7 @@
         <section id="svg-font-selection">
           <title>Font selection notes</title>
           <p>
-            Apache Batik uses the AWT/Java2D subsystem as font source while FOP has its on font
+            Apache Batik uses the AWT/Java2D subsystem as font source while FOP has its own font
             subsystem. Great care has been taken that font selection does the best possible choices.
             But it must be noted when creating PDF or PostScript that a font used in SVG graphics
             needs to be registered with the operating system as well as in FOP's configuration.

Modified: xmlgraphics/site/deploy/fop/trunk/hyphenation.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/hyphenation.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/hyphenation.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/hyphenation.html Tue Mar 10 16:58:52 2009
@@ -501,7 +501,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/hyphenation.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/hyphenation.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/hyphenation.pdf (original) and xmlgraphics/site/deploy/fop/trunk/hyphenation.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/index.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/index.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/index.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/index.html Tue Mar 10 16:58:52 2009
@@ -260,7 +260,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <div id="logos"></div>
 <!--+

Modified: xmlgraphics/site/deploy/fop/trunk/index.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/index.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/index.pdf (original) and xmlgraphics/site/deploy/fop/trunk/index.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/intermediate.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/intermediate.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/intermediate.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/intermediate.html Tue Mar 10 16:58:52 2009
@@ -205,7 +205,21 @@
 <a href="#introduction">Introduction</a>
 </li>
 <li>
-<a href="#usage">Usage of the Intermediate Format</a>
+<a href="#which-if">Which Intermediate Format to choose?</a>
+<ul class="minitoc">
+<li>
+<a href="#strengths-at">Area Tree XML (AT XML)</a>
+</li>
+<li>
+<a href="#strengths-if">Intermediate Format (IF)</a>
+</li>
+</ul>
+</li>
+<li>
+<a href="#architecture">Architectural Overview</a>
+</li>
+<li>
+<a href="#usage">Usage of the Area Tree XML format (AT XML)</a>
 <ul class="minitoc">
 <li>
 <a href="#concat">Concatenating Documents</a>
@@ -218,6 +232,20 @@
 </li>
 </ul>
 </li>
+<li>
+<a href="#usage-if">Usage of the Intermediate Format (IF)</a>
+<ul class="minitoc">
+<li>
+<a href="#concat-if">Concatenating Documents</a>
+</li>
+<li>
+<a href="#modifying-if">Modifying Documents</a>
+</li>
+<li>
+<a href="#advanced-if">Advanced Use</a>
+</li>
+</ul>
+</li>
 </ul>
 </div>
 </div>
@@ -225,8 +253,8 @@
 <div class="note">
 <div class="label">Note</div>
 <div class="content">
-      Please note that the intermediate format is an <strong>advanced feature</strong> and can be ignored by most
-      users of Apache FOP.
+      Please note that the intermediate formats described here are
+      <strong>advanced features</strong> and can be ignored by most users of Apache FOP.
     </div>
 </div>
     
@@ -234,10 +262,19 @@
 <h2 class="underlined_10">Introduction</h2>
 <div class="section">
 <p>
-        The intermediate format (IF) is a proprietary XML format that represents the area tree 
-        generated by the layout engine. The area tree is conceptually defined in the 
+        Apache FOP now provides two different so-called intermediate formats. The first one
+        (let's call it the area tree XML format) is basically a 1:1 XML representation of FOP's
+        area tree as generated by the layout engine. The area tree is conceptually defined in the 
         <a class="external" href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</a>.
-        The IF can be generated through the area tree XML Renderer (the XMLRenderer).
+        Even though the area tree is mentioned in the XSL-FO specification, this part is not
+        standardized. Therefore, the area tree XML format is a FOP-proprietary XML file format.
+        The area tree XML can be generated through the area tree XML Renderer (the XMLRenderer).
+      </p>
+<p>
+        The second intermediate format (which we shall name exactly like this: the intermediate 
+        format)
+        is a recent addition which tries to meet a slightly different set of goals. It is highly
+        optimized for speed.
       </p>
 <p>
         The intermediate format can be used to generate intermediate documents that are modified 
@@ -248,32 +285,87 @@
       </p>
 </div>
     
-<a name="N10028"></a><a name="usage"></a>
-<h2 class="underlined_10">Usage of the Intermediate Format</h2>
+<a name="N1002B"></a><a name="which-if"></a>
+<h2 class="underlined_10">Which Intermediate Format to choose?</h2>
+<div class="section">
+<p>
+        Both formats have their use cases, so the choice you will make will depend on your 
+        particular situation. Here is a list of strengths and use cases for both formats:
+      </p>
+<a name="N10034"></a><a name="strengths-at"></a>
+<h3 class="underlined_5">Area Tree XML (AT XML)</h3>
+<ul>
+          
+<li>1:1 representation of FOP's area tree in XML.</li>
+          
+<li>Contains more structure information than the new intermediate format.</li>
+          
+<li>Used in FOP's layout engine test suite for regression testing.</li>
+        
+</ul>
+<a name="N10047"></a><a name="strengths-if"></a>
+<h3 class="underlined_5">Intermediate Format (IF)</h3>
+<ul>
+          
+<li>Highly optimized for speed.</li>
+          
+<li>Smaller XML files.</li>
+          
+<li>Easier to post-process.</li>
+          
+<li>XML Schema is available.</li>
+          
+<li>
+            Recommended for use cases where documents are formatted concurrently and later
+            concatenated to a single print job.
+          </li>
+        
+</ul>
+<p>
+        More technical information about the two formats can be found on the
+        <a class="external" href="http://wiki.apache.org/xmlgraphics-fop/AreaTreeIntermediateXml/NewDesign">FOP Wiki</a>.
+      </p>
+</div>
+    
+<a name="N10068"></a><a name="architecture"></a>
+<h2 class="underlined_10">Architectural Overview</h2>
+<div class="section">
+<div id="" style="text-align: center;">
+<img id="" class="figure" alt="Diagram with an architectural overview over the intermediate formats" src="images/if-architecture-overview.png"></div>
+</div>
+    
+<a name="N10073"></a><a name="usage"></a>
+<h2 class="underlined_10">Usage of the Area Tree XML format (AT XML)</h2>
 <div class="section">
 <p>
-        As already mentioned, the IF is generated by using the <strong>XMLRenderer</strong> (MIME type: 
-        <strong>application/X-fop-areatree</strong>). So, you basically set the right MIME type for
-        the output format and process your FO files as if you would create a PDF file. However, there
-        is an important detail to consider: The various Renderers don't all use the same font sources.
-        To be able to create the right area tree for the ultimate output file, you need to create
-        the IF file using the right font setup. This is achieved by telling the XMLRenderer to mimic
-        another renderer. This is done by calling the XMLRenderer's mimicRenderer() method with an
-        instance of the ultimate target renderer as the single parameter. This has a consequence: An
-        IF file rendered with the Java2DRenderer may not look as expected when it was actually generated
-        for the PDF renderer. For renderers that use the same font setup, this restriction does not
-        apply (PDF and PS, for example). Generating the intermediate format file is the first step.
-      </p>
-<p>
-        The second step is to reparse the IF file using the <strong>AreaTreeParser</strong> which is 
-        found in the org.apache.fop.area package. The pages retrieved from the IF file are added to an
-        AreaTreeModel instance from where they are normally rendered using one of the available Renderer
-        implementations. You can find examples for the IF processing in the 
-        <a class="external" href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><span class="codefrag">examples/embedding</span></a>
-        directory in the FOP distribution
+        As already mentioned, the area tree XML format is generated by using the
+        <strong>XMLRenderer</strong> (MIME type: <strong>application/X-fop-areatree</strong>).
+        So, you basically set the right MIME type for the output format and process your FO files
+        as if you would create a PDF file.
       </p>
 <p>
-        The basic pattern to parse the IF format looks like this:
+        However, there is an important detail to consider: The
+        various Renderers don't all use the same font sources. To be able to create the right
+        area tree for the ultimate output format, you need to create the area tree XML file using
+        the right font setup. This is achieved by telling the XMLRenderer to mimic another
+        renderer. This is done by calling the XMLRenderer's mimicRenderer() method with an
+        instance of the ultimate target renderer as the single parameter. This has a consequence:
+        An area tree XML file rendered with the Java2DRenderer may not look as expected when it
+        was actually generated for the PDF renderer. For renderers that use the same font setup,
+        this restriction does not apply (PDF and PS, for example). Generating the area tree XML
+        format file is the first step.
+      </p>
+<p>
+        The second step is to reparse the file using the <strong>AreaTreeParser</strong> which is
+        found in the org.apache.fop.area package. The pages retrieved from the area tree XML file
+        are added to an AreaTreeModel instance from where they are normally rendered using one of
+        the available Renderer implementations. You can find examples for the area tree XML
+        processing in the 
+        <a class="external" href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><span class="codefrag">examples/embedding</span></a>
+        directory in the FOP distribution.
+      </p>
+<p>
+        The basic pattern to parse the area tree XML format looks like this:
       </p>
 <pre class="code">
 FopFactory fopFactory = FopFactory.newInstance();      
@@ -290,7 +382,7 @@
     AreaTreeModel treeModel = new RenderPagesModel(userAgent, 
             MimeConstants.MIME_PDF, fontInfo, out);
             
-    //Parse the IF file into the area tree
+    //Parse the area tree file into the area tree
     AreaTreeParser parser = new AreaTreeParser();
     Source src = new StreamSource(myIFFile);
     parser.parse(src, treeModel, userAgent);
@@ -301,7 +393,7 @@
     out.close();
 }</pre>
 <p>
-        This example simply reads an IF file and renders it to a PDF file. Please note, that in normal
+        This example simply reads an area tree file and renders it to a PDF file. Please note, that in normal
         FOP operation you're shielded from having to instantiate the FontInfo object yourself. This
         is normally a task of the AreaTreeHandler which is not present in this scenario. The same
         applies to the AreaTreeModel instance, in this case an instance of a subclass called 
@@ -311,33 +403,40 @@
         is now finished.
       </p>
 <p>
-        The intermediate format can also be used from the <a href="running.html#standalone-start">command-line</a>
+        The area tree XML format can also be used from the <a href="running.html#standalone-start">command-line</a>
         by using the "-atin" parameter for specifying the area tree XML as input file. You can also 
         specify a "mimic renderer" by inserting a MIME type between "-at" and the output file.
       </p>
-<a name="N10056"></a><a name="concat"></a>
+<a name="N100A4"></a><a name="concat"></a>
 <h3 class="underlined_5">Concatenating Documents</h3>
 <p>
           This initial example is obviously not very useful. It would be faster to create the PDF file 
-          directly. As the <a class="external" href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java">ExampleConcat.java</a>
-          example shows you can easily parse multiple IF files in a row and add the parsed pages to the
+          directly. As the <a class="external" href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java">ExampleConcat.java</a>
+          example shows you can easily parse multiple area tree files in a row and add the parsed pages to the
           same AreaTreeModel instance which essentially concatenates all the input document to one single
           output document.
         </p>
-<a name="N10064"></a><a name="modifying"></a>
+<a name="N100B2"></a><a name="modifying"></a>
 <h3 class="underlined_5">Modifying Documents</h3>
 <p>
-          One of the most important use cases for the intermediate format is obviously modifying the area
+          One of the most important use cases for this format is obviously modifying the area
           tree XML before finally rendering it to the target format. You can easily use XSLT to process
-          the IF file according to your needs. Please note, that we will currently not formally describe
-          the intermediate format. You need to have a good understanding its structure so you don't
+          the AT XML file according to your needs. Please note, that we will currently not formally describe
+          the area tree XML format. You need to have a good understanding its structure so you don't
           create any non-parseable files. We may add an XML Schema and more detailed documentation at a
           later time. You're invited to help us with that.
         </p>
-<a name="N1006E"></a><a name="advanced"></a>
+<div class="note">
+<div class="label">Note</div>
+<div class="content">
+          The area tree XML format is sensitive to changes in whitespace. If you're not careful,
+          the modified file may not render correctly.
+        </div>
+</div>
+<a name="N100BF"></a><a name="advanced"></a>
 <h3 class="underlined_5">Advanced Use</h3>
 <p>
-          The generation of the intermediate format as well as it parsing process has been designed to allow
+          The generation of the area tree format as well as it parsing process has been designed to allow
           for maximum flexibility and optimization. Please note that you can call <span class="codefrag">setTransformerHandler()</span> on
           XMLRenderer to give the XMLRenderer your own TransformerHandler instance in case you would like to
           do custom serialization (to a W3C DOM, for example) and/or to directly modify the area tree using 
@@ -345,9 +444,140 @@
           you can manually send SAX events to to start the parsing process (see <span class="codefrag">getContentHandler()</span>).
         </p>
 </div>
+    
+<a name="N100D0"></a><a name="usage-if"></a>
+<h2 class="underlined_10">Usage of the Intermediate Format (IF)</h2>
+<div class="section">
+<p>
+        The Intermediate Format (IF) is generated by the <strong>IFSerializer</strong>
+        (MIME type: <strong>application/X-fop-intermediate-format</strong>).
+        So, you basically set the right MIME type for the output format and process your FO files
+        as if you would create a PDF file.
+      </p>
+<p>
+        The IFSerializer is an implementation of the <strong>IFDocumentHandler</strong> and
+        <strong>IFPainter</strong> interfaces. The <strong>IFRenderer</strong> class is responsible
+        for converting FOP's area tree into calls against these two interfaces.
+      </p>
+<ul>
+        
+<li>
+          IFDocumentHandler: This interface is used on the document-level and defines the
+          overall structure of the Intermediate Format.
+        </li>
+        
+<li>
+          IFPainter: This interface is used to generate graphical page content like text, images
+          and borders.
+        </li>
+      
+</ul>
+<p>
+        As with the AT XML, there is an important detail to consider: The various output
+        implementations don't all use the same font sources. To be able
+        to create the right IF for the ultimate output file, you need to create the IF file using
+        the right font setup. This is achieved by telling the IFRenderer (responsible for
+        converting the area tree into calls to the IFDocumentHandler and IFPainter interfaces) 
+        to mimic another renderer. This is done by calling the IFSerializer's
+        mimicDocumentHandler() method with an instance of the ultimate target document handler
+        as the single parameter. This has a consequence: An IF file rendered with the
+        Java2DDocumentHandler may not look as expected when it was actually generated for the PDF
+        implementation. For implementations that use the same font setup,
+        this restriction does not apply (PDF and PS, for example). Generating the Intermediate
+        Format file is the first step.
+      </p>
+<p>
+        The second step is to reparse the file using the <strong>IFParser</strong> which is
+        found in the org.apache.fop.render.intermediate package. The IFParser simply takes an
+        IFDocumentHandler instance against which it generates the appropriate calls. The IFParser
+        is implemented as a SAX ContentHandler so you're free to choose the method for
+        post-processing the IF file(s). You can use XSLT or write SAX- or DOM-based code to
+        manipulate the contents. You can find examples for the Intermediate Format
+        processing in the 
+        <a class="external" href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><span class="codefrag">examples/embedding</span></a>
+        directory in the FOP distribution.
+      </p>
+<p>
+        The basic pattern to parse the intermediate format looks like this:
+      </p>
+<pre class="code">
+FopFactory fopFactory = FopFactory.newInstance();
+      
+// Setup output
+OutputStream out = new java.io.FileOutputStream(pdffile);
+out = new java.io.BufferedOutputStream(out);
+try {
+    //Setup user agent
+    FOUserAgent userAgent = fopFactory.newFOUserAgent();
+
+    //Create IFDocumentHandler instance
+    IFDocumentHandler targetHandler;
+    String mime = MimeConstants.MIME_PDF;
+    targetHandler = fopFactory.getRendererFactory().createDocumentHandler(
+            userAgent, mime);
+
+    //Setup fonts
+    IFUtil.setupFonts(targetHandler);
+    
+    //Tell the target handler where to write the PDF to
+    targetHandler.setResult(new StreamResult(pdffile));
+
+    //Parse the IF file
+    IFParser parser = new IFParser();
+    Source src = new StreamSource(myIFFile);
+    parser.parse(src, targetHandler, userAgent);
+            
+} finally {
+    out.close();
+}</pre>
+<p>
+        This example simply reads an intermediate file and renders it to a PDF file. Here
+        IFParser.parse() is used, but you can also just get a SAX ContentHandler by using the
+        IFParser.getContentHandler() method.
+      </p>
+<a name="N1010C"></a><a name="concat-if"></a>
+<h3 class="underlined_5">Concatenating Documents</h3>
+<p>
+          This initial example is obviously not very useful. It would be faster to create the PDF file 
+          directly (without the intermediate step). As the
+          <a class="external" href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java">ExampleConcat.java</a>
+          example shows you can easily parse multiple intermediate files in a row and use the
+          IFConcatenator class to concatenate page sequences from multiple source files to a single
+          output file. This particular example does the concatenation on the level of the
+          IFDocumentHandler interface. You could also do this in XSLT or using SAX on the XML level.
+          Whatever suits your process best.
+        </p>
+<a name="N1011A"></a><a name="modifying-if"></a>
+<h3 class="underlined_5">Modifying Documents</h3>
+<p>
+          One of the most important use cases for this format is obviously modifying the
+          intermediate format before finally rendering it to the target format. You can easily use
+          XSLT to process the IF file according to your needs.
+        </p>
+<p>
+          There is an XML Schema (located under
+          <a class="external" href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/">src/documentation/intermediate-format-ng</a>)
+          that helps you verify that your modified content is correct.
+        </p>
+<p>
+          For certain output formats there's a caveat: Formats like AFP and PCL do not support
+          arbitrary transformations on the IF's "viewport" and "g" elements. Possible are
+          only rotations in 90 degree steps and translations.
+        </p>
+<a name="N1012E"></a><a name="advanced-if"></a>
+<h3 class="underlined_5">Advanced Use</h3>
+<p>
+          The generation of the intermediate format as well as it parsing process has been
+          designed to allow for maximum flexibility and optimization. So rather than just passing
+          in a StreamResult to IFSerializer's setResult() method, you can also use a SAXResult
+          or a DOMResult. And as you've already seen , the IFParser on the other side allows you
+          to retrieve a ContentHandler instance where you can manually send SAX events to
+          start the parsing process (see <span class="codefrag">getContentHandler()</span>).
+        </p>
+</div>
   
 <span class="version">
-          version 627324</span>
+          version 746664</span>
 </div>
 <!--+
     |end content
@@ -365,7 +595,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/intermediate.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/intermediate.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Files xmlgraphics/site/deploy/fop/trunk/intermediate.pdf (original) and xmlgraphics/site/deploy/fop/trunk/intermediate.pdf Tue Mar 10 16:58:52 2009 differ

Modified: xmlgraphics/site/deploy/fop/trunk/intermediate.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/intermediate.xml?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/intermediate.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/intermediate.xml Tue Mar 10 16:58:52 2009
@@ -17,20 +17,29 @@
 <document>
   <header>
     <title>Intermediate Format</title>
-    <version>$Revision: 627324 $</version>
+    <version>$Revision: 746664 $</version>
   </header>
   <body>
     <note>
-      Please note that the intermediate format is an <strong>advanced feature</strong> and can be ignored by most
-      users of Apache FOP.
+      Please note that the intermediate formats described here are
+      <strong>advanced features</strong> and can be ignored by most users of Apache FOP.
     </note>
     <section id="introduction">
       <title>Introduction</title>
       <p>
-        The intermediate format (IF) is a proprietary XML format that represents the area tree 
-        generated by the layout engine. The area tree is conceptually defined in the 
+        Apache FOP now provides two different so-called intermediate formats. The first one
+        (let's call it the area tree XML format) is basically a 1:1 XML representation of FOP's
+        area tree as generated by the layout engine. The area tree is conceptually defined in the 
         <link href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</link>.
-        The IF can be generated through the area tree XML Renderer (the XMLRenderer).
+        Even though the area tree is mentioned in the XSL-FO specification, this part is not
+        standardized. Therefore, the area tree XML format is a FOP-proprietary XML file format.
+        The area tree XML can be generated through the area tree XML Renderer (the XMLRenderer).
+      </p>
+      <p>
+        The second intermediate format (which we shall name exactly like this: the intermediate 
+        format)
+        is a recent addition which tries to meet a slightly different set of goals. It is highly
+        optimized for speed.
       </p>
       <p>
         The intermediate format can be used to generate intermediate documents that are modified 
@@ -40,31 +49,73 @@
         to a single output file.
       </p>
     </section>
+    <section id="which-if">
+      <title>Which Intermediate Format to choose?</title>
+      <p>
+        Both formats have their use cases, so the choice you will make will depend on your 
+        particular situation. Here is a list of strengths and use cases for both formats:
+      </p>
+      <section id="strengths-at">
+        <title>Area Tree XML (AT XML)</title>
+        <ul>
+          <li>1:1 representation of FOP's area tree in XML.</li>
+          <li>Contains more structure information than the new intermediate format.</li>
+          <li>Used in FOP's layout engine test suite for regression testing.</li>
+        </ul>
+      </section>
+      <section id="strengths-if">
+        <title>Intermediate Format (IF)</title>
+        <ul>
+          <li>Highly optimized for speed.</li>
+          <li>Smaller XML files.</li>
+          <li>Easier to post-process.</li>
+          <li>XML Schema is available.</li>
+          <li>
+            Recommended for use cases where documents are formatted concurrently and later
+            concatenated to a single print job.
+          </li>
+        </ul>
+      </section>
+      <p>
+        More technical information about the two formats can be found on the
+        <link href="http://wiki.apache.org/xmlgraphics-fop/AreaTreeIntermediateXml/NewDesign">FOP Wiki</link>.
+      </p>
+    </section>
+    <section id="architecture">
+      <title>Architectural Overview</title>
+      <figure src="images/if-architecture-overview.png" alt="Diagram with an architectural overview over the intermediate formats"/>
+    </section>
     <section id="usage">
-      <title>Usage of the Intermediate Format</title>
+      <title>Usage of the Area Tree XML format (AT XML)</title>
+      <p>
+        As already mentioned, the area tree XML format is generated by using the
+        <strong>XMLRenderer</strong> (MIME type: <strong>application/X-fop-areatree</strong>).
+        So, you basically set the right MIME type for the output format and process your FO files
+        as if you would create a PDF file.
+      </p>
       <p>
-        As already mentioned, the IF is generated by using the <strong>XMLRenderer</strong> (MIME type: 
-        <strong>application/X-fop-areatree</strong>). So, you basically set the right MIME type for
-        the output format and process your FO files as if you would create a PDF file. However, there
-        is an important detail to consider: The various Renderers don't all use the same font sources.
-        To be able to create the right area tree for the ultimate output file, you need to create
-        the IF file using the right font setup. This is achieved by telling the XMLRenderer to mimic
-        another renderer. This is done by calling the XMLRenderer's mimicRenderer() method with an
-        instance of the ultimate target renderer as the single parameter. This has a consequence: An
-        IF file rendered with the Java2DRenderer may not look as expected when it was actually generated
-        for the PDF renderer. For renderers that use the same font setup, this restriction does not
-        apply (PDF and PS, for example). Generating the intermediate format file is the first step.
-      </p>
-      <p>
-        The second step is to reparse the IF file using the <strong>AreaTreeParser</strong> which is 
-        found in the org.apache.fop.area package. The pages retrieved from the IF file are added to an
-        AreaTreeModel instance from where they are normally rendered using one of the available Renderer
-        implementations. You can find examples for the IF processing in the 
-        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><code>examples/embedding</code></link>
-        directory in the FOP distribution
+        However, there is an important detail to consider: The
+        various Renderers don't all use the same font sources. To be able to create the right
+        area tree for the ultimate output format, you need to create the area tree XML file using
+        the right font setup. This is achieved by telling the XMLRenderer to mimic another
+        renderer. This is done by calling the XMLRenderer's mimicRenderer() method with an
+        instance of the ultimate target renderer as the single parameter. This has a consequence:
+        An area tree XML file rendered with the Java2DRenderer may not look as expected when it
+        was actually generated for the PDF renderer. For renderers that use the same font setup,
+        this restriction does not apply (PDF and PS, for example). Generating the area tree XML
+        format file is the first step.
       </p>
       <p>
-        The basic pattern to parse the IF format looks like this:
+        The second step is to reparse the file using the <strong>AreaTreeParser</strong> which is
+        found in the org.apache.fop.area package. The pages retrieved from the area tree XML file
+        are added to an AreaTreeModel instance from where they are normally rendered using one of
+        the available Renderer implementations. You can find examples for the area tree XML
+        processing in the 
+        <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><code>examples/embedding</code></link>
+        directory in the FOP distribution.
+      </p>
+      <p>
+        The basic pattern to parse the area tree XML format looks like this:
       </p>
       <source xml:space="preserve"><![CDATA[
 FopFactory fopFactory = FopFactory.newInstance();      
@@ -81,7 +132,7 @@
     AreaTreeModel treeModel = new RenderPagesModel(userAgent, 
             MimeConstants.MIME_PDF, fontInfo, out);
             
-    //Parse the IF file into the area tree
+    //Parse the area tree file into the area tree
     AreaTreeParser parser = new AreaTreeParser();
     Source src = new StreamSource(myIFFile);
     parser.parse(src, treeModel, userAgent);
@@ -92,7 +143,7 @@
     out.close();
 }]]></source>
       <p>
-        This example simply reads an IF file and renders it to a PDF file. Please note, that in normal
+        This example simply reads an area tree file and renders it to a PDF file. Please note, that in normal
         FOP operation you're shielded from having to instantiate the FontInfo object yourself. This
         is normally a task of the AreaTreeHandler which is not present in this scenario. The same
         applies to the AreaTreeModel instance, in this case an instance of a subclass called 
@@ -102,7 +153,7 @@
         is now finished.
       </p>
       <p>
-        The intermediate format can also be used from the <link href="running.html#standalone-start">command-line</link>
+        The area tree XML format can also be used from the <link href="running.html#standalone-start">command-line</link>
         by using the "-atin" parameter for specifying the area tree XML as input file. You can also 
         specify a "mimic renderer" by inserting a MIME type between "-at" and the output file.
       </p>
@@ -110,8 +161,8 @@
         <title>Concatenating Documents</title>
         <p>
           This initial example is obviously not very useful. It would be faster to create the PDF file 
-          directly. As the <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java">ExampleConcat.java</link>
-          example shows you can easily parse multiple IF files in a row and add the parsed pages to the
+          directly. As the <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/atxml/ExampleConcat.java">ExampleConcat.java</link>
+          example shows you can easily parse multiple area tree files in a row and add the parsed pages to the
           same AreaTreeModel instance which essentially concatenates all the input document to one single
           output document.
         </p>
@@ -119,18 +170,22 @@
       <section id="modifying">
         <title>Modifying Documents</title>
         <p>
-          One of the most important use cases for the intermediate format is obviously modifying the area
+          One of the most important use cases for this format is obviously modifying the area
           tree XML before finally rendering it to the target format. You can easily use XSLT to process
-          the IF file according to your needs. Please note, that we will currently not formally describe
-          the intermediate format. You need to have a good understanding its structure so you don't
+          the AT XML file according to your needs. Please note, that we will currently not formally describe
+          the area tree XML format. You need to have a good understanding its structure so you don't
           create any non-parseable files. We may add an XML Schema and more detailed documentation at a
           later time. You're invited to help us with that.
         </p>
+        <note>
+          The area tree XML format is sensitive to changes in whitespace. If you're not careful,
+          the modified file may not render correctly.
+        </note>
       </section>
       <section id="advanced">
         <title>Advanced Use</title>
         <p>
-          The generation of the intermediate format as well as it parsing process has been designed to allow
+          The generation of the area tree format as well as it parsing process has been designed to allow
           for maximum flexibility and optimization. Please note that you can call <code>setTransformerHandler()</code> on
           XMLRenderer to give the XMLRenderer your own TransformerHandler instance in case you would like to
           do custom serialization (to a W3C DOM, for example) and/or to directly modify the area tree using 
@@ -139,5 +194,134 @@
         </p>
       </section>
     </section>
+    <section id="usage-if">
+      <title>Usage of the Intermediate Format (IF)</title>
+      <p>
+        The Intermediate Format (IF) is generated by the <strong>IFSerializer</strong>
+        (MIME type: <strong>application/X-fop-intermediate-format</strong>).
+        So, you basically set the right MIME type for the output format and process your FO files
+        as if you would create a PDF file.
+      </p>
+      <p>
+        The IFSerializer is an implementation of the <strong>IFDocumentHandler</strong> and
+        <strong>IFPainter</strong> interfaces. The <strong>IFRenderer</strong> class is responsible
+        for converting FOP's area tree into calls against these two interfaces.
+      </p>
+      <ul>
+        <li>
+          IFDocumentHandler: This interface is used on the document-level and defines the
+          overall structure of the Intermediate Format.
+        </li>
+        <li>
+          IFPainter: This interface is used to generate graphical page content like text, images
+          and borders.
+        </li>
+      </ul>
+      <p>
+        As with the AT XML, there is an important detail to consider: The various output
+        implementations don't all use the same font sources. To be able
+        to create the right IF for the ultimate output file, you need to create the IF file using
+        the right font setup. This is achieved by telling the IFRenderer (responsible for
+        converting the area tree into calls to the IFDocumentHandler and IFPainter interfaces) 
+        to mimic another renderer. This is done by calling the IFSerializer's
+        mimicDocumentHandler() method with an instance of the ultimate target document handler
+        as the single parameter. This has a consequence: An IF file rendered with the
+        Java2DDocumentHandler may not look as expected when it was actually generated for the PDF
+        implementation. For implementations that use the same font setup,
+        this restriction does not apply (PDF and PS, for example). Generating the Intermediate
+        Format file is the first step.
+      </p>
+      <p>
+        The second step is to reparse the file using the <strong>IFParser</strong> which is
+        found in the org.apache.fop.render.intermediate package. The IFParser simply takes an
+        IFDocumentHandler instance against which it generates the appropriate calls. The IFParser
+        is implemented as a SAX ContentHandler so you're free to choose the method for
+        post-processing the IF file(s). You can use XSLT or write SAX- or DOM-based code to
+        manipulate the contents. You can find examples for the Intermediate Format
+        processing in the 
+        <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/"><code>examples/embedding</code></link>
+        directory in the FOP distribution.
+      </p>
+      <p>
+        The basic pattern to parse the intermediate format looks like this:
+      </p>
+      <source xml:space="preserve"><![CDATA[
+FopFactory fopFactory = FopFactory.newInstance();
+      
+// Setup output
+OutputStream out = new java.io.FileOutputStream(pdffile);
+out = new java.io.BufferedOutputStream(out);
+try {
+    //Setup user agent
+    FOUserAgent userAgent = fopFactory.newFOUserAgent();
+
+    //Create IFDocumentHandler instance
+    IFDocumentHandler targetHandler;
+    String mime = MimeConstants.MIME_PDF;
+    targetHandler = fopFactory.getRendererFactory().createDocumentHandler(
+            userAgent, mime);
+
+    //Setup fonts
+    IFUtil.setupFonts(targetHandler);
+    
+    //Tell the target handler where to write the PDF to
+    targetHandler.setResult(new StreamResult(pdffile));
+
+    //Parse the IF file
+    IFParser parser = new IFParser();
+    Source src = new StreamSource(myIFFile);
+    parser.parse(src, targetHandler, userAgent);
+            
+} finally {
+    out.close();
+}]]></source>
+      <p>
+        This example simply reads an intermediate file and renders it to a PDF file. Here
+        IFParser.parse() is used, but you can also just get a SAX ContentHandler by using the
+        IFParser.getContentHandler() method.
+      </p>
+      <section id="concat-if">
+        <title>Concatenating Documents</title>
+        <p>
+          This initial example is obviously not very useful. It would be faster to create the PDF file 
+          directly (without the intermediate step). As the
+          <link href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/examples/embedding/java/embedding/intermediate/ExampleConcat.java">ExampleConcat.java</link>
+          example shows you can easily parse multiple intermediate files in a row and use the
+          IFConcatenator class to concatenate page sequences from multiple source files to a single
+          output file. This particular example does the concatenation on the level of the
+          IFDocumentHandler interface. You could also do this in XSLT or using SAX on the XML level.
+          Whatever suits your process best.
+        </p>
+      </section>
+      <section id="modifying-if">
+        <title>Modifying Documents</title>
+        <p>
+          One of the most important use cases for this format is obviously modifying the
+          intermediate format before finally rendering it to the target format. You can easily use
+          XSLT to process the IF file according to your needs.
+        </p>
+        <p>
+          There is an XML Schema (located under
+          <link href="http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/documentation/intermediate-format-ng/">src/documentation/intermediate-format-ng</link>)
+          that helps you verify that your modified content is correct.
+        </p>
+        <p>
+          For certain output formats there's a caveat: Formats like AFP and PCL do not support
+          arbitrary transformations on the IF's "viewport" and "g" elements. Possible are
+          only rotations in 90 degree steps and translations.
+        </p>
+      </section>
+      <section id="advanced-if">
+        <title>Advanced Use</title>
+        <p>
+          The generation of the intermediate format as well as it parsing process has been
+          designed to allow for maximum flexibility and optimization. So rather than just passing
+          in a StreamResult to IFSerializer's setResult() method, you can also use a SAXResult
+          or a DOMResult. And as you've already seen , the IFParser on the other side allows you
+          to retrieve a ContentHandler instance where you can manually send SAX events to
+          start the parsing process (see <code>getContentHandler()</code>).
+        </p>
+      </section>
+    </section>
   </body>
 </document>

Modified: xmlgraphics/site/deploy/fop/trunk/metadata.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/metadata.html?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/metadata.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/metadata.html Tue Mar 10 16:58:52 2009
@@ -534,7 +534,7 @@
 </div>
 <div class="copyright">
         Copyright &copy;
-         1999-2008 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
+         1999-2009 <a href="http://www.apache.org/licenses/">The Apache Software Foundation.</a>
 </div>
 <!--+
     |end bottomstrip

Modified: xmlgraphics/site/deploy/fop/trunk/metadata.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/metadata.pdf?rev=752164&r1=752163&r2=752164&view=diff
==============================================================================
Binary files - no diff available.



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org


Mime
View raw message