xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r842287 [2/3] - in /websites/staging/xmlgraphics/trunk/content: ./ fop/1.0/ fop/1.1/ fop/trunk/
Date Fri, 14 Dec 2012 09:22:31 GMT
Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/fonts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/fonts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/fonts.html Fri Dec 14 09:22:28 2012
@@ -341,7 +341,7 @@ $(document).ready(function () {
         <div id="items">
         </div>
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/1.1/">1.1</a></div> -->
-      	<div class="section-content"><h1 id="apachewzxhzdk5-fop-fonts">Apache&trade; FOP: Fonts</h1>
+      	<div class="section-content"><h1 id="apachewzxhzdk9-fop-fonts">Apache&trade; FOP: Fonts</h1>
 <p><authors><person email="" name="Jeremias Märki"></person><person email="" name="Tore Engvig"></person><person email="" name="Adrian Cumiskey"></person><person email="" name="Max Berger"></person></authors></p>
 <h2 id="intro">Summary</h2>
 <p>The following table summarizes the font capabilities of the various Apache&trade; FOP renderers:</p>
@@ -563,11 +563,14 @@ $(document).ready(function () {
 <h3 id="truetype-collections-metrics">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). It will display all of the font names and exit with an Exception.</p>
-<p>Here is an example of generating a metrics file for a .ttc file:
-java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
-          org.apache.fop.fonts.apps.TTFReader -ttcname "MS Mincho"
-          msmincho.ttc msminch.xml
-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. Example:</p>
+<p>Here is an example of generating a metrics file for a .ttc file:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="o">\</span><span class="n">fop</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">io</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">TTFReader</span> <span class="o">-</span><span class="n">ttcname</span> <span class="s">&quot;MS Mincho&quot;</span>
+      <span class="n">msmincho</span><span class="o">.</span><span class="n">ttc</span> <span class="n">msminch</span><span class="o">.</span><span class="n">xml</span>
+</pre></div>
+
+
+<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. Example:</p>
 <div class="codehilite"><pre><span class="nt">&lt;font</span> <span class="na">embed-url=</span><span class="s">&quot;gulim.ttc&quot;</span> <span class="na">sub-font=</span><span class="s">&quot;GulimChe&quot;</span><span class="nt">&gt;</span>
   <span class="nt">&lt;font-triplet</span> <span class="na">name=</span><span class="s">&quot;GulimChe&quot;</span> <span class="na">style=</span><span class="s">&quot;normal&quot;</span> <span class="na">weight=</span><span class="s">&quot;normal&quot;</span><span class="nt">/&gt;</span>
 <span class="nt">&lt;/font&gt;</span>
@@ -576,9 +579,10 @@ Alternatively, the individual sub-fonts 
 
 <h3 id="autodetect">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:
-Manifest-Version: 1.0</p>
-<div class="codehilite"><pre>      <span class="n">Name:</span> <span class="n">font</span><span class="o">/</span><span class="n">myfont</span><span class="o">.</span><span class="n">ttf</span>
+<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>
+<div class="codehilite"><pre><span class="n">Manifest</span><span class="o">-</span><span class="n">Version:</span> <span class="mf">1.0</span>
+
+      <span class="n">Name:</span> <span class="n">font</span><span class="o">/</span><span class="n">myfont</span><span class="o">.</span><span class="n">ttf</span>
       <span class="n">Content</span><span class="o">-</span><span class="n">Type:</span> <span class="n">application</span><span class="o">/</span><span class="n">x</span><span class="o">-</span><span class="n">font</span>
 </pre></div>
 
@@ -590,24 +594,33 @@ Manifest-Version: 1.0</p>
 <h3 id="type1-metrics">Type 1 Font Metrics</h3>
 <p>Note that metrics files are optional and no longer required</p>
 <p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it. To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
-<p>Windows:
-java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file
-Unix:
-java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file
-PFMReader [options]:</p>
+<p>Windows:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="o">\</span><span class="n">fop</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">io</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">PFMReader</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="n">pfm</span><span class="o">-</span><span class="n">file</span> <span class="n">xml</span><span class="o">-</span><span class="n">file</span>
+</pre></div>
+
+
+<p>Unix:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="sr">/fop.jar:lib/</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">.</span><span class="n">jar:lib</span><span class="sr">/commons-logging.jar:lib/commo</span><span class="n">ns</span><span class="o">-</span><span class="n">io</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">PFMReader</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="n">pfm</span><span class="o">-</span><span class="n">file</span> <span class="n">xml</span><span class="o">-</span><span class="n">file</span>
+</pre></div>
+
+
+<p>PFMReader [options]:</p>
 <ul>
-<li><strong>-fn <fontname></strong> By default, FOP uses the fontname from the .pfm file when embedding the font. Use the "-fn" option to override this name with one you have chosen. This may be useful in some cases to ensure that applications using the output document (Acrobat Reader for example) use the embedded font instead of a local font with the same name.
-The classpath in the above example has been simplified for readability. You will have to adjust the classpath to the names of the actual JAR files in the lib directory. xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.The tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values. FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file. The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually. The constructed values however appear to have no visible influence.</li>
+<li><strong>-fn <fontname></strong> By default, FOP uses the fontname from the .pfm file when embedding the font. Use the "-fn" option to override this name with one you have chosen. This may be useful in some cases to ensure that applications using the output document (Acrobat Reader for example) use the embedded font instead of a local font with the same name.</li>
 </ul>
+<p>The classpath in the above example has been simplified for readability. You will have to adjust the classpath to the names of the actual JAR files in the lib directory. xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.The tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values. FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file. The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually. The constructed values however appear to have no visible influence.</p>
 <h3 id="truetype-metrics">TrueType Font Metrics</h3>
 <p>Note that metrics files are optional and no longer required</p>
-<p>FOP includes TTFReader, which reads the TTF file and generates an appropriate font metrics file for it. Use it in a similar manner to PFMReader. For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:
-java -cp build\fop.jar;lib\avalon-framework-4.2.0.jar;lib\commons-logging-1.0.4.jar;lib\commons-io-1.3.1.jar;lib\commons-logging-1.0.4.jar;lib\xmlgraphics-commons-1.5.jar
-          org.apache.fop.fonts.apps.TTFReader [options]
-          C:\myfonts\cmr10.ttf ttfcm.xml
-TTFReader [options]:</p>
+<p>FOP includes TTFReader, which reads the TTF file and generates an appropriate font metrics file for it. Use it in a similar manner to PFMReader. For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="o">\</span><span class="n">fop</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">-</span><span class="mf">4.2.0</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">-</span><span class="mf">1.0.4</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">io</span><span class="o">-</span><span class="mf">1.3.1</span><span class="o">.</span><
 span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">-</span><span class="mf">1.0.4</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">xmlgraphics</span><span class="o">-</span><span class="n">commons</span><span class="o">-</span><span class="mf">1.5</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">TTFReader</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span>
+      <span class="n">C:</span><span class="o">\</span><span class="n">myfonts</span><span class="o">\</span><span class="n">cmr10</span><span class="o">.</span><span class="n">ttf</span> <span class="n">ttfcm</span><span class="o">.</span><span class="n">xml</span>
+</pre></div>
+
+
+<p>TTFReader [options]:</p>
 <ul>
 <li>
 <p><strong>-d <DEBUG | INFO ></strong> Sets the debug level (default is INFO).</p>
@@ -655,12 +668,12 @@ TTFReader [options]:</p>
 <p>For automatically configured fonts there's a different mechanism to specify which fonts should be referenced rather than embedded. This is done in the "referenced-fonts" element in the configuration. Here's an example:</p>
 <p>:::xml
 <fop version="1.0">
-   <fonts>
-      <referenced-fonts>
-        <match font-family="Helvetica"/>
-        <match font-family="DejaVu.*"/>
-      </referenced-fonts>
-   </fonts>
+  <fonts>
+    <referenced-fonts>
+      <match font-family="Helvetica"/>
+      <match font-family="DejaVu.*"/>
+    </referenced-fonts>
+  </fonts>
 </fop></p>
 </li>
 </ol>
@@ -696,18 +709,18 @@ TTFReader [options]:</p>
 </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>
 <div class="codehilite"><pre><span class="nt">&lt;fop</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span><span class="nt">&gt;</span>
-   <span class="nt">&lt;fonts&gt;</span>
-      <span class="nt">&lt;substitutions&gt;</span>
-         <span class="nt">&lt;substitution&gt;</span>
-            <span class="nt">&lt;from</span> <span class="na">font-family=</span><span class="s">&quot;Arial&quot;</span> <span class="na">font-weight=</span><span class="s">&quot;700..900&quot;</span><span class="nt">/&gt;</span>
-            <span class="nt">&lt;to</span> <span class="na">font-family=</span><span class="s">&quot;Arial Black&quot;</span><span class="nt">/&gt;</span>
-         <span class="nt">&lt;/substitution&gt;</span>
-         <span class="nt">&lt;substitution&gt;</span>
-            <span class="nt">&lt;from</span> <span class="na">font-family=</span><span class="s">&quot;FrutigerLight&quot;</span><span class="nt">/&gt;</span>
-            <span class="nt">&lt;to</span> <span class="na">font-family=</span><span class="s">&quot;Times&quot;</span> <span class="na">font-weight=</span><span class="s">&quot;bold&quot;</span> <span class="na">font-style=</span><span class="s">&quot;italic&quot;</span><span class="nt">/&gt;</span>
-         <span class="nt">&lt;/substitution&gt;</span>
-      <span class="nt">&lt;/substitutions&gt;</span>
-   <span class="nt">&lt;/fonts&gt;</span>
+  <span class="nt">&lt;fonts&gt;</span>
+    <span class="nt">&lt;substitutions&gt;</span>
+      <span class="nt">&lt;substitution&gt;</span>
+        <span class="nt">&lt;from</span> <span class="na">font-family=</span><span class="s">&quot;Arial&quot;</span> <span class="na">font-weight=</span><span class="s">&quot;700..900&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;to</span> <span class="na">font-family=</span><span class="s">&quot;Arial Black&quot;</span><span class="nt">/&gt;</span>
+      <span class="nt">&lt;/substitution&gt;</span>
+      <span class="nt">&lt;substitution&gt;</span>
+        <span class="nt">&lt;from</span> <span class="na">font-family=</span><span class="s">&quot;FrutigerLight&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;to</span> <span class="na">font-family=</span><span class="s">&quot;Times&quot;</span> <span class="na">font-weight=</span><span class="s">&quot;bold&quot;</span> <span class="na">font-style=</span><span class="s">&quot;italic&quot;</span><span class="nt">/&gt;</span>
+      <span class="nt">&lt;/substitution&gt;</span>
+    <span class="nt">&lt;/substitutions&gt;</span>
+  <span class="nt">&lt;/fonts&gt;</span>
 <span class="nt">&lt;/fop&gt;</span>
 </pre></div>
 

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/hyphenation.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/hyphenation.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/hyphenation.html Fri Dec 14 09:22:28 2012
@@ -349,8 +349,8 @@ $(document).ready(function () {
 If you have made improvements to an existing Apache&trade; FOP hyphenation pattern, or if you have created one from scratch, please consider contributing these to OFFO so that they can benefit other FOP users as well. Please inquire on the <a href="../maillist.html#fop-user">FOP User mailing list</a>.</p>
 <h3 id="license-issues">License Issues</h3>
 <p>Many of the hyphenation files distributed with TeX and its offspring are licenced under the <a href="http://www.latex-project.org/lppl.html">LaTeX Project Public License (LPPL)</a>, which prevents them from being distributed with Apache software. The LPPL puts restrictions on file names in redistributed derived works which we feel can't guarantee. Some hyphenation pattern files have other or additional restrictions, for example against use for commercial purposes.</p>
-<p>Although Apache FOP cannot redistribute hyphenation pattern files that do not conform with its license scheme, that does not necessarily prevent users from using such hyphenation patterns with FOP. However, it does place on the user the responsibility for determining whether the user can rightly use such hyphenation patterns under the hyphenation pattern license.
-<warning>The user is responsible to settle license issues for hyphenation pattern files that are obtained from non-Apache sources.</warning></p>
+<p>Although Apache FOP cannot redistribute hyphenation pattern files that do not conform with its license scheme, that does not necessarily prevent users from using such hyphenation patterns with FOP. However, it does place on the user the responsibility for determining whether the user can rightly use such hyphenation patterns under the hyphenation pattern license.</p>
+<p><warning>The user is responsible to settle license issues for hyphenation pattern files that are obtained from non-Apache sources.</warning></p>
 <h3 id="sources">Sources of Custom Hyphenation Pattern Files</h3>
 <p>The most important source of hyphenation pattern files is the <a href="http://www.ctan.org/tex-archive/language/hyphenation/">CTAN TeX Archive</a>.</p>
 <h3 id="install">Installing Custom Hyphenation Patterns</h3>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/metadata.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/metadata.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/metadata.html Fri Dec 14 09:22:28 2012
@@ -348,28 +348,28 @@ $(document).ready(function () {
 <p>As noted above, there's no officially recommended way to embed metadata in XSL-FO. Apache&trade; FOP supports embedding XMP in XSL-FO. Currently, only support for document-level metadata is implemented. Object-level metadata will be implemented when there's interest.</p>
 <p>Document-level metadata can be specified in the <code>fo:declarations</code> element. XMP specification recommends to use <code>x:xmpmeta</code>, <code>rdf:RDF</code>, and <code>rdf:Description</code> elements as shown in example below. Both <code>x:xmpmeta</code> and <code>rdf:RDF</code> elements are recognized as the top-level element introducing an XMP fragment (as per the XMP specification).</p>
 <h3 id="xmp-example">Example</h3>
-<div class="codehilite"><pre><span class="k">[..]</span>
-<span class="err">&lt;/fo:layout-master-set&gt;</span>
-<span class="err">&lt;fo:declarations&gt;</span>
-  <span class="na">&lt;x:xmpmeta xmlns:x</span><span class="o">=</span><span class="s">&quot;adobe:ns:meta/&quot;&gt;</span>
-<span class="s">    &lt;rdf:RDF xmlns:rdf=&quot;http://www.w3.org/1999/02/22-rdf-syntax-ns#&quot;&gt;</span>
-<span class="s">      &lt;rdf:Description rdf:about=&quot;&quot;</span>
-<span class="s">          xmlns:dc=&quot;http://purl.org/dc/elements/1.1/&quot;&gt;</span>
-<span class="s">        &lt;!-- Dublin Core properties go here --&gt;</span>
-<span class="s">        &lt;dc:title&gt;Document title&lt;/dc:title&gt;</span>
-<span class="s">        &lt;dc:creator&gt;Document author&lt;/dc:creator&gt;</span>
-<span class="s">        &lt;dc:description&gt;Document subject&lt;/dc:description&gt;</span>
-<span class="s">      &lt;/rdf:Description&gt;</span>
-<span class="s">      &lt;rdf:Description rdf:about=&quot;&quot;</span>
-<span class="s">          xmlns:xmp=&quot;http://ns.adobe.com/xap/1.0/&quot;&gt;</span>
-<span class="s">        &lt;!-- XMP properties go here --&gt;</span>
-<span class="s">        &lt;xmp:CreatorTool&gt;Tool used to make the PDF&lt;/xmp:CreatorTool&gt;</span>
-<span class="s">      &lt;/rdf:Description&gt;</span>
-<span class="s">    &lt;/rdf:RDF&gt;</span>
-<span class="s">  &lt;/x:xmpmeta&gt;</span>
-<span class="err">&lt;/fo:declarations&gt;</span>
-<span class="err">&lt;fo:page-sequence</span> <span class="err">...</span>
-<span class="k">[..]</span>
+<div class="codehilite"><pre>[..]
+<span class="nt">&lt;/fo:layout-master-set&gt;</span>
+<span class="nt">&lt;fo:declarations&gt;</span>
+  <span class="nt">&lt;x:xmpmeta</span> <span class="na">xmlns:x=</span><span class="s">&quot;adobe:ns:meta/&quot;</span><span class="nt">&gt;</span>
+    <span class="nt">&lt;rdf:RDF</span> <span class="na">xmlns:rdf=</span><span class="s">&quot;http://www.w3.org/1999/02/22-rdf-syntax-ns#&quot;</span><span class="nt">&gt;</span>
+      <span class="nt">&lt;rdf:Description</span> <span class="na">rdf:about=</span><span class="s">&quot;&quot;</span>
+          <span class="na">xmlns:dc=</span><span class="s">&quot;http://purl.org/dc/elements/1.1/&quot;</span><span class="nt">&gt;</span>
+        <span class="c">&lt;!-- Dublin Core properties go here --&gt;</span>
+        <span class="nt">&lt;dc:title&gt;</span>Document title<span class="nt">&lt;/dc:title&gt;</span>
+        <span class="nt">&lt;dc:creator&gt;</span>Document author<span class="nt">&lt;/dc:creator&gt;</span>
+        <span class="nt">&lt;dc:description&gt;</span>Document subject<span class="nt">&lt;/dc:description&gt;</span>
+      <span class="nt">&lt;/rdf:Description&gt;</span>
+      <span class="nt">&lt;rdf:Description</span> <span class="na">rdf:about=</span><span class="s">&quot;&quot;</span>
+          <span class="na">xmlns:xmp=</span><span class="s">&quot;http://ns.adobe.com/xap/1.0/&quot;</span><span class="nt">&gt;</span>
+        <span class="c">&lt;!-- XMP properties go here --&gt;</span>
+        <span class="nt">&lt;xmp:CreatorTool&gt;</span>Tool used to make the PDF<span class="nt">&lt;/xmp:CreatorTool&gt;</span>
+      <span class="nt">&lt;/rdf:Description&gt;</span>
+    <span class="nt">&lt;/rdf:RDF&gt;</span>
+  <span class="nt">&lt;/x:xmpmeta&gt;</span>
+<span class="nt">&lt;/fo:declarations&gt;</span>
+<span class="nt">&lt;fo:page-sequence</span> <span class="err">...</span>
+<span class="err">[..]</span>
 </pre></div>
 
 

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/output.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/output.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/output.html Fri Dec 14 09:22:28 2012
@@ -342,7 +342,6 @@ $(document).ready(function () {
         </div>
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/1.1/">1.1</a></div> -->
       	<div class="section-content"><h1 id="apachewzxhzdk43-fop-output-formats">Apache&trade; FOP Output Formats</h1>
-<p><authors><person email="keiron@aftexsw.com" name="Keiron Liddle"></person><person email="" name="Art Welch"></person></authors></p>
 <p>Apache&trade; FOP supports multiple output formats by using a different renderer for each format. The renderers do not all have the same set of capabilities, sometimes because of the output format itself, sometimes because some renderers get more development attention than others.</p>
 <h2 id="general">General Information</h2>
 <h3 id="general-fonts">Fonts</h3>
@@ -394,7 +393,8 @@ $(document).ready(function () {
 <p>PDF is the best supported output format. It is also the most accurate with text and layout. This creates a PDF document that is streamed out as each page is rendered. This means that the internal page index information is stored near the end of the document. The PDF version supported is 1.4. PDF versions are forwards/backwards compatible.</p>
 <p>Note that FOP does not currently support PDF/A-1a. Support for <a href="accessibility.html">Tagged PDF</a>, <a href="pdfa.html">PDF/A-1b</a> and <a href="pdfx.html">PDF/X</a> has recently been added, however.</p>
 <h3 id="pdf-fonts">Fonts</h3>
-<p>PDF has a set of fonts that are always available to all PDF viewers; to quote from the PDF Specification: <em>"PDF prescribes a set of 14 standard fonts that can be used without prior definition. These include four faces each of three Latin text typefaces (Courier, Helvetica, and Times), as well as two symbolic fonts (Symbol and ITC Zapf Dingbats). These fonts, or suitable substitute fonts with the same metrics, are guaranteed to be available in all PDF viewer applications."</em></p>
+<p>PDF has a set of fonts that are always available to all PDF viewers; to quote from the PDF Specification:</p>
+<p><em>"PDF prescribes a set of 14 standard fonts that can be used without prior definition. These include four faces each of three Latin text typefaces (Courier, Helvetica, and Times), as well as two symbolic fonts (Symbol and ITC Zapf Dingbats). These fonts, or suitable substitute fonts with the same metrics, are guaranteed to be available in all PDF viewer applications."</em></p>
 <h3 id="pdf-postprocess">Post-processing</h3>
 <p>FOP does not currently support several desirable PDF features: watermarks and signatures. One workaround is to use Adobe Acrobat (the full version, not the Reader) to process the file manually or with scripting that it supports.</p>
 <p>Another popular post-processing tool is <a href="http://www.lowagie.com/iText">iText</a>, which has tools for adding security features, document properties, watermarks, and many other features to PDF files.
@@ -1118,7 +1118,7 @@ These are some known restrictions compar
 </pre></div>
 
 
-<p>The default value for the "compression" setting is "PackBits" which which is a widely supported RLE compression scheme for TIFF. The set of compression names to be used here matches the set that the Image I/O API uses. Note that not all compression schemes may be available during runtime. This depends on the actual codecs being available. Here is a list of possible values:</p>
+<p>The default value for the <code>"compression"</code> setting is <code>"PackBits"</code> which which is a widely supported RLE compression scheme for TIFF. The set of compression names to be used here matches the set that the Image I/O API uses. Note that not all compression schemes may be available during runtime. This depends on the actual codecs being available. Here is a list of possible values:</p>
 <ul>
 <li>
 <p><code>NONE</code> (no compression)</p>
@@ -1145,8 +1145,8 @@ These are some known restrictions compar
 <p><code>CCITT T.6</code> (Fax Group 4)</p>
 </li>
 </ul>
-<p>This setting may override any setting made using the <code>"color-mode"</code>. For example, if <code>"CCITT T.6"</code> is selected, the color mode is automatically forced to <code>"bi-level"</code> because this compression format only supports bi-level images.
-If you want to use CCITT compression, please make sure you've got <a href="http://java.sun.com/products/java-media/jai/current.html">Java Advanced Imaging Image I/O Tools</a> in your classpath. The Sun JRE doesn't come with a TIFF codec built in, so it has to be added separately. The internal TIFF codec from XML Graphics Commons only supports PackBits, Deflate and JPEG compression for writing.</p>
+<p>This setting may override any setting made using the <code>"color-mode"</code>. For example, if <code>"CCITT T.6"</code> is selected, the color mode is automatically forced to <code>"bi-level"</code> because this compression format only supports bi-level images.</p>
+<p><note>If you want to use CCITT compression, please make sure you've got <a href="http://java.sun.com/products/java-media/jai/current.html">Java Advanced Imaging Image I/O Tools</a> in your classpath. The Sun JRE doesn't come with a TIFF codec built in, so it has to be added separately. The internal TIFF codec from XML Graphics Commons only supports PackBits, Deflate and JPEG compression for writing.</note></p>
 <h3 id="bitmap-rendering-options">Runtime Rendering Options</h3>
 <p>The IF-based bitmap output implementations support a rendering option with the key "target-bitmap-size" (value: java.awt.Dimension) that allows to force the pages to be proportionally fit into a bitmap of a given size. This can be used to produce thumbnails or little preview images of the individual pages. An example:</p>
 <div class="codehilite"><pre><span class="n">userAgent</span><span class="o">.</span><span class="na">getRenderingOptions</span><span class="o">().</span><span class="na">put</span><span class="o">(</span>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfa.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfa.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfa.html Fri Dec 14 09:22:28 2012
@@ -385,10 +385,10 @@ $(document).ready(function () {
 <p>PDF is forced to version 1.4 if PDF/A-1 is activated.</p>
 </li>
 <li>
-<p>No filter must be specified explicitely for metadata objects. Metadata must be embedded in clear text so non-PDF-aware applications can extract the XMP metadata.
-There are additional requirements if you want to enabled PDF/A-1a (Tagged PDF). This is particularly the specification of the natural language and alternative descriptions for images. Please refer to the <a href="accessibility.html">Accessibility page</a> for details.</p>
+<p>No filter must be specified explicitely for metadata objects. Metadata must be embedded in clear text so non-PDF-aware applications can extract the XMP metadata.</p>
 </li>
 </ul>
+<p>There are additional requirements if you want to enabled PDF/A-1a (Tagged PDF). This is particularly the specification of the natural language and alternative descriptions for images. Please refer to the <a href="accessibility.html">Accessibility page</a> for details.</p>
 <h2 id="profile-compatibility">PDF profile compatibility</h2>
 <p>The PDF profiles "PDF/X-3:2003" and "PDF/A-1b" (or "PDF/A-1a") are compatible and can both be activated at the same time.</p>
 <h2 id="interoperability">Interoperability</h2>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfencryption.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfencryption.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfencryption.html Fri Dec 14 09:22:28 2012
@@ -346,7 +346,7 @@ $(document).ready(function () {
 <h2 id="Overview">Overview</h2>
 <p>Apache&trade; FOP supports encryption of PDF output, thanks to Patrick C. Lankswert. This feature is commonly used to prevent unauthorized viewing, printing, editing, copying text from the document and doing annotations. It is also possible to ask the user for a password in order to view the contents. Note that there already exist third party applications which can decrypt an encrypted PDF without effort and allow the aforementioned operations, therefore the degree of protection is limited.</p>
 <p>For further information about features and restrictions regarding PDF encryption, look at the documentation coming with Adobe Acrobat or the technical documentation on the Adobe web site.</p>
-<h2 id="usage-command-line-usage-28command-line29">Usage (command line) {#Usage-%28command-line%29}</h2>
+<h2 id="commandline">Usage (command line)</h2>
 <p>Encryption is enabled by supplying any of the encryption related options.</p>
 <p>An owner password is set with the <code>-o</code> option. This password is actually used as encryption key. Many tools for PDF processing ask for this password to disregard any restriction imposed on the PDF document.</p>
 <p>If no owner password has been supplied but FOP was asked to apply some restrictions, a random password is used. In this case it is obviously impossiible to disregard restrictions in PDF processing tools.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfx.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfx.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/pdfx.html Fri Dec 14 09:22:28 2012
@@ -344,8 +344,8 @@ $(document).ready(function () {
       	<div class="section-content"><h1 id="apachewzxhzdk1-fop-pdfx-iso-15930">Apache&trade; FOP: PDF/X (ISO 15930)</h1>
 <p><authors><person email="jeremias@apache.org" name="Jeremias Märki"></person></authors></p>
 <h2 id="overview">Overview</h2>
-<p><warning>Support for PDF/X is available beginning with version 0.93. This feature is new and may not be 100% complete, yet. Feedback is welcome.</warning>
-PDF/X is a standard which faciliates prepress digital data exchange using PDF. Currently, only PDF/X-3:2003 is implemented out of the many different flavours of PDF/X profiles. PDF/X-3:2003 is documented in <a href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=39940&amp;ICS1=37&amp;ICS2=100&amp;ICS3=99">ISO 15930-6:2003(E)</a>. More info on PDF/X can be found on the <a href="http://www.pdfx.info/">PDF/X info site</a>.</p>
+<p><warning>Support for PDF/X is available beginning with version 0.93. This feature is new and may not be 100% complete, yet. Feedback is welcome.</warning></p>
+<p>PDF/X is a standard which faciliates prepress digital data exchange using PDF. Currently, only PDF/X-3:2003 is implemented out of the many different flavours of PDF/X profiles. PDF/X-3:2003 is documented in <a href="http://www.iso.org/iso/en/CatalogueDetailPage.CatalogueDetail?CSNUMBER=39940&amp;ICS1=37&amp;ICS2=100&amp;ICS3=99">ISO 15930-6:2003(E)</a>. More info on PDF/X can be found on the <a href="http://www.pdfx.info/">PDF/X info site</a>.</p>
 <h2 id="status">Implementation Status</h2>
 <p><strong>PDF/X-3:2003</strong> is implemented to the degree that FOP supports the creation of the elements described in ISO 15930-6.</p>
 <p>An important restriction of the current implementation is that all normal RGB colors specified in XSL-FO and SVG are left unchanged in the sRGB color space (XSL-FO and SVG both use sRGB as their default color space). There's no conversion to a CMYK color space. Although sRGB is a calibrated color space, its color space has a different size than a CMYK color space which makes the conversion a lossy conversion and can lead to unwanted results. Although the use of the calibrated sRGB has been promoted for years, print shops usually prefer to convert an sRGB PDF to CMYK prior to production. Until there's full CMYK support in FOP you will have to work closely with your print service provider to make sure you get the intended result.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/servlets.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/servlets.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/servlets.html Fri Dec 14 09:22:28 2012
@@ -466,23 +466,23 @@ The <code>Source</code> instance used ab
 </li>
 </ul>
 <p>Here are some example snippets:</p>
-<div class="codehilite"><pre><span class="sr">//</span><span class="n">Setting</span> <span class="n">up</span> <span class="n">the</span> <span class="n">JAXP</span> <span class="n">TransformerFactory</span>
-<span class="n">this</span><span class="o">.</span><span class="n">transFactory</span> <span class="o">=</span> <span class="n">TransformerFactory</span><span class="o">.</span><span class="n">newInstance</span><span class="p">();</span>
-<span class="n">this</span><span class="o">.</span><span class="n">transFactory</span><span class="o">.</span><span class="n">setURIResolver</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">uriResolver</span><span class="p">);</span>
-
-<span class="p">[</span><span class="o">..</span><span class="p">]</span>
-
-<span class="sr">//</span><span class="n">Setting</span> <span class="n">up</span> <span class="n">the</span> <span class="n">FOP</span> <span class="n">factory</span>
-<span class="n">this</span><span class="o">.</span><span class="n">fopFactory</span> <span class="o">=</span> <span class="n">FopFactory</span><span class="o">.</span><span class="n">newInstance</span><span class="p">();</span>
-<span class="n">this</span><span class="o">.</span><span class="n">fopFactory</span><span class="o">.</span><span class="n">setURIResolver</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">uriResolver</span><span class="p">);</span>
-
-<span class="p">[</span><span class="o">..</span><span class="p">]</span>
-
-<span class="sr">//</span><span class="n">The</span> <span class="n">stylesheet</span> <span class="k">for</span> <span class="n">the</span> <span class="n">JAXP</span> <span class="n">Transfomer</span>
-<span class="n">Source</span> <span class="n">xsltSrc</span> <span class="o">=</span> <span class="n">this</span><span class="o">.</span><span class="n">uriResolver</span><span class="o">.</span><span class="n">resolve</span><span class="p">(</span>
-    <span class="s">&quot;servlet-context:/xslt/mystylesheet.xsl&quot;</span><span class="p">,</span> <span class="n">null</span><span class="p">);</span>
-<span class="n">Transformer</span> <span class="n">transformer</span> <span class="o">=</span> <span class="n">this</span><span class="o">.</span><span class="n">transFactory</span><span class="o">.</span><span class="n">newTransformer</span><span class="p">(</span><span class="n">xsltSrc</span><span class="p">);</span>
-<span class="n">transformer</span><span class="o">.</span><span class="n">setURIResolver</span><span class="p">(</span><span class="n">this</span><span class="o">.</span><span class="n">uriResolver</span><span class="p">);</span>
+<div class="codehilite"><pre><span class="c1">//Setting up the JAXP TransformerFactory</span>
+<span class="k">this</span><span class="o">.</span><span class="na">transFactory</span> <span class="o">=</span> <span class="n">TransformerFactory</span><span class="o">.</span><span class="na">newInstance</span><span class="o">();</span>
+<span class="k">this</span><span class="o">.</span><span class="na">transFactory</span><span class="o">.</span><span class="na">setURIResolver</span><span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">uriResolver</span><span class="o">);</span>
+
+<span class="o">[..]</span>
+
+<span class="c1">//Setting up the FOP factory</span>
+<span class="k">this</span><span class="o">.</span><span class="na">fopFactory</span> <span class="o">=</span> <span class="n">FopFactory</span><span class="o">.</span><span class="na">newInstance</span><span class="o">();</span>
+<span class="k">this</span><span class="o">.</span><span class="na">fopFactory</span><span class="o">.</span><span class="na">setURIResolver</span><span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">uriResolver</span><span class="o">);</span>
+
+<span class="o">[..]</span>
+
+<span class="c1">//The stylesheet for the JAXP Transfomer</span>
+<span class="n">Source</span> <span class="n">xsltSrc</span> <span class="o">=</span> <span class="k">this</span><span class="o">.</span><span class="na">uriResolver</span><span class="o">.</span><span class="na">resolve</span><span class="o">(</span>
+    <span class="s">&quot;servlet-context:/xslt/mystylesheet.xsl&quot;</span><span class="o">,</span> <span class="kc">null</span><span class="o">);</span>
+<span class="n">Transformer</span> <span class="n">transformer</span> <span class="o">=</span> <span class="k">this</span><span class="o">.</span><span class="na">transFactory</span><span class="o">.</span><span class="na">newTransformer</span><span class="o">(</span><span class="n">xsltSrc</span><span class="o">);</span>
+<span class="n">transformer</span><span class="o">.</span><span class="na">setURIResolver</span><span class="o">(</span><span class="k">this</span><span class="o">.</span><span class="na">uriResolver</span><span class="o">);</span>
 </pre></div>
 
 

Modified: websites/staging/xmlgraphics/trunk/content/fop/1.1/upgrading.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/1.1/upgrading.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/1.1/upgrading.html Fri Dec 14 09:22:28 2012
@@ -395,11 +395,10 @@ $(document).ready(function () {
 <li>
 <p>Beginning with version 0.94 you can skip the generation of font metric files and remove the "font-metrics" attribute in the font configuration. In the unlikely case that due to a bug you still need to use font metrics files you will need to regenerate the font metrics file if yours are from a FOP version before 0.93.</p>
 </li>
-</ul>
-<p>-
-The new code is much more strict about the interpretation of the XSL-FO specification. Things that worked fine in version 0.20.5 might start to produce warnings or even errors now. FOP 0.20.5 contains many bugs which have been corrected in the new code.
-While FOP 0.20.5 allowed you to have empty <code>fo:table-cell</code> elements, the new code will complain about that (unless relaxed validation is enabled) because the specification demands at least one block-level element (<code>(%block;)+</code>, see <a href="http://www.w3.org/TR/xsl/#fo_table-cell">XSL-FO 1.1, 6.7.10</a>) inside an <code>fo:table-cell</code> element.</p>
-<ul>
+<li>
+<p>The new code is much more strict about the interpretation of the XSL-FO specification. Things that worked fine in version 0.20.5 might start to produce warnings or even errors now. FOP 0.20.5 contains many bugs which have been corrected in the new code.</p>
+<p>While FOP 0.20.5 allowed you to have empty <code>fo:table-cell</code> elements, the new code will complain about that (unless relaxed validation is enabled) because the specification demands at least one block-level element (<code>(%block;)+</code>, see <a href="http://www.w3.org/TR/xsl/#fo_table-cell">XSL-FO 1.1, 6.7.10</a>) inside an <code>fo:table-cell</code> element.</p>
+</li>
 <li>
 <p>Extensions and Renderers written for version 0.20.5 will not work with the new code! The new FOP extension for <a href="http://barcode4j.sourceforge.net">Barcode4J</a> is available since January 2007.</p>
 </li>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/accessibility.html Fri Dec 14 09:22:28 2012
@@ -341,16 +341,37 @@ $(document).ready(function () {
         <div id="items">
         </div>
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
-      	<div class="section-content"><h1 id="apachewzxhzdk4-fop-accessibility">Apache&trade; FOP: Accessibility</h1>
+      	<div class="section-content"><h1 id="apachewzxhzdk7-fop-accessibility">Apache&trade; FOP: Accessibility</h1>
 <h2 id="overview">Overview</h2>
 <p>This page describes the <a href="http://en.wikipedia.org/wiki/Accessibility">accessibility</a> features of Apache&trade; FOP. <a href="http://www.section508.gov/">Section 508</a> defines accessibility in the context of electronic documents for the USA but other countries have similar requirements.</p>
 <p>Accessibility features are available only for the PDF output format and there are some implementation limitations. Also, certain actions must be undertaken by the content creator to ensure that FOP can create a truly accessible document.</p>
-<h2 id="enabling-accessibility">Enabling accessibility</h2>
+<h2 id="Enabling-accessibility">Enabling accessibility</h2>
 <p>There are 3 ways to enable accessibility:</p>
 <ol>
-<li><strong>Command line:</strong> The command line option -a turns on accessibility:<br/><code>fop -a -fo mydocument.fo -pdf mydocument.pdf</code><br/></li>
-<li><strong>Embedding:</strong><br/><code>userAgent.setAccessibility(true);</code> <br/></li>
-<li><strong>Optional setting in fop.xconf file:</strong><br/><code>&lt;fop version="1.0"&gt;</code><br/><code>&lt;accessibility&gt;true&lt;/accessibility&gt;</code><br/><code>...</code><br/><code>&lt;/fop&gt;</code></li>
+<li>
+<p><strong>Command line:</strong> The command line option <code>-a</code> turns on accessibility:</p>
+<div class="codehilite"><pre><span class="n">fop</span> <span class="o">-</span><span class="n">a</span> <span class="o">-</span><span class="n">fo</span> <span class="n">mydocument</span><span class="o">.</span><span class="n">fo</span> <span class="o">-</span><span class="n">pdf</span> <span class="n">mydocument</span><span class="o">.</span><span class="n">pdf</span>
+</pre></div>
+
+
+</li>
+<li>
+<p><strong>Embedding:</strong></p>
+<div class="codehilite"><pre><span class="n">userAgent</span><span class="o">.</span><span class="na">setAccessibility</span><span class="o">(</span><span class="kc">true</span><span class="o">);</span>
+</pre></div>
+
+
+</li>
+<li>
+<p><strong>Optional setting in fop.xconf file:</strong></p>
+<div class="codehilite"><pre><span class="nt">&lt;fop</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span><span class="nt">&gt;</span>
+  <span class="nt">&lt;accessibility&gt;</span>true<span class="nt">&lt;/accessibility&gt;</span>
+  ...
+<span class="nt">&lt;/fop&gt;</span>
+</pre></div>
+
+
+</li>
 </ol>
 <p>When accessibility is enabled, additional information relating to the logical structure of the document is added to the PDF. That information allows the PDF viewer (or a text-to-speech application) to retrieve the natural reading order of the document.
 The processing of the logical structure is memory-hungry. You may need to adjust the Java heap size in order to process larger files.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/compiling.html Fri Dec 14 09:22:28 2012
@@ -346,11 +346,11 @@ $(document).ready(function () {
 <p>Apache&trade; FOP snapshots are either pre-compiled binary or source. If you are using a binary snapshot, it is already built and there is no need to build it again. If you got the source code from a repository snapshot or via Subversion you will need to build FOP. See the <a href="../download.html">Download Instructions</a> for information about where to obtain binary or repository snapshots, and whether a binary or source snapshot is best for your needs.</p>
 <h2 id="env">Set Up Your Environment</h2>
 <h3 id="env-jdk">JDK</h3>
-<p>Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.4 (A Java Runtime Environment is not sufficient).</p>
+<p>Building FOP requires a minimum Java Development Kit (JDK/SDK) of 1.5 (A Java Runtime Environment is not sufficient).</p>
 <h3 id="env-classpath">CLASSPATH</h3>
 <p>There is generally no need to setup a classpath. All libraries needed to compile FOP are included in the source distribution and are referenced by the build script. You will only need to adjust the classpath if you build FOP in some other way. See the build script build.xml for details.</p>
 <h3 id="env-java-home">JAVA_HOME</h3>
-<p>The build script uses <a href="http://ant.apache.org/">Apache Ant</a>, a popular Java-based build tool, which usually requires that the environment variable JAVA_HOME point to your local JDK root directory. This is true even if you use JDK 1.4 or above, which normally does not need this setting.</p>
+<p>The build script uses <a href="http://ant.apache.org/">Apache Ant</a>, a popular Java-based build tool, which usually requires that the environment variable JAVA_HOME point to your local JDK root directory. This is true even if you use JDK 1.5 or above, which normally does not need this setting.</p>
 <h3 id="env-ant">Apache Ant</h3>
 <p><a href="http://ant.apache.org/">Apache Ant</a> (Version 1.7 or later) must be installed in order to build FOP. Following best practices we don't include Ant with FOP anymore. You can find the <a href="http://ant.apache.org/manual/">instructions to install Ant in the Ant manual</a> on the web.</p>
 <h2 id="build-script">Run the Build Script</h2>
@@ -367,7 +367,7 @@ The most useful targets are:</p>
 <p><strong>clean</strong>: Cleans the build directory. This is useful for making sure that any build errors are cleaned up before starting a new build. It should not ordinarily be needed, but may be helpful if you are having problems with the build process itself.</p>
 </li>
 <li>
-<p><strong>javadocs</strong>: Creates the FOP API documentation.A minimum JDK version of 1.4.2 is required for generating the javadocs.</p>
+<p><strong>javadocs</strong>: Creates the FOP API documentation.</p>
 </li>
 </ul>
 <p>To run the build:

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/configuration.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/configuration.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/configuration.html Fri Dec 14 09:22:28 2012
@@ -341,7 +341,7 @@ $(document).ready(function () {
         <div id="items">
         </div>
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
-      	<div class="section-content"><h1 id="apachewzxhzdk11-fop-configuration">Apache&trade; FOP: Configuration</h1>
+      	<div class="section-content"><h1 id="apachewzxhzdk12-fop-configuration">Apache&trade; FOP: Configuration</h1>
 <h2 id="general">Configuration File Basics</h2>
 <p>The Apache&trade; FOP configuration file is an XML file containing a variety of settings that are useful for controlling FOP's behavior, and for helping it find resources that you wish it to use.</p>
 <p>The easiest way to get started using a FOP configuration file is to copy the sample found at <code>{fop-dir}/conf/fop.xconf</code> to a location of your choice, and then to edit it according to your needs. It contains templates for the various configuration options, most of which are commented out. Remove the comments and change the settings for entries that you wish to use. Be sure to follow any instructions, including comments which specify the value range. Also, since the configuration file is XML, be sure to keep it well-formed.</p>
@@ -503,6 +503,22 @@ $(document).ready(function () {
 <p>The first penalty element increases the penalty for the raw CCITT loader. This practically forces the decoding of CCITT compressed TIFF images except if there are no TIFF codecs available.</p>
 <p>The second penalty element sets an "infinite" penalty for the TIFF loader using the internal TIFF codec. This practically disables that plug-in as it will never be chosen as a possible solution.</p>
 <p>Negative penalties are possible to promote a plug-in but a negative penalty sum will be treated as zero penalty in most cases. For more details on the image loading framework, please consult the documentation there.</p>
+<p>The ImageLoaderPNG and ImageLoaderRawPNG have a hard-coded penalty of 1000 and as such the ImageLoaderImageIO image loader will be selected by default when loading PNGs unless the latter is disabled by awarding a INFINITE penalty to it, or one of the former two is promoted by awarding a strong negative penalty (say, -10000) to it.</p>
+<div class="codehilite"><pre><span class="nt">&lt;fop</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span><span class="nt">&gt;</span>
+  [..]
+  <span class="nt">&lt;image-loading&gt;</span>
+    <span class="nt">&lt;penalty</span> <span class="na">value=</span><span class="s">&quot;-10000&quot;</span>
+        <span class="na">class=</span><span class="s">&quot;org.apache.xmlgraphics.image.loader.impl.ImageLoaderRawPNG&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;penalty</span> <span class="na">value=</span><span class="s">&quot;INFINITE&quot;</span>
+        <span class="na">class=</span><span class="s">&quot;org.apache.xmlgraphics.image.loader.impl.ImageLoaderPNG&quot;</span><span class="nt">/&gt;</span>
+    <span class="nt">&lt;penalty</span> <span class="na">value=</span><span class="s">&quot;INFINITE&quot;</span>
+        <span class="na">class=</span><span class="s">&quot;org.apache.xmlgraphics.image.loader.impl.imageio.ImageLoaderImageIO&quot;</span><span class="nt">/&gt;</span>
+  <span class="nt">&lt;/image-loading&gt;</span>
+  <span class="nt">&lt;renderers....</span>
+<span class="err">&lt;/fop</span><span class="nt">&gt;</span>
+</pre></div>
+
+
 <h2 id="renderers">Renderer configuration</h2>
 <p>Each Renderer has its own configuration section which is identified by the MIME type the Renderer is written for, ex. "application/pdf" for the PDF Renderer.</p>
 <p>The configuration for the PDF Renderer could look like this:</p>
@@ -589,7 +605,7 @@ $(document).ready(function () {
 
 <p>By default FOP produces PDF files of version 1.4, but this can be changed in order to benefit from features that appeared in newer versions of PDF. At the moment, only a few features from PDF 1.5 have been implemented, but the configuration element will accept any value between 1.4 and 1.7. This is the value that will appear in the PDF header, although only features up to 1.5 will actually be used.</p>
 <div class="codehilite"><pre><span class="nt">&lt;renderer</span> <span class="na">mime=</span><span class="s">&quot;application/pdf&quot;</span><span class="nt">&gt;</span>
-
+  <span class="nt">&lt;version&gt;</span>1.5<span class="nt">&lt;/version&gt;</span>
   <span class="c">&lt;!-- Versions 1.4, 1.5, 1.6 and 1.7 are accepted, all other values are invalid --&gt;</span>
 <span class="nt">&lt;/renderer&gt;</span>
 </pre></div>
@@ -617,7 +633,7 @@ $(document).ready(function () {
 <h3 id="pcl-renderer">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 you don't have to do any custom font configuration in this case but you have to use the font names offered by Java.</p>
 <p>Additionally, there are certain settings that control how the renderer handles various elements.</p>
-<div class="codehilite"><pre><span class="nt">&lt;renderer</span> <span class="na">mime=</span><span class="s">&quot;application/vnd.hp-PCL&quot;</span><span class="nt">&gt;</span>
+<div class="codehilite"><pre><span class="nt">&lt;renderer</span> <span class="na">mime=</span><span class="s">&quot;application/x-pcl&quot;</span><span class="nt">&gt;</span>
   <span class="nt">&lt;rendering&gt;</span>quality<span class="nt">&lt;/rendering&gt;</span>
   <span class="nt">&lt;text-rendering&gt;</span>bitmap<span class="nt">&lt;/text-rendering&gt;</span>
 <span class="nt">&lt;/renderer&gt;</span>
@@ -631,6 +647,7 @@ $(document).ready(function () {
 <div class="codehilite"><pre><span class="nt">&lt;renderer</span> <span class="na">mime=</span><span class="s">&quot;application/x-afp&quot;</span><span class="nt">&gt;</span>
   <span class="nt">&lt;images</span> <span class="na">mode=</span><span class="s">&quot;b+w&quot;</span> <span class="na">bits-per-pixel=</span><span class="s">&quot;8&quot;</span> <span class="na">native=</span><span class="s">&quot;true&quot;</span><span class="nt">/&gt;</span>
   <span class="nt">&lt;renderer-resolution&gt;</span>240<span class="nt">&lt;/renderer-resolution&gt;</span>
+  <span class="nt">&lt;line-width-correction&gt;</span>2.5<span class="nt">&lt;/line-width-correction&gt;</span>
 
   <span class="c">&lt;!-- a default external resource group file --&gt;</span>
   <span class="nt">&lt;resource-group-file&gt;</span>resources.afp<span class="nt">&lt;/resource-group-file&gt;</span>
@@ -640,6 +657,7 @@ $(document).ready(function () {
 
 <p>The default value for the images "mode" setting is "b+w" (black and white). When the images "mode" setting is "b+w" a "bits-per-pixel" setting can be provided to aid the grayscale conversion process. With this setting all images referenced in your source document are converted to an IOCA FS45 grayscale bitmap image form. When the setting is "color" all images are converted to an IOCA FS45 color bitmap image form. When "native" setting is "true", all images encountered (TIFF, GIF, JPEG and Encapsulated Postscript etc.) will be embedded directly in the datastream in their native form using a MO:DCA Object Container.</p>
 <p>The default value for the "renderer-resolution" is 240 dpi.</p>
+<p>The default line width is device dependent and may need to be fine tuned so that the output matches the expected result. The default correction value is 2.5.</p>
 <p>By default if there is no configuration definition for "resource-group-file", external resources will be placed in a file called resources.afp.</p>
 <h2 id="When-it-does-not-work">When it does not work</h2>
 <p>FOP searches the configuration file for the information it expects, at the position it expects. When that information is not present, FOP will not complain, it will just continue. When there is other information in the file, FOP will not complain, it will just ignore it. That means that when your configuration information is in the file but in a different XML element, or in a different XML path, than FOP expects, it will be silently ignored.</p>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/embedding.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/embedding.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/embedding.html Fri Dec 14 09:22:28 2012
@@ -635,7 +635,7 @@ $(document).ready(function () {
 </li>
 <li>
 <p>Set <strong>your own Document Handler</strong>. This feature can be used for several purposes, the most likey usage of which would probably be binding a MIME type when the output is Intermediate Format (see <a href="#documenthandlers">Document Handlers</a>). This also allows advanced users to create their own implementation of the document handler.</p>
-<div class="codehilite"><pre><span class="n">userAgent</span><span class="o">.</span><span class="na">setDocumentHandlerOverride</span><span class="o">(</span><span class="n">documentHandler</span><span class="o">)</span> <span class="c1">// documentHandler is an instance of org.apache.fop.render.intermediate.IFDocumentHandler</span>
+<div class="codehilite"><pre><span class="n">userAgent</span><span class="o">.</span><span class="na">setDocumentHandlerOverride</span><span class="o">(</span><span class="n">documentHandler</span><span class="o">);</span> <span class="c1">// documentHandler is an instance of org.apache.fop.render.intermediate.IFDocumentHandler</span>
 </pre></div>
 
 

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/fonts.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/fonts.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/fonts.html Fri Dec 14 09:22:28 2012
@@ -341,7 +341,7 @@ $(document).ready(function () {
         <div id="items">
         </div>
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
-      	<div class="section-content"><h1 id="apachewzxhzdk4-fop-fonts">Apache&trade; FOP: Fonts</h1>
+      	<div class="section-content"><h1 id="apachewzxhzdk9-fop-fonts">Apache&trade; FOP: Fonts</h1>
 <p><authors><person email="" name="Jeremias Märki"></person><person email="" name="Tore Engvig"></person><person email="" name="Adrian Cumiskey"></person><person email="" name="Max Berger"></person></authors></p>
 <h2 id="intro">Summary</h2>
 <p>The following table summarizes the font capabilities of the various Apache&trade; FOP renderers:</p>
@@ -564,9 +564,12 @@ $(document).ready(function () {
 <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). It will display all of the font names and exit with an Exception.</p>
 <p>Here is an example of generating a metrics file for a .ttc file:</p>
-<p>java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
-          org.apache.fop.fonts.apps.TTFReader -ttcname "MS Mincho"
-          msmincho.ttc msminch.xml</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="o">\</span><span class="n">fop</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">io</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">TTFReader</span> <span class="o">-</span><span class="n">ttcname</span> <span class="s">&quot;MS Mincho&quot;</span>
+      <span class="n">msmincho</span><span class="o">.</span><span class="n">ttc</span> <span class="n">msminch</span><span class="o">.</span><span class="n">xml</span>
+</pre></div>
+
+
 <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. Example:</p>
 <div class="codehilite"><pre><span class="nt">&lt;font</span> <span class="na">embed-url=</span><span class="s">&quot;gulim.ttc&quot;</span> <span class="na">sub-font=</span><span class="s">&quot;GulimChe&quot;</span><span class="nt">&gt;</span>
   <span class="nt">&lt;font-triplet</span> <span class="na">name=</span><span class="s">&quot;GulimChe&quot;</span> <span class="na">style=</span><span class="s">&quot;normal&quot;</span> <span class="na">weight=</span><span class="s">&quot;normal&quot;</span><span class="nt">/&gt;</span>
@@ -576,10 +579,11 @@ $(document).ready(function () {
 
 <h3 id="autodetect">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:
-Manifest-Version: 1.0</p>
-<div class="codehilite"><pre><span class="err">Name:</span> <span class="err">font/myfont.ttf</span>
-<span class="err">Content-Type:</span> <span class="err">application/x-font</span>
+<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>
+<div class="codehilite"><pre><span class="n">Manifest</span><span class="o">-</span><span class="n">Version:</span> <span class="mf">1.0</span>
+
+    <span class="n">Name:</span> <span class="n">font</span><span class="o">/</span><span class="n">myfont</span><span class="o">.</span><span class="n">ttf</span>
+    <span class="n">Content</span><span class="o">-</span><span class="n">Type:</span> <span class="n">application</span><span class="o">/</span><span class="n">x</span><span class="o">-</span><span class="n">font</span>
 </pre></div>
 
 
@@ -590,24 +594,33 @@ Manifest-Version: 1.0</p>
 <h3 id="type1-metrics">Type 1 Font Metrics</h3>
 <p>Note that metrics files are optional and no longer required</p>
 <p>FOP includes PFMReader, which reads the PFM file that normally comes with a Type 1 font, and generates an appropriate font metrics file for it. To use it, run the class org.apache.fop.fonts.apps.PFMReader:</p>
-<p>Windows:
-java -cp build\fop.jar;lib\avalon-framework.jar;lib\commons-logging.jar;lib\commons-io.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file
-Unix:
-java -cp build/fop.jar:lib/avalon-framework.jar:lib/commons-logging.jar:lib/commons-io.jar
-          org.apache.fop.fonts.apps.PFMReader [options] pfm-file xml-file
-PFMReader [options]:</p>
+<p>Windows:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="o">\</span><span class="n">fop</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">io</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">PFMReader</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="n">pfm</span><span class="o">-</span><span class="n">file</span> <span class="n">xml</span><span class="o">-</span><span class="n">file</span>
+</pre></div>
+
+
+<p>Unix:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="sr">/fop.jar:lib/</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">.</span><span class="n">jar:lib</span><span class="sr">/commons-logging.jar:lib/commo</span><span class="n">ns</span><span class="o">-</span><span class="n">io</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">PFMReader</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span> <span class="n">pfm</span><span class="o">-</span><span class="n">file</span> <span class="n">xml</span><span class="o">-</span><span class="n">file</span>
+</pre></div>
+
+
+<p>PFMReader [options]:</p>
 <ul>
-<li><strong>-fn <fontname></strong> By default, FOP uses the fontname from the .pfm file when embedding the font. Use the "-fn" option to override this name with one you have chosen. This may be useful in some cases to ensure that applications using the output document (Acrobat Reader for example) use the embedded font instead of a local font with the same name.
-The classpath in the above example has been simplified for readability. You will have to adjust the classpath to the names of the actual JAR files in the lib directory. xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.The tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values. FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file. The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually. The constructed values however appear to have no visible influence.</li>
+<li><strong>-fn <fontname></strong> By default, FOP uses the fontname from the .pfm file when embedding the font. Use the "-fn" option to override this name with one you have chosen. This may be useful in some cases to ensure that applications using the output document (Acrobat Reader for example) use the embedded font instead of a local font with the same name.</li>
 </ul>
+<p>The classpath in the above example has been simplified for readability. You will have to adjust the classpath to the names of the actual JAR files in the lib directory. xml-apis.jar, xercesImpl.jar, xalan.jar and serializer.jar are not necessary for JDK version 1.4 or later.The tool will construct some values (FontBBox, StemV and ItalicAngle) based on assumptions and calculations which are only an approximation to the real values. FontBBox and Italic Angle can be found in the human-readable part of the PFB file or in the AFM file. The PFMReader tool does not yet interpret PFB or AFM files, so if you want to be correct, you may have to adjust the values in the XML file manually. The constructed values however appear to have no visible influence.</p>
 <h3 id="truetype-metrics">TrueType Font Metrics</h3>
 <p>Note that metrics files are optional and no longer required</p>
-<p>FOP includes TTFReader, which reads the TTF file and generates an appropriate font metrics file for it. Use it in a similar manner to PFMReader. For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:
-java -cp build\fop.jar;lib\avalon-framework-4.2.0.jar;lib\commons-logging-1.0.4.jar;lib\commons-io-1.3.1.jar;lib\commons-logging-1.0.4.jar;lib\xmlgraphics-commons-1.5.jar
-          org.apache.fop.fonts.apps.TTFReader [options]
-          C:\myfonts\cmr10.ttf ttfcm.xml
-TTFReader [options]:</p>
+<p>FOP includes TTFReader, which reads the TTF file and generates an appropriate font metrics file for it. Use it in a similar manner to PFMReader. For example, to create such a metrics file in Windows from the TrueType font at c:\myfonts\cmr10.ttf:</p>
+<div class="codehilite"><pre><span class="n">java</span> <span class="o">-</span><span class="n">cp</span> <span class="n">build</span><span class="o">\</span><span class="n">fop</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">avalon</span><span class="o">-</span><span class="n">framework</span><span class="o">-</span><span class="mf">4.2.0</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">-</span><span class="mf">1.0.4</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">io</span><span class="o">-</span><span class="mf">1.3.1</span><span class="o">.</span><
 span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">commons</span><span class="o">-</span><span class="n">logging</span><span class="o">-</span><span class="mf">1.0.4</span><span class="o">.</span><span class="n">jar</span><span class="p">;</span><span class="n">lib</span><span class="o">\</span><span class="n">xmlgraphics</span><span class="o">-</span><span class="n">commons</span><span class="o">-</span><span class="mf">1.5</span><span class="o">.</span><span class="n">jar</span>
+      <span class="n">org</span><span class="o">.</span><span class="n">apache</span><span class="o">.</span><span class="n">fop</span><span class="o">.</span><span class="n">fonts</span><span class="o">.</span><span class="n">apps</span><span class="o">.</span><span class="n">TTFReader</span> <span class="p">[</span><span class="n">options</span><span class="p">]</span>
+      <span class="n">C:</span><span class="o">\</span><span class="n">myfonts</span><span class="o">\</span><span class="n">cmr10</span><span class="o">.</span><span class="n">ttf</span> <span class="n">ttfcm</span><span class="o">.</span><span class="n">xml</span>
+</pre></div>
+
+
+<p>TTFReader [options]:</p>
 <ul>
 <li>
 <p><strong>-d <DEBUG | INFO ></strong> Sets the debug level (default is INFO).</p>
@@ -653,16 +666,17 @@ TTFReader [options]:</p>
 </li>
 <li>
 <p>For automatically configured fonts there's a different mechanism to specify which fonts should be referenced rather than embedded. This is done in the "referenced-fonts" element in the configuration. Here's an example:</p>
-</li>
-</ol>
-<p><fop version="1.0">
-     <fonts>
-      <referenced-fonts>
+<p>:::xml
+<fop version="1.0">
+  <fonts>
+    <referenced-fonts>
       <match font-family="Helvetica"/>
       <match font-family="DejaVu.*"/>
-      </referenced-fonts>
-     </fonts>
-  </fop></p>
+    </referenced-fonts>
+  </fonts>
+</fop></p>
+</li>
+</ol>
 <p>At the moment, you can only match fonts against their font-family. It is possible to use regular expressions as is shown in the second example above ("DejaVu.*"). The syntax for the regular expressions used here are the one used by the <a href="http://java.sun.com/j2se/1.4/docs/api/java/util/regex/package-summary.html">package</a>. So, in the above snippet "Helvetica" and all variants of the "DejaVu" font family are referenced. If you want to reference all fonts, just specify <code>font-family=".*"</code>.</p>
 <p>The <code>referenced-fonts</code> element can be placed either inside the general <code>fonts</code> element (right under the root) or in the <code>fonts</code> element under the renderer configuration. In the first case, matches apply to all renderers. In the second case, matches only apply to the renderer where the element was specified. Both cases can be used at the same time.</p>
 <p>Various notes related to embedded fonts:</p>
@@ -694,20 +708,23 @@ TTFReader [options]:</p>
 </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>
-<p><fop version="1.0">
-     <fonts>
-      <substitutions>
-       <substitution>
-        <from font-family="Arial" font-weight="700..900"/>
-        <to font-family="Arial Black"/>
-       </substitution>
-       <substitution>
-        <from font-family="FrutigerLight"/>
-        <to font-family="Times" font-weight="bold" font-style="italic"/>
-       </substitution>
-      </substitutions>
-     </fonts>
-  </fop></p>
+<div class="codehilite"><pre><span class="nt">&lt;fop</span> <span class="na">version=</span><span class="s">&quot;1.0&quot;</span><span class="nt">&gt;</span>
+  <span class="nt">&lt;fonts&gt;</span>
+    <span class="nt">&lt;substitutions&gt;</span>
+      <span class="nt">&lt;substitution&gt;</span>
+        <span class="nt">&lt;from</span> <span class="na">font-family=</span><span class="s">&quot;Arial&quot;</span> <span class="na">font-weight=</span><span class="s">&quot;700..900&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;to</span> <span class="na">font-family=</span><span class="s">&quot;Arial Black&quot;</span><span class="nt">/&gt;</span>
+      <span class="nt">&lt;/substitution&gt;</span>
+      <span class="nt">&lt;substitution&gt;</span>
+        <span class="nt">&lt;from</span> <span class="na">font-family=</span><span class="s">&quot;FrutigerLight&quot;</span><span class="nt">/&gt;</span>
+        <span class="nt">&lt;to</span> <span class="na">font-family=</span><span class="s">&quot;Times&quot;</span> <span class="na">font-weight=</span><span class="s">&quot;bold&quot;</span> <span class="na">font-style=</span><span class="s">&quot;italic&quot;</span><span class="nt">/&gt;</span>
+      <span class="nt">&lt;/substitution&gt;</span>
+    <span class="nt">&lt;/substitutions&gt;</span>
+  <span class="nt">&lt;/fonts&gt;</span>
+<span class="nt">&lt;/fop&gt;</span>
+</pre></div>
+
+
 <h2 id="selection">Font Selection Strategies</h2>
 <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>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/hyphenation.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/hyphenation.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/hyphenation.html Fri Dec 14 09:22:28 2012
@@ -349,8 +349,8 @@ $(document).ready(function () {
 If you have made improvements to an existing Apache&trade; FOP hyphenation pattern, or if you have created one from scratch, please consider contributing these to OFFO so that they can benefit other FOP users as well. Please inquire on the <a href="../maillist.html#fop-user">FOP User mailing list</a>.</p>
 <h3 id="license-issues">License Issues</h3>
 <p>Many of the hyphenation files distributed with TeX and its offspring are licenced under the <a href="http://www.latex-project.org/lppl.html">LaTeX Project Public License (LPPL)</a>, which prevents them from being distributed with Apache software. The LPPL puts restrictions on file names in redistributed derived works which we feel can't guarantee. Some hyphenation pattern files have other or additional restrictions, for example against use for commercial purposes.</p>
-<p>Although Apache FOP cannot redistribute hyphenation pattern files that do not conform with its license scheme, that does not necessarily prevent users from using such hyphenation patterns with FOP. However, it does place on the user the responsibility for determining whether the user can rightly use such hyphenation patterns under the hyphenation pattern license.
-<warning>The user is responsible to settle license issues for hyphenation pattern files that are obtained from non-Apache sources.</warning></p>
+<p>Although Apache FOP cannot redistribute hyphenation pattern files that do not conform with its license scheme, that does not necessarily prevent users from using such hyphenation patterns with FOP. However, it does place on the user the responsibility for determining whether the user can rightly use such hyphenation patterns under the hyphenation pattern license.</p>
+<p><warning>The user is responsible to settle license issues for hyphenation pattern files that are obtained from non-Apache sources.</warning></p>
 <h3 id="sources">Sources of Custom Hyphenation Pattern Files</h3>
 <p>The most important source of hyphenation pattern files is the <a href="http://www.ctan.org/tex-archive/language/hyphenation/">CTAN TeX Archive</a>.</p>
 <h3 id="install">Installing Custom Hyphenation Patterns</h3>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/index.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/index.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/index.html Fri Dec 14 09:22:28 2012
@@ -346,7 +346,9 @@ $(document).ready(function () {
 <p>Apache&trade; <strong>FOP Trunk</strong> is the name for the current development code as found in the <a href="http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/">Subversion repository</a>. This section of the FOP web site provides the documentation for this version.</p>
 <p>The Apache FOP team is proud to present to you this production quality codebase. It has taken over three years to get this far and over two years without a new release from the FOP project. We're still in the process of adding new features. We welcome any feedback you might have and even more, any other form of help to get the project forward.</p>
 <h2 id="upgrading">Upgrading from an earlier version</h2>
-<p>If you're upgrading to this version from an earlier version of FOP, please read the information contained on the <a href="upgrading.html">Upgrading page</a> !</p></div>
+<p>If you're upgrading to this version from an earlier version of FOP, please read the information contained on the <a href="upgrading.html">Upgrading page</a> !</p>
+<h2 id="download">Download</h2>
+<p>To download this version, please visit the <a href="../download.html">download page</a>.</p></div>
       </div>
       
       <div class="clear"></div>

Modified: websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html
==============================================================================
--- websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html (original)
+++ websites/staging/xmlgraphics/trunk/content/fop/trunk/intermediate.html Fri Dec 14 09:22:28 2012
@@ -342,7 +342,7 @@ $(document).ready(function () {
         </div>
       	<!-- <div id="breadcrumb"><a href="/">Home</a>&nbsp;&raquo&nbsp;<a href="/fop/">Fop</a>&nbsp;&raquo&nbsp;<a href="/fop/trunk/">Trunk</a></div> -->
       	<div class="section-content"><h1 id="apachewzxhzdk2-fop-intermediate-format">Apache&trade; FOP: Intermediate Format</h1>
-<p>Please note that the intermediate formats described here are <strong>advanced features</strong> and can be ignored by most users of Apache FOP.</p>
+<p>Please note that the intermediate formats described here are <strong>advanced features</strong> and can be ignored by most users of Apache&trade; FOP.</p>
 <h2 id="introduction">Introduction</h2>
 <p>Apache&trade; 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 href="http://www.w3.org/TR/2001/REC-xsl-20011015/slice1.html#section-N742-Formatting">XSL-FO specification in chapter 1.1.2</a>. 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>



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


Mime
View raw message