You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xmlgraphics.apache.org by je...@apache.org on 2008/01/22 11:24:15 UTC

svn commit: r614164 [3/4] - in /xmlgraphics/site/deploy/fop: ./ trunk/

Modified: xmlgraphics/site/deploy/fop/trunk/graphics.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/graphics.xml?rev=614164&r1=614163&r2=614164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/graphics.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/graphics.xml Tue Jan 22 02:24:13 2008
@@ -17,64 +17,94 @@
 <document>
   <header>
     <title>Apache FOP: Graphics Formats</title>
-    <version>$Revision: 569104 $</version>
+    <version>$Revision: 614156 $</version>
   </header>
   <body>
+    <section id="introduction">
+      <title>Introduction</title>
+      <p>
+        After the Apache FOP 0.94 release, the image handling subsystem has been rewritten in
+        order to improve the range of supported images and image subtypes, to lower the
+        overall memory consumption when handling images, to produce smaller output files and to
+        increase the performance in certain areas. Of course, this causes a few changes most of
+        which the user will probably not notice. The most important changes are:
+      </p>
+      <ul>
+        <li>
+          The image libraries Jimi and JAI are no longer supported. Instead, Apache FOP uses the
+          Image I/O API that was introduced with Java 1.4 for all bitmap codecs.
+        </li>
+        <li>
+          Some bitmap images are no longer converted to a standardized 24 bit RGB image but are
+          instead handled in their native format.
+        </li>
+        <li>
+          A plug-in mechanism offers a possibility to add support for new formats without changing
+          the FOP's source code.
+        </li>
+      </ul>
+      <p>
+        The actual <link href="http://xmlgraphics.apache.org/commons/image-loader.html">image loading framework</link>
+        no longer resides in Apache FOP, but was instead placed in
+        <link href="ext:xmlgraphics.apache.org/commons/">XML Graphics Commons</link>.
+      </p>
+    </section>
     <section id="support-overview">
       <title>Overview of Graphics Support</title>
       <p>
-        The table below summarizes the <em>theoretical</em> support for graphical formats within FOP. In other words, within the constraints of the limitations listed here, these formats <em>should</em> work. However, many of them have not been tested, and there may be limitations that have not yet been discovered or documented. The packages needed to support some formats are not included in the FOP distribution and must be installed separately. Follow the links in the "Support Thru" column for more details.
+        The table below summarizes the <em>theoretical</em> support for graphical formats
+        within FOP. In other words, within the constraints of the limitations listed here,
+        these formats <em>should</em> work. However, many of them have not been tested,
+        and there may be limitations that have not yet been discovered or documented.
+        The packages needed to support some formats are not included in the FOP distribution
+        and must be installed separately. Follow the links in the "Support Through" columns
+        for more details.
       </p>
       <table>
         <tr>
-          <th colspan="1" rowspan="1">Format</th>
-          <th colspan="1" rowspan="1">Type</th>
-          <th colspan="1" rowspan="1"><link href="#native">FOP native support</link></th>
-          <th colspan="1" rowspan="1"><link href="#batik">Batik SVG</link></th>
-          <th colspan="1" rowspan="1"><link href="#batik-codecs">Batik codecs</link></th>
+          <th rowspan="2" colspan="1">Format</th>
+          <th rowspan="2" colspan="1">Type</th>
+          <th colspan="3" rowspan="1">Support Through</th>
+        </tr>
+        <tr>
+          <th colspan="1" rowspan="1"><link href="#native">Apache FOP (native)</link></th>
+          <th colspan="1" rowspan="1"><link href="#batik">Apache Batik</link></th>
           <th colspan="1" rowspan="1"><link href="#imageio">Image I/O</link></th>
-          <th colspan="1" rowspan="1"><link href="#jai">JAI</link></th>
-          <th colspan="1" rowspan="1"><link href="#jimi">JIMI</link></th>
         </tr>
         <tr>
           <td colspan="1" rowspan="1"><link href="#bmp">BMP</link> (Microsoft Windows Bitmap)</td>
           <td colspan="1" rowspan="1">bitmap</td>
-          <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
+          <td colspan="1" rowspan="1">X [1]</td>
+        </tr>
+        <tr>
+          <td colspan="1" rowspan="1"><link href="#emf">EMF</link> (Windows Enhanced Metafile)</td>
+          <td colspan="1" rowspan="1">vector (with embedded bitmaps)</td>
+          <td colspan="1" rowspan="1">(X)</td>
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
         </tr>
         <tr>
           <td colspan="1" rowspan="1"><link href="#eps">EPS</link> (Encapsulated PostScript)</td>
-          <td colspan="1" rowspan="1">metafile (both bitmap and vector), probably most frequently used for vector drawings</td>
+          <td colspan="1" rowspan="1">metafile (both bitmap and vector), most frequently used for vector drawings</td>
           <td colspan="1" rowspan="1">(X)</td>
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
         </tr>
         <tr>
           <td colspan="1" rowspan="1">GIF (Graphics Interchange Format)</td>
           <td colspan="1" rowspan="1">bitmap</td>
-          <td colspan="1" rowspan="1">X</td>
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1">X</td>
         </tr>
         <tr>
           <td colspan="1" rowspan="1"><link href="#jpeg">JPEG</link> (Joint Photographic Experts Group)</td>
           <td colspan="1" rowspan="1">bitmap</td>
           <td colspan="1" rowspan="1">(X)</td>
           <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
         </tr>
         <tr>
           <td colspan="1" rowspan="1"><link href="#png">PNG</link> (Portable Network Graphic)</td>
@@ -82,9 +112,6 @@
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
         </tr>
         <tr>
           <td colspan="1" rowspan="1"><link href="#svg">SVG</link> (Scalable Vector Graphics)</td>
@@ -92,270 +119,378 @@
           <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1">X</td>
           <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
         </tr>
         <tr>
           <td colspan="1" rowspan="1"><link href="#tiff">TIFF</link> (Tag Image Format File)</td>
           <td colspan="1" rowspan="1">bitmap</td>
           <td colspan="1" rowspan="1">(X)</td>
           <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1">X</td>
-          <td colspan="1" rowspan="1"/>
-          <!--td><a href="#native">FOP native</a> or <a href="#jai">JAI</a>, depending on the subformat. See <a href="#tiff">TIFF</a> for more details.(JIMI also supports TIFF, but this has not been implemented within FOP).</td-->
+          <td colspan="1" rowspan="1">X [1]</td>
         </tr>
         <tr>
-          <td colspan="1" rowspan="1"><link href="#emf">EMF</link> (Windows Enhanced Metafile)</td>
+          <td colspan="1" rowspan="1"><link href="#wmf">WMF</link> (Windows Metafile)</td>
           <td colspan="1" rowspan="1">vector (with embedded bitmaps)</td>
-          <td colspan="1" rowspan="1">(X)</td>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
-          <td colspan="1" rowspan="1"/>
           <td colspan="1" rowspan="1"/>
+          <td colspan="1" rowspan="1">(X)</td>
           <td colspan="1" rowspan="1"/>
         </tr>
       </table>
-      <note>"(X)" means restricted support. Please see the details below.</note>
+      <p>
+        Legend:
+      </p>
+      <ul>
+        <li>"(X)" means restricted support. Please see the details below.</li>
+        <li>
+          [1]: Requires the presence of <link href="http://jai-imageio.dev.java.net/">JAI Image I/O Tools</link>
+          (or an equivalent Image I/O compatible codec) in the classpath. JAI Image I/O Tools also
+          adds support for JPEG 2000, WBMP, RAW and PNM. Other Image I/O codecs may provide
+          support for additional formats.
+        </li>
+      </ul>
+      <section id="format-map">
+        <title>Map of supported image formats by output format</title>
+        <p>
+          Not all image formats are supported for all output formats! For example, while you can
+          use EPS (Encapsulated PostScript) files when you generate PostScript output, this format
+          will not be supported by any other output format. Here's an overview which image formats
+          are supported by which output format:
+        </p>
+        <table>
+          <tr>
+            <th colspan="1" rowspan="1">Image Format</th>
+            <th colspan="1" rowspan="1">PDF</th>
+            <th colspan="1" rowspan="1">PostScript</th>
+            <th colspan="1" rowspan="1">Java2D, PNG, TIFF, AWT</th>
+            <th colspan="1" rowspan="1">PCL</th>
+            <th colspan="1" rowspan="1">AFP</th>
+            <th colspan="1" rowspan="1">RTF</th>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#bmp">BMP</link> (Microsoft Windows Bitmap)</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#emf">EMF</link> (Windows Enhanced Metafile)</td>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1">X [1]</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#eps">EPS</link> (Encapsulated PostScript)</td>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1">X [1]</td>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+            <td colspan="1" rowspan="1"/>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1">GIF (Graphics Interchange Format)</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#jpeg">JPEG</link> (Joint Photographic Experts Group)</td>
+            <td colspan="1" rowspan="1">X [1]</td>
+            <td colspan="1" rowspan="1">X [1]</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X [1]</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#png">PNG</link> (Portable Network Graphic)</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#svg">SVG</link> (Scalable Vector Graphics)</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#tiff">TIFF</link> (Tag Image Format File)</td>
+            <td colspan="1" rowspan="1">X [2]</td>
+            <td colspan="1" rowspan="1">X [2]</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X [2]</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+          <tr>
+            <td colspan="1" rowspan="1"><link href="#wmf">WMF</link> (Windows Metafile)</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+            <td colspan="1" rowspan="1">X</td>
+          </tr>
+        </table>
+        <p>
+          Legend:
+        </p>
+        <ul>
+          <li>
+            [1]: Supported without the need to decode the image.
+          </li>
+          <li>
+            [2]: Supported without the need to decode the image, but only for certain subtypes.
+          </li>
+        </ul>
+      </section>
     </section>
     <section id="packages">
       <title>Graphics Packages</title>
       <section id="native">
-        <title>FOP Native</title>
+        <title>XML Graphics Commons Native</title>
         <p>
-          FOP has native ability to handle some graphic file formats.
+          <link href="ext:xmlgraphics.apache.org/commons">XML Graphics Commons</link> supports a number
+          graphic file formats natively as basic functionality: all bitmap formats for which there
+          are Image I/O codecs available (JPEG, PNG, GIF, TIFF, etc.), EPS and EMF.
         </p>
       </section>
-      <section id="batik-codecs">
-        <title>"Internal" codecs</title>
+      <section id="fop-native">
+        <title>FOP Native</title>
         <p>
-          Apache XML Graphics Commons contains codecs for PNG and TIFF access. FOP can use these.
+          FOP has no native image plug-ins for the image loading framework of its own but currently
+          hosts the Batik-dependent SVG and WMF plug-ins until they can be moved to
+          <link href="ext:xmlgraphics.apache.org/batik">Apache Batik</link>.
         </p>
       </section>
-      <section id="imageio">
-        <title>Image I/O (JDK 1.4 or higher)</title>
+      <section id="batik">
+        <title>Apache Batik</title>
         <p>
-          For JDKs 1.4 or higher, FOP provides a wrapper to load images through the 
-          <link class="fork" href="http://java.sun.com/j2se/1.4.2/docs/guide/imageio/index.html">JDK's Image I/O API</link> (JSR 015).
-          Image I/O allows to dynamically add additional image codecs. An example of such an add-on library are the
-          <link class="fork" href="http://java.sun.com/products/java-media/jai/">JAI Image I/O Tools</link> available from Sun.
+          <link href="ext:xmlgraphics.apache.org/batik">Apache Batik</link> will later receive the
+          SVG and WMF plug-ins for the image loading framework that are currently hosted inside
+          FOP.
         </p>
-      </section>
-      <section id="jimi">
-        <title>JIMI</title>
         <p>
-          Because of licensing issues, the JIMI image library is not included in the FOP distribution. First, <link class="fork" href="http://java.sun.com/products/jimi">download</link> and install it.
-Then, copy the file "JimiProClasses.zip" from the archive to {fop-install-dir}/lib/jimi-1.0.jar. Please note that FOP binary distributions are compiled with JIMI support, so there is no need for you to build FOP to add the support. If jimi-1.0.jar is installed in the right place, it will automatically be used by FOP, otherwise it will not.
+          Current FOP distributions include a distribution of the
+          <link class="fork" href="ext:xmlgraphics.apache.org/batik">Apache Batik</link>.
+          Because Batik's API changes frequently, it is highly recommended that you use the
+          version that ships with FOP, at least when running FOP.
         </p>
-      </section>
-      <section id="jai">
-        <title>JAI (Java Advanced Imaging API)</title>
+        <warning>Batik must be run in a graphical environment.</warning>
         <p>
-          FOP has been compiled with JAI support, but JAI is not included in the FOP distribution.
-To use it, install <link href="http://java.sun.com/products/java-media/jai">JAI</link>, then copy the jai_core.jar and the jai_codec.jar files to {fop-install-dir}/lib.
-JAI is much faster than JIMI, but is not available for all platforms. See <link href="http://java.sun.com/products/java-media/jai/forDevelopers/jaifaq.html#platforms">What platforms are supported?</link> on the JAI FAQ page for more details.
+          Batik must be run in a graphical environment.
+          It uses AWT classes for rendering SVG, which in turn require an X server on Unixish
+          systems. If you run a server without X, or if you can't connect to the X server due to
+          security restrictions or policies (a so-called "headless" environment), SVG rendering
+          will fail.
         </p>
-      </section>
-      <section id="batik">
-        <title>Apache Batik</title>
-        <p>Current FOP distributions include a distribution of the Apache <link class="fork" href="ext:batik">Batik</link> version 1.6.
-It is automatically installed with FOP.
-Because Batik's API changes frequently, it is highly recommended that you use the version that ships with FOP, at least when running FOP.</p>
-        <warning>Batik must be run in a graphical environment.</warning>
-        <p>Batik must be run in a graphical environment.
-It uses AWT classes for rendering SVG, which in turn require an X server on Unixish systems.
-If you run a server without X, or if you can't connect to the X server due to security restrictions or policies (a so-called "headless" environment), SVG rendering will fail.</p>
         <p>Here are some workarounds:</p>
         <ul>
-          <li>If you are using JDK 1.4, start it with the <code>-Djava.awt.headless=true</code> command line option.</li>
-          <li>Install an X server which provides an in-memory framebuffer without actually using a screen device or any display hardware. One example is Xvfb.</li>
-          <li>Install a toolkit which emulates AWT without the need for an underlying X server. One example is the <link href="http://www.eteks.com/pja/en">PJA toolkit</link>, which is free and comes with detailed installation instructions.</li>
-        </ul>
-      </section>
-    </section>
-    <section id="bmp">
-      <title>BMP</title>
-      <p>FOP native support for BMP images is limited to the RGB color-space.</p>
-    </section>
-    <section id="eps">
-      <title>EPS</title>
-      <p>FOP provides support for two output targets:</p>
-      <ul>
-        <li>PostScript (full support).</li>
-        <li>
-          PDF (partial support). Due to the lack of a built-in PostScript interpreter, FOP 
-          can only embed the EPS file into the PDF. Acrobat Reader will not currently display 
-          the EPS (it doesn't have a PostScript interpreter, either) but it will be shown 
-          correctly when you print the PDF on a PostScript-capable printer. PostScript devices 
-          (including GhostScript) will render the EPS correctly.
-        </li>
-      </ul>
-      <warning>
-        Please note that the EPS embedding feature has been <strong>deprecated</strong> in the
-        PDF specification version 1.4. You should not use this feature anymore, especially 
-        since newer PDF tools don't support embedded EPS files anymore.
-      </warning>
-      <p>
-        Other output targets can't be supported at the moment because
-        FOP lacks a PostScript interpreter. Furthermore, FOP is not able
-        to parse the preview bitmaps sometimes contained in EPS files.
-      </p>
-    </section>
-    <section id="jpeg">
-      <title>JPEG</title>
-      <p>
-        FOP native support of JPEG does not include all variants, especially those containing 
-        unusual color lookup tables and color profiles.
-        If you have trouble with a JPEG image in FOP, try opening it with an image processing 
-        program (such as Photoshop or Gimp) and then saving it. Specifying 24-bit color output 
-        may also help. For the PDF and PostScript renderers most JPEG images can be passed 
-        through without decompression. User reports indicate that grayscale, RGB, and 
-        CMYK color-spaces are all rendered properly.
-      </p>
-    </section>
-    <section id="png">
-      <title>PNG</title>
-      <p>
-        If using JAI for PNG support, only RGB and RGBA color-spaces are supported for 
-        FOP rendering.
-      </p>
-      <p>
-        Transparency is supported but not guaranteed to work with every output format.
-      </p>
-    </section>
-    <section id="svg">
-      <title>SVG</title>
-      <section id="svg-intro">
-        <title>Introduction</title>
-        <p>FOP uses <link href="#batik"> Apache Batik</link> for SVG support.
-This format can be handled as an <code>fo:instream-foreign-object</code> or in a separate
-file referenced with <code>fo:external-graphic</code>.</p>
-      <note>   
-Batik's SVG Rasterizer utility may also be used to convert standalone SVG
-documents into PDF.  For more information please see the
-<link href="http://xmlgraphics.apache.org/batik/svgrasterizer.html">SVG Rasterizer documentation</link>
-on the Batik site.
-      </note>
-      </section>
-      <section id="svg-pdf-graphics">
-        <title>Placing SVG Graphics into PDF</title>
-        <p>
-The SVG is rendered into PDF by using PDF commands to draw and fill
-lines and curves. This means that the graphical objects created with
-this remain as vector graphics. The same applies to PostScript output.
-For other output formats the SVG graphic will be converted to a bitmap
-image.
-        </p>
-        <p>
-There are a number of SVG things that cannot be converted directly into
-PDF. Parts of the graphic such as effects, patterns and images are inserted
-into the PDF as a raster graphic. The resolution of these raster images can
-          be controlled through the "target resolution" setting in the 
-          <link href="configuration.html">configuration</link>.</p>
-        <p>
-Currently transparency is limited in PDF so many svg images that
-contain effects or graphics with transparent areas may not be displayed
-correctly.
-        </p>
-      </section>
-      <section id="svg-pdf-text">
-        <title>Placing SVG Text into PDF and PostScript</title>
-        <p>If possible, Batik will use normal PDF or PostScript text when inserting text. It does
-this by checking if the text can be drawn normally and the font is
-supported. This example svg <link href="../dev/svg/text.svg">text.svg</link> /
-<!--link href="../dev/svg/text.pdf"-->text.pdf<!--/link-->
-shows how various types and effects with text are handled.
-Note that tspan and outlined text are not yet implemented.</p>
-        <p>
-Otherwise, text is converted and drawn as a set of shapes by Batik, using the stroking text painter.
-This means that a typical character will
-have about 10 curves (each curve consists of at least 20 characters).
-This can make the output files large and when it is viewed the
-viewer may not normally draw those fine curves very well (In Adobe Acrobat, turning on
-"Smooth Line Art" in the preferences will fix this).
-If the text is inserted into the output file using the inbuilt text commands
-it will use a single character.
-        </p>
-        <p>
-          Note that because SVG text can be rendered as either text or a vector graphic, you 
-          may need to consider settings in your viewer for both. The Acrobat viewer has both 
-          "smooth line art" and "smooth text" settings that may need to be set for SVG images 
-          to be displayed nicely on your screen (see Edit / Preferences / Display).
-          This setting will not affect the printing of your document, which should be OK in 
-          any case, but will only affect the quality of the screen display.</p>
-      </section>
-      <section id="svg-scaling">
-        <title>Scaling</title>
-        <p>
-          Currently, SVG images are rendered with the dimensions specified <em>in the SVG 
-          file</em>, within the viewport specified in the fo:external-graphic element.
-          For everything to work properly, the two should be equal. The SVG standard leaves 
-          this issue as an implementation detail. FOP will probably implement a scaling 
-          mechanism in the future. 
-        </p>
-        <p>
-          If you use pixels to specify the size of an SVG graphic the "source resolution" setting
-          in the <link href="configuration.html">configuration</link> will be used to determine the
-          size of a pixel. The use of pixels to specify sizes is discouraged as they may
-          be interpreted differently in different environments.
-        </p>
-      </section>
-      <section id="svg-problems">
-        <title>Known Problems</title>
-        <ul>
-          <li>
-Soft mask transparency is combined with white so that it looks better
-on pdf 1.3 viewers but this causes the soft mask to be slightly lighter
-or darker on pdf 1.4 viewers.
-          </li>
-          <li>
-There is some problem with a gradient inside a pattern causing a PDF
-error when viewed in acrobat 5.
-          </li>
           <li>
-Text is not always handled correctly, it may select the wrong font
-especially if characters have multiple fonts in the font list.
+            If you are using JDK 1.4, start it with the <code>-Djava.awt.headless=true</code>
+            command line option.
           </li>
           <li>
-More PDF text handling could be implemented.
-It could draw the string using the attributed character iterator
-to handle tspans and other simple changes of text.
+            Install an X server which provides an in-memory framebuffer without actually using a
+            screen device or any display hardware. One example is Xvfb.
           </li>
           <li>
-JPEG images are not inserted directly into the pdf document.
-This area has not been implemented yet since the appropriate
-method in batik is static.
-          </li>
-          <li>
-Uniform transparency for images and other svg elements that are converted
-into a raster graphic are not drawn properly in PDF. The image is opaque.
+            Install a toolkit which emulates AWT without the need for an underlying X server. One
+            example is the <link href="http://www.eteks.com/pja/en">PJA toolkit</link>, which is free
+            and comes with detailed installation instructions.
           </li>
         </ul>
       </section>
     </section>
-    <section id="tiff">
-      <title>TIFF</title>
-      <p>
-        FOP-native TIFF support is limited to PDF and PostScript output only. Also, 
-        according to user reports, FOP's native support for TIFF is limited to images with the 
-        following characteristics (all must be true for successful rendering):
-      </p>
-      <ul>
-        <li>single channel images (i.e., bi-level and grayscale only)</li>
-        <li>uncompressed images, or images using CCITT T.4, CCITT T.6, or JPEG compression</li>
-        <li>images using white-is-zero encoding in the TIFF PhotometricInterpretation tag</li>
-      </ul>
-      <note>
-        Native support in this case means that the images can be embedded into the output format
-        without decoding it.
-      </note>
-      <p><em>JAI:</em> Supports RGB and RGBA only for FOP rendering.</p>
-    </section>
-    <section id="emf">
-      <title>EMF</title>
-      <p>Windows Enhanced Metafiles (EMF) are only supported in RTF output.</p>
+    <section id="image-formats">
+      <title>Details on image formats</title>
+      <section id="bmp">
+        <title>BMP</title>
+        <p>
+          BMP images are supported through an Image I/O codec. There may be limitations of the
+          codec which are outside the control of Apache FOP.
+        </p>
+      </section>
+      <section id="emf">
+        <title>EMF</title>
+        <p>
+          Windows Enhanced Metafiles (EMF) are only supported in RTF output where they are
+          embedded without decoding.
+        </p>
+      </section>
+      <section id="eps">
+        <title>EPS</title>
+        <p>Apache FOP allows to use EPS files when generating PostScript output only.</p>
+        <p>
+          Other output targets can't be supported at the moment because
+          FOP lacks a PostScript interpreter. Furthermore, FOP is currently not able
+          to parse the preview bitmaps sometimes contained in EPS files.
+        </p>
+      </section>
+      <section id="gif">
+        <title>GIF</title>
+        <p>
+          GIF images are supported through an Image I/O codec. Transparency is supported but
+          not guaranteed to work with every output format.
+        </p>
+      </section>
+      <section id="jpeg">
+        <title>JPEG</title>
+        <p>
+          FOP native support (i.e. the handling of undecoded images) of JPEG does not include all
+          variants, especially those containing unusual color lookup tables and color profiles.
+          If you have trouble with a JPEG image in FOP, try opening it with an image processing 
+          program (such as Photoshop or Gimp) and then saving it. Specifying 24-bit color output 
+          may also help. For the PDF and PostScript renderers most JPEG images can be passed 
+          through without decompression. User reports indicate that grayscale, RGB, and 
+          CMYK color spaces are all rendered properly. However, for other output formats, the
+          JPEG images have to be decompressed. Tests have shown that there are some limitation
+          in some Image I/O codecs concerning images in the CMYK color space. Work-arounds are
+          in place but may not always work as expected.
+        </p>
+      </section>
+      <section id="png">
+        <title>PNG</title>
+        <p>
+          PNG images are supported through an Image I/O codec. Transparency is supported but
+          not guaranteed to work with every output format.
+        </p>
+      </section>
+      <section id="svg">
+        <title>SVG</title>
+        <section id="svg-intro">
+          <title>Introduction</title>
+          <p>FOP uses <link href="#batik"> Apache Batik</link> for SVG support.
+            This format can be handled as an <code>fo:instream-foreign-object</code> or in a separate
+            file referenced with <code>fo:external-graphic</code>.</p>
+          <note>   
+            Batik's SVG Rasterizer utility may also be used to convert standalone SVG
+            documents into PDF.  For more information please see the
+            <link href="http://xmlgraphics.apache.org/batik/svgrasterizer.html">SVG Rasterizer documentation</link>
+            on the Batik site.
+          </note>
+        </section>
+        <section id="svg-pdf-graphics">
+          <title>Placing SVG Graphics into PDF</title>
+          <p>
+            The SVG is rendered into PDF by using PDF commands to draw and fill
+            lines and curves. This means that the graphical objects created with
+            this remain as vector graphics. The same applies to PostScript output.
+            For other output formats the SVG graphic may be converted to a bitmap
+            image.
+          </p>
+          <p>
+            There are a number of SVG things that cannot be converted directly into
+            PDF. Parts of the graphic such as effects, patterns and images are inserted
+            into the PDF as a raster graphic. The resolution of these raster images can
+            be controlled through the "target resolution" setting in the 
+            <link href="configuration.html">configuration</link>.</p>
+          <p>
+            Currently transparency is limited in PDF so many SVG images that
+            contain effects or graphics with transparent areas may not be displayed
+            correctly.
+          </p>
+        </section>
+        <section id="svg-pdf-text">
+          <title>Placing SVG Text into PDF and PostScript</title>
+          <p>If possible, Batik will use normal PDF or PostScript text when inserting text. It does
+            this by checking if the text can be drawn normally and the font is
+            supported. This example svg <link href="../dev/svg/text.svg">text.svg</link> /
+            <!--link href="../dev/svg/text.pdf"-->text.pdf<!--/link-->
+            shows how various types and effects with text are handled.
+            Note that tspan and outlined text are not yet implemented.</p>
+          <p>
+            Otherwise, text is converted and drawn as a set of shapes by Batik, using the
+            stroking text painter. This means that a typical character will
+            have about 10 curves (each curve consists of at least 20 characters).
+            This can make the output files large and when it is viewed the
+            viewer may not normally draw those fine curves very well (In Adobe Acrobat, turning on
+            "Smooth Line Art" in the preferences will fix this). Copy/paste functionality
+            will not be supported in this case.
+            If the text is inserted into the output file using the inbuilt text commands
+            it will use a single character.
+          </p>
+          <p>
+            Note that because SVG text can be rendered as either text or a vector graphic, you 
+            may need to consider settings in your viewer for both. The Acrobat viewer has both 
+            "smooth line art" and "smooth text" settings that may need to be set for SVG images 
+            to be displayed nicely on your screen (see Edit / Preferences / Display).
+            This setting will not affect the printing of your document, which should be OK in 
+            any case, but will only affect the quality of the screen display.</p>
+        </section>
+        <section id="svg-scaling">
+          <title>Scaling</title>
+          <p>
+            Currently, SVG images are rendered with the dimensions specified <em>in the SVG 
+              file</em>, within the viewport specified in the fo:external-graphic element.
+            For everything to work properly, the two should be equal. The SVG standard leaves 
+            this issue as an implementation detail. Additional scaling options are available
+            through XSL-FO means.
+          </p>
+          <p>
+            If you use pixels to specify the size of an SVG graphic the "source resolution" setting
+            in the <link href="configuration.html">configuration</link> will be used to determine the
+            size of a pixel. The use of pixels to specify sizes is discouraged as they may
+            be interpreted differently in different environments.
+          </p>
+        </section>
+        <section id="svg-problems">
+          <title>Known Problems</title>
+          <ul>
+            <li>
+              Soft mask transparency is combined with white so that it looks better
+              on PDF 1.3 viewers but this causes the soft mask to be slightly lighter
+              or darker on PDF 1.4 viewers.
+            </li>
+            <li>
+              There is some problem with a gradient inside a pattern which may cause a PDF
+              error when viewed in Acrobat 5.
+            </li>
+            <li>
+              Text is not always handled correctly, it may select the wrong font
+              especially if characters have multiple fonts in the font list.
+            </li>
+            <li>
+              Uniform transparency for images and other SVG elements that are converted
+              into a raster graphic are not drawn properly in PDF. The image is opaque.
+            </li>
+          </ul>
+        </section>
+      </section>
+      <section id="tiff">
+        <title>TIFF</title>
+        <p>
+          FOP can embed TIFF images without decompression into PDF, PostScript and AFP if they
+          have either CCITT T.4, CCITT T.6, or JPEG compression. Otherwise, a TIFF-capable
+          Image I/O codec is necessary for decoding the image.
+        </p>
+        <p>
+          There may be some limitation concerning images in the CMYK color space.
+        </p>
+      </section>
+      <section id="wmf">
+        <title>WMF</title>
+        <p>
+          Windows Metafiles (WMF) are supported through classes in 
+          <link href="ext:xmlgraphics.apache.org/batik">Apache Batik</link>. At the moment, support
+          for this format is experimental and may not always work as expected.
+        </p>
+      </section>
     </section>
     <section id="resolution">
       <title>Graphics Resolution</title>
@@ -368,7 +503,8 @@
       </p>
       <p>
         Please note that not all images contain resolution information. If it's not available
-        72 dpi is assumed (the default resolution of PDF and PostScript).
+        the source resolution set on the FopFactory (or through the user configuration XML) is used.
+        The default here is 72 dpi.
       </p>
       <p>
         Bitmap images are generally embedded into the output format at their original resolution
@@ -379,14 +515,23 @@
         used as a work-around to resample images in FO documents. 
       </p>
     </section>
+    <section id="page-selection">
+      <title>Page selection for multi-page formats</title>
+      <p>
+        Some image formats such as TIFF support multiple pages/sub-images per file. You can
+        select a particular page using a special URI fragment in the form:
+        &lt;uri&gt;#page=&lt;nr&gt;
+        (for example: <code>http://localhost/images/myimage.tiff#page=3</code>)
+      </p>
+    </section>
     <section id="caching">
       <title>Image caching</title>
       <p>
         FOP caches images between runs. There is one cache per FopFactory instance. The URI is 
         used as a key to identify images which means that when a particular URI appears again, 
         the image is taken from the cache. If you have a servlet that generates a different 
-        image each time it is called with the same URL you need to use a constantly 
-        changing dummy parameter on the URL to avoid caching.
+        image each time it is called with the same URI you need to use a constantly 
+        changing dummy parameter on the URI to avoid caching.
       </p>
       <p>
         The image cache has been improved considerably in the redesigned code. Therefore, a 

Modified: xmlgraphics/site/deploy/fop/trunk/running.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/running.html?rev=614164&r1=614163&r2=614164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/running.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/running.html Tue Jan 22 02:24:13 2008
@@ -244,7 +244,18 @@
 <p>The following software must be installed:</p>
 <ul>
         
-<li>Java 1.3.x or later Runtime Environment.</li>
+<li>
+          Java 1.4.x or later Runtime Environment.
+          <ul>
+            
+<li>
+              Many JREs &gt;=1.4 contain older JAXP implementations (which often contain bugs). It's
+              usually a good idea to replace them with a current implementation.
+            </li>
+          
+</ul>
+        
+</li>
         
 <li>
           Apache FOP. The <a href="../download.html">FOP distribution</a> includes all libraries that you will 
@@ -253,21 +264,16 @@
           <ul>
             
 <li>
-              A JAXP-compatible XML Parser (FOP comes with <a class="external" href="http://xerces.apache.org">Apache Xerces-J</a>).
-            </li>
-            
-<li>
-              A JAXP-compatible XSLT Processor (FOP comes with <a class="external" href="http://xalan.apache.org">Apache Xalan-J</a>).
-            </li>
+<a target="_blank" class="fork" href="http://xmlgraphics.apache.org/commons/">Apache XML Graphics Commons</a>, an shared library for Batik and FOP.</li>
             
 <li>
 <a target="_blank" class="fork" href="http://xmlgraphics.apache.org/batik/">Apache Batik</a>, an SVG library.</li>
             
 <li>
-<a class="external" href="http://jakarta.apache.org/commons/logging/">Apache Jakarta Commons Logging</a>, a logger abstraction kit.</li>
+<a class="external" href="http://commons.apache.org/logging/">Apache Commons Logging</a>, a logger abstraction kit.</li>
             
 <li>
-<a class="external" href="http://jakarta.apache.org/commons/io/">Apache Jakarta Commons IO</a>, a library with I/O utilities.</li>
+<a class="external" href="http://commons.apache.org/io/">Apache Commons IO</a>, a library with I/O utilities.</li>
             
 <li>
 <a class="external" href="http://excalibur.apache.org/framework/">Apache Excalibur/Avalon Framework</a>, for XML configuration handling.</li>
@@ -282,8 +288,7 @@
         
 <li>
           Graphics libraries. Generally, FOP contains direct support for the most important
-          bitmap image formats (including PNG, TIFF, JPEG and GIF). If you're using JDK 1.3, 
-          you may need additional packages to get GIF images to work. See 
+          bitmap image formats (including PNG, JPEG and GIF). See 
           <a href="graphics.html">FOP: Graphics Formats</a> for details.
         </li>
         
@@ -303,10 +308,10 @@
 </ul>
 </div>
     
-<a name="N10078"></a><a name="install"></a>
+<a name="N10075"></a><a name="install"></a>
 <h2 class="underlined_10">Installation</h2>
 <div class="section">
-<a name="N1007E"></a><a name="install-instruct"></a>
+<a name="N1007B"></a><a name="install-instruct"></a>
 <h3 class="underlined_5">Instructions</h3>
 <p>
           Basic FOP installation consists of first unzipping the <span class="codefrag">.gz</span> file that is the 
@@ -315,7 +320,7 @@
           documentation or Zip application software documentation for instructions specific to your 
           site.
         </p>
-<a name="N1008E"></a><a name="install-problems"></a>
+<a name="N1008B"></a><a name="install-problems"></a>
 <h3 class="underlined_5">Problems</h3>
 <p>
           Some Mac OSX users have experienced filename truncation problems using Stuffit to unzip 
@@ -325,10 +330,10 @@
         </p>
 </div>
     
-<a name="N1009C"></a><a name="standalone-start"></a>
+<a name="N10099"></a><a name="standalone-start"></a>
 <h2 class="underlined_10">Starting FOP as a Standalone Application</h2>
 <div class="section">
-<a name="N100A2"></a><a name="fop-script"></a>
+<a name="N1009F"></a><a name="fop-script"></a>
 <h3 class="underlined_5">Using the fop script or batch file</h3>
 <p>
         The usual and recommended practice for starting FOP from the command line is to run the 
@@ -420,7 +425,7 @@
         <strong>and</strong> if compatible encryption support is available at run time. 
         Currently, only the JCE is supported. Check the <a href="pdfencryption.html">Details</a>.
       </p>
-<a name="N100C4"></a><a name="your-own-script"></a>
+<a name="N100C1"></a><a name="your-own-script"></a>
 <h3 class="underlined_5">Writing your own script</h3>
 <p>FOP's entry point for your own scripts is the class
 <span class="codefrag">org.apache.fop.cli.Main</span>. The general pattern for the
@@ -431,7 +436,7 @@
         the standard scripts to make sure that 
         you get your environment properly configured. 
         </p>
-<a name="N100D4"></a><a name="jar-option"></a>
+<a name="N100D1"></a><a name="jar-option"></a>
 <h3 class="underlined_5">Running with java's -jar option</h3>
 <p>
         As an alternative to the start scripts you can run <span class="codefrag">java
@@ -449,7 +454,7 @@
 <p>In both cases the arguments consist of the options and
         infile and outfile specifications as shown above for the
         standard scripts.</p>
-<a name="N10103"></a><a name="dynamical-classpath"></a>
+<a name="N10100"></a><a name="dynamical-classpath"></a>
 <h3 class="underlined_5">FOP's dynamical classpath construction</h3>
 <p>If FOP is started without a proper classpath, it tries to
           add its dependencies dynamically. If the system property
@@ -473,7 +478,7 @@
           <span class="codefrag">org.apache.fop.cli.Main</span>.</p>
 </div>
     
-<a name="N10135"></a><a name="check-input"></a>
+<a name="N10132"></a><a name="check-input"></a>
 <h2 class="underlined_10">Using Xalan to Check XSL-FO Input</h2>
 <div class="section">
 <p>
@@ -527,7 +532,7 @@
       </p>
 </div>
     
-<a name="N10163"></a><a name="memory"></a>
+<a name="N10160"></a><a name="memory"></a>
 <h2 class="underlined_10">Memory Usage</h2>
 <div class="section">
 <p>
@@ -588,7 +593,7 @@
 </ul>
 </div>
     
-<a name="N1018A"></a><a name="problems"></a>
+<a name="N10187"></a><a name="problems"></a>
 <h2 class="underlined_10">Problems</h2>
 <div class="section">
 <p>If you have problems running FOP, please see the <a href="../gethelp.html">"How to get Help" page</a>.</p>

Modified: xmlgraphics/site/deploy/fop/trunk/running.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/running.pdf?rev=614164&r1=614163&r2=614164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/running.pdf (original)
+++ xmlgraphics/site/deploy/fop/trunk/running.pdf Tue Jan 22 02:24:13 2008
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 950 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 948 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$F>u03/'Sc)J.suoTEe,0Zjb#YI<f(...@L_7RVu0>U?F$hp'O:fTk7E8Dkbk/A@UBLc;Lj"2OD&p3&d:2m?9ZLjTT;k9,o!A,U">60Z89q+3!L++g+-:/#Tm"K`bQ*9`-7\UB%e2%E-t5g?'c2hUe`iGS*(?/R$B);,:]Fm<9Ef/-25eGQ3r8:RE%7S9$dsGYiE3n3;Nq*Y<SW&525m%?EOgn20pk5[>N<cOpKH>U_o=!"Fl<8U=r_TRp%ETDMBCo"26>lDie6HNORd-%C1WEs6<k:EDmor?P7h.np^!h1`*%O(.)78TO#i!QPLB9JZ9P=S1i0u\S0As+r:L6k5sGF.&/+OAA(-4^73gQ:K5;2`HV$lm:OQGXNsZ7m3iMocsB)ooIHc\e*6L+Q7a[jY*,a'ZH7`WC,sg_l_u3.%H>[uU]~>
+Gb!$F>u03/'Sc)R.suoTEe,0Z-KP`G<FXZ=#">"<mD=O`%EfQE$gYR"SYYd)S!llH@H@PPS0%:753IoR4s*L2$rN$J1gc2(q^WY3BK79X1Hu$<e3&rM_b:8JStb]6X*'`Ig%#uN:d6X`*1mrq>X`Noqg<[JI\?KAPFE[]S(p(376iO5Ga%X\.XI&S36t?*%S8Vld`miaN'8H`D]'k;P0#'2>hpb"59qf-3+'18QtJJ&FOfIdLj6Q-!h3ON+&Dh^*J)&QE2N81nF`[,;<eq0MB:>g)5YTPocsC?T3=\-m"_>jm3O,Ym'e[UQQ--8A<g1eU9rUrf-1(toVnAhO'o4]a8<<9GQNeoGY;DH6OWodqn1*H!j;VH^s)t9=i\3odi30AIp(p2g!\JbhJsPkX1@>B>3AdkdXn^;>)0rG>*Z[A_5>Oof@s&""ibFn^6RNR,gV!$SJ=R+LBhW6Z]s:K<YEtf$X@j]`Wl&8N5)?8,ge-X\]>.;WPUDC1iV[,NGk'l=5\G1[IV5dQ7X''PRS]Y&IgeM@merR`.'B!h7D;#CB0tkAUg`PP)X%LBH,#PLZk#?4;FD$qc]q`!lT_D7)Sm9CU!@'l;>4qI<9M5TMWT8]k5KOXc_2RdAmO/?GSZkGcr;FhKT;O^>!0J2;XFFj%H,HW_cM>F/%pU4GV;$Y!a-K:_C+317rbC\W=J5<#GPW4MId_JR6^6)o#ZIiD1#1rUFFlg!)1U@XZn30l%*K-pi\[,"-(+U/qs=r$b80EoY5Y.^_CK)%M0-ppM/Q0=s4_DnSs?Z@h*8l<M_W;a0$O,lEtirI"66?^U+_#k8=REB._d/KUbjPn@2Y^5UA)7>l=%GrVH\(Z:lR)7AF%f%K*F]:$;2KOps$FQX_#DMDE3]'Rr%NWOb5j#+28^XB\QSP4L/ag+mb.Lmu1l9%$ZQP8u!SiFUEa.qpo~>
 endstream
 endobj
 6 0 obj
@@ -181,10 +181,10 @@
 >>
 endobj
 34 0 obj
-<< /Length 3008 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2931 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau0F>B?9)(4Q"]i,'iA%\bW3ns8Xp/pfAfDsZ1um<B]+&sB4:@(=k:r;&Q.T_gPIN0J.Tat`;On(]REi7%YXimP:A[iOd`IHFY$1L`B6O'"T"230P_0[I>f>(?H:m!%$-l8l0KbMB>&U9/nD)Z<[V7C8'&WdJIXC#.[:?/2(NFlq<W+hhU*ruUhnr#a@K'?_j`f(^?%?<LnMIE(5aT#JACT&(+^5E!U/3rA[)Vu)2Mg%0UAm\^K^VdWs<keQ3+[0UV[2<?*Dc2C,Uqr^Mn[Eap\H]?L6?7N:(odU<UBj6phIX4>1M:8aC8J8-hZq=J+P$njUOP59?E:?DtX7dWU*'3uqbbcu42r[8>R`&h3GQ!mDqY*BW&UO@YVcCAuls?J@EKR*GMY<MJqk<Bt_f,T?>D>B)@YqL?q;iCff%pDZKcE#W.!Pu6]nQ8'(i/Rd"LqjX")bp&^9tAI"7fCI/L8cT>i0k8mMZlY7?\570s"1`cbSRWY'Nc4Y4s8DF!,`=dKTSr_'ihAM`QZ)=iFrP`(tLjB5&k1%XmWi"r\M=dq)F\U/IHer#0i]r)AIr`db1`"cA1C<pPOm(nXNtBSDIXqY-^Z&Nph;U5YEjj//#cSlCG&=>(5>Ph:)c')CKaUr.2bcK]M*dBK!Oh]M/8IpZ_hp#cB5U=WJ.)jaQ*m)E`MBX$%_TV*pD]iNKp0O]AH4N;N8CP!=BC3/m>`jkj>E;P*PD0&P*;hDe,If$2gDFIF^D";7S*6r%s?K:<rG5O$QYaGS'a?l<U[MB7]*P,RdE*?3k<2>1"'?t+4j?k]b:GOg5dPi=0r":bG$E:u.%O,m6U1,"*mr&D^>/=YaG\7P5$2%;83Q4YZ52RSD.5G;1bl1D0!niVHOG\?><Isk:QO1@nq*[_MTNVjr3f;%6ABUTSCC["U!kPO/K2FmFp$S35j?Y%8*HmPT':F?g6Y+7$*u+_mp"B`Ga(\Jj#j8Y:K5TYdC>E@iKDo=
 4;^N<D/Urqc3KS\#dYEMCdSWO]N&moVq#h<'D89Hr;suk>"VXn8]Dl./9?hA,ZAt\0kR!R:@4:H)[VWSF6^C.lSS20EQ9WLBI*69GJCkngehP5Jb9CqD`&COm@_OrO/P2I.&t]9J9h<Eo*Q"s<j_567H2a4K[oln[Dj3t"P.3GBHk)t(KCl"sq4$qs#I-C`Zd!*3q)dr*>?&94I'?aJ!!DseiX)&lZ#"aTDXgq9%>H)<I+@DN&rqMjM`hEfB&Q7s&[QRo3,5o"8[aWb7g7S"a9Z<@*3hINLSH3A-]&oWNZFo&OgjCK#IQZALSH3a9bKZ7*#0`S0P#+FUCV*bY.kB6U&rg`7j>4;Hi7!OHb*O2d1:1T:>uV`A&Da>oA2Xq\?PU.e*F&bBGQ%F/.kOQL8AM*T4I8DYj<J]UX4gW6QUn,''J9O;Ln0"@e&tW,\gjEa8$.<OpcJsM`Hl:%l,EW1qtW05,\Xs/AsGmc&/4W:?1X<kP1WUN82UC=h9VPFWns9o.8<i!k#,uchh,lkH8RqO.UpAkk:>(P,q1cX/dY0dZoB7);A^[&k*:_au?5p*3L^1$m.J=</5j$M#98>QMnJC`-Sn9'r=bNP%9=Nl.oOl9#N01Bne`@;0AIC75\O1@qr?pn,tc.b&\cG6fki3ML7)m61`tk+RrKK%-&(,;'?DkgQ@Y-Mqd-mOGrqcQ^?q+k4Sj^*!@=7?!Uh*DhffjXppm""+*RE)C06MrKf7B4uZ4\[><Y3a:;(8hAdSoeLGJ7:Tm&:r!$oPP=[T?gdIDN'"5[P.2fJeD+Jce#g)\,\9=C>+L84g,+=3!7huG3Ws7AP_gJmd/t.pW'O10`AHjDmEagm9W@(p+5qS%Ug:7k6P8I-Zc6W'#O<t#o"qJ*'p_61<7+UUSo5G*OYQJ)JWFHZ/k"3]S?dZ(XZJH0r;XX!Gc0_\_'V]\Pm.0$"r"u=ZTmWU8"T5]A'&_!mh85"s:C!o150Du69E8
 .Y9QDumdR92Q0!cQb7j1m?<sO(!Qn+(d7hYMB$."1pHB<)sB&hUmrHNN]MfPL2BY`Mn6Q9:DJ'-SA(\`%3Eh+6eK(G+V44MmS?>14q.r>H[kK3/:re0h%q@gkkJ'tBm@rKV``lkF1Vr4kG2m[a=/3$g[NL/?LKMnQ%j5CerRjMA"1)q2#Q;:'rNM[P.-XXdqYMn<SBdoj3jS5S1qukGX61P^`nh^S,kWsMk"MA_FPml2//^2U"ZU[\ekEFEY5k5t,)!nU&>On_6>+WcH')qZDkdi$tV.XV:Y*o-e(Gg(T),Z/I#SabWkRI)Yr5+/BD#[[VmM@K4TZ2F%g;NN?Dd5O_2BWn1J.(k.<\i*eXf1t=ae/D%%X$mFNj.Qo[G>QE+DEUE?*ZQTgR\;i.U_)5P5U^JK:+DO/;W_6AR+4/T:lD#NXM?]lh'X*c])I>WBn_e1-FKVac!&1QqZ5'^F'?i"0HkI,O62]@5U9OLs$huqEg'(o2(9,>/g1.I&NK3lI^PU&ti,R\L<cin]RWm\mC\F;X%okO?-pq-/VfBK^;;F'Ddg[]RRrNa%-qC?X54UgomG]NWR$;?D99:nE#"E>1)sNK:N<kI,"&@]hK\ZHtWRV#Kds;c14DcDl1+0<OSu?/a[g>:3ll!F0fe9Jo'j=*9Hg#&&f`32e0u;Qs=GQ&Odn)QLPm6,]6/!g5N)R8C0_<9GRgROtMaQ'Ra1r:J%qlR44*)T']EoD@.U@jDV`&5c6^lKb:hqHEBs21AjStDZXY@bM<9gq4[rTq,tA'A'oMi+E6<d*fe=/8HhQgH_l._aH[B.]$%^c?E`C(fV&*Efc(d9p7rJrpK2OOruMDE!-T\GCrH?WVeJfLpZ2b_C8&rWePcE_4>9*s8VfFbD=nDKakg:g:Aq!7Jd\BN2hucfW1$h*B5!/<73W;@0ctWK3/ib7&4RtVJ:fDk\3p/053.Vm</io,Kr:L@*D%*H\n)#:]HDNO/,^d`>Q
 !Zab!.EmhmZ23DjRob"5-h^JXi&[[#Y+jY.peN~>
+Gatm>>ArQ1&q9SYcs(^FX=R9!D1QbYh:!W?d-[]%:b5Aj#MGD[Tt46jACFoCTe>D&Q=SZO"E5o\r+:\)iQP,j*uE*N7jC\d[)_RNcuoek)=U-QLVfG'9V%QZp)%Rp]Hd9"m/sa)(k;;L>*M<(TC7EIX"Y(D+=W6Cg7R*ZmGd\Vnb9oI>s]N8KE!iP)#X-,a,$VS4)Oo9qeL&rco2j?Ao#V6iTUFfn<jO8C@U'<o4(.=e3%*Io;RT0Rg(E6$^Ok[7VF$I.OQrmjtpO2mK4oi2N=I',trK&W(=DZMk?b9EE/7oBn_!BPG7]E.+io`2e@8'L,lJ#Wk2<L_%WZ2R"*2^B@QNIS[KNqqTlmO8T^hZQ]Gi5^IN_jTZ?pZ.Dm"-H^R!OH(&\(l7E)f;&;D:bTs-_=o-*5?7!tcrFI.Erqdeq8Ns<+V"DP-Yo%=3>IU6=h4ZEZZ`(;_^C8QoTg$/:fn\lVK%ZGU1-oMPm>@h9aG=cWT8K5-`8HA[fs^=WE`PU4)FUm)Xkoo=#'%3\cu3JF^ZRluq.m@bjW6M093CTen^gd4KB-O3TcZ-Ak32FOUOr;b/,,sc?XlmAqKdq*Y'(HEk(`!/'Khbk*c3qr3)o:e`:7r5fRRj\-]9is&Da.`)i/_=YT3%!HYD2V'TE>,TdbOBGm5=&F4FcPF2]K:RKLZXOHug![Q=iLaW_Nn=Z0\ck2E?"MJe-biL/E,KpGBKA0"[>!;Qn&0(T!\Q2>i_IkUO[ZEDfd_FBC6-:+jRZ0a"Y[,%!SK^6Gs!\p6SL%U%/BA1GV$=np-+1nlmWiH8LA"pK&I/%3@AfpS#/cT(mNl^`"S6tS;c!SM*&+!]9kC\@a,!pB3Gc6!0>fK-mF5XD]r2b`\7NK*M37O@61Ue;_e&toga\iokjt`cR_:`iUfpW$-oH5/n+$rI@KeQu0'^+5;?VUl;$6;moR3Xm"dSV/:20@TC+cBGNA\$+b%$&88ILK24EU)[3of8+
 G%h_V]%qZgq81p,.r@a/jqTM/4If`Wq^-HZD3Ie;hA8Te>i`GK,./EWHiTDj&[-8Z`LE=W$-IRT(4I/8_B4I!>#N"IFR&)T%(9uspZ8LNL-):WM/34-kpK/tAX.]WZOI1(VLe0`,IXPT7_jY_)3*jkXXD9YLJCr=_i(]Y//=ihEad+a)ed7c[OIiS$*Z]qscn#f"FnZcl<Ebp&2bAB,Uo-OW"sMDY/rj$]`VCh9mHVja0R@l7Eq71W&etEM/rfcD,_c6/aU,Sq^V\rEN>KFt%E<0F4FKN8gC1a:GS*U3)R!\pR:PUdit[ZH6&e,N(bZNbCu^f!]h.32(iKXNTusE'i\>_s67L7*f-/$HJ9'Y*jn;JQ[E-$aI[(F?j$[;^C%\\J>F%gTcS8pfnI,GdEAR)21I`pdCW;MhB9KA1bd`;$-6u+T395W.,B5?NYC4c'PqP?bqiN9iB-_pU;9jkQai,5jWs@lT7HGR,9J2Q]?0-MT]VP@"l6(*.r/6[?Yq?kiO(fR$Wn^Z#nfH6!#XX$uT'N6^UUE]r:[^/qW:in@:=bI;X.(4>P)Y'E)1r8<M8G2Iib2tfJ]Y53RRhh?HVfhEPgHAO^(-;Kk=rAm-.b=ojWU"g=@X<1AQbIg,<Ac'ml2oKNZ,"jEKb5SQEd%kKd,!PA@!TUGDbt^fIrN`ACDGnFE.'@23RM'mLnWT8uZfYF/?5n++j;3`iMN90[#n!`j?o#]40^2^aDB!ghlpJT.-$3i/1TT'3re4<"WT!&R.2REC_72==Ak`\T[BQj4(b6l>n)]*i.mA9od@@f-06tp37/8QqdFG<1IM5J?MD\dH7b!_WM5FJ^<e*L:a(],f(U+kHA$llZ\6&'9DlSJH4r_*]TtkIP_.>T(F$O`SJ]4#2`pBpK#?\=*&[<U^,"8h&peR;YF/&Kfp0pPsqOe$/:Ysk<R`a8B=*An_K>(;n#MZE[_E1^t_Y:2Rmf,Pe!hADL!EJ\A<%MbpM
 N4/k1kgTp*-5@@A\_V?/a#U=Z.fZH9n7:[pP:7E0>RS^m2LNV0;J,Z.<KHkVV'krL5S1_7@]dnZU6?C>[B8qF^3_cI5X-<C!UNZn2[nsgiNlkFTr"r4DYC03E6?3k6gANFp2!9pc(H#b9XRKMgJ+Sf/JO$ee4-l*<SG&mgbM/hfsP56.heq<VM3bfb#8$%pF4>i\KVtWO^JjC;W3IUbJPj_R"SkGd@VZpuL.)(R.G@*T(r<_aM\nBIEmnZd#<ou26-\eb95lm.:6]s`,k(8;oP*)>PH*qOnmsgjDN*duX*NtcH9oB3Ae!/<uA)<[u'J.@Ic*$_Ehe<Qi_GJW&Wa(Fc^`bm1!I,RG3"/j05@Kj,_6t&[L#nSD^`g0W_f/U&p"_hG#D-YU>16ia%3sur"FMX<(-QPG$&1+37:6Wa@23,XSYd*+_WaSm<.ZFjoCY:p5*T?EQUMXSZCO%`*B`HCh'n&>?MaK9IW0P_?_d&0a=/D&MjN2T$S:<W#j1Ur,bad(a*<$hj:$[/#nKR-a6m4IprX=3(`dGD(i5WE]O<O[SSZ_s-!iAn.hTr(_bA<Zi':=U+#YcuY_Q["(X<nl"\^OJJqtP3"m^,cI1dnQ^"j+?5RGe)@>mIj`B;S&0cZqVnoPTMnW+)er7rf[g2fUu@?tfPl,;!6S.J.`35!s.I7Wo*?=/)eF'g$'iLDRBd6@$tB='5b%Mf1:]Z/R'gh.6AUP$:D^.i-I'1]@OLU,WO_fAkQFb&h$9NljB%2=RdkI%X1^_VHl$2#5,n#I^JaZ0jG5c,HGd7Fc>h]i1K1coD2\mr/FDt$i/@/IFhp6.ZJ(6I\0>[L%1*8Ir-,=.53&W"i5%kInn`ki%<8NAetJLj3gTcLUcq)n/i7NKahl;`:''"[)X;OidaLph)=HZ>SlIp\Mpa5ul=*4>TcU&-^/T&r+jH.c*`dD#c*;Vq~>
 endstream
 endobj
 35 0 obj
@@ -209,13 +209,12 @@
 45 0 R
 46 0 R
 47 0 R
-48 0 R
 ]
 endobj
 37 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 179.316 588.266 259.668 576.266 ]
+/Rect [ 179.316 555.866 259.668 543.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (../download.html)
@@ -226,10 +225,10 @@
 38 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 358.308 548.666 439.932 536.666 ]
+/Rect [ 108.0 516.266 272.976 504.266 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://xerces.apache.org)
+/A << /URI (http://xmlgraphics.apache.org/commons/)
 /S /URI >>
 /H /I
 >>
@@ -237,10 +236,10 @@
 39 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 378.312 535.466 455.28 523.466 ]
+/Rect [ 108.0 503.066 173.652 491.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://xalan.apache.org)
+/A << /URI (http://xmlgraphics.apache.org/batik/)
 /S /URI >>
 /H /I
 >>
@@ -248,10 +247,10 @@
 40 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 522.266 173.652 510.266 ]
+/Rect [ 108.0 489.866 240.66 477.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://xmlgraphics.apache.org/batik/)
+/A << /URI (http://commons.apache.org/logging/)
 /S /URI >>
 /H /I
 >>
@@ -259,10 +258,10 @@
 41 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 509.066 277.644 497.066 ]
+/Rect [ 108.0 476.666 212.652 464.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
-/A << /URI (http://jakarta.apache.org/commons/logging/)
+/A << /URI (http://commons.apache.org/io/)
 /S /URI >>
 /H /I
 >>
@@ -270,18 +269,7 @@
 42 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 108.0 495.866 249.636 483.866 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A << /URI (http://jakarta.apache.org/commons/io/)
-/S /URI >>
-/H /I
->>
-endobj
-43 0 obj
-<< /Type /Annot
-/Subtype /Link
-/Rect [ 108.0 482.666 291.288 470.666 ]
+/Rect [ 108.0 463.466 291.288 451.466 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://excalibur.apache.org/framework/)
@@ -289,10 +277,10 @@
 /H /I
 >>
 endobj
-44 0 obj
+43 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 366.288 409.866 480.288 397.866 ]
+/Rect [ 344.64 403.866 458.64 391.866 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (graphics.html)
@@ -300,10 +288,10 @@
 /H /I
 >>
 endobj
-45 0 obj
+44 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 192.66 396.666 299.34 384.666 ]
+/Rect [ 192.66 390.666 299.34 378.666 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (pdfencryption.html)
@@ -311,10 +299,10 @@
 /H /I
 >>
 endobj
-46 0 obj
+45 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 90.0 343.066 198.66 331.066 ]
+/Rect [ 90.0 337.066 198.66 325.066 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (graphics.html#batik)
@@ -322,7 +310,7 @@
 /H /I
 >>
 endobj
-47 0 obj
+46 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -333,7 +321,7 @@
 /H /I
 >>
 endobj
-48 0 obj
+47 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -344,31 +332,31 @@
 /H /I
 >>
 endobj
-49 0 obj
+48 0 obj
 << /Length 2750 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gb!#]CN%rs(B*Z._2f';NB"i7b:"-FgGj&te8FZ\!UO2K,"L(SI"`)&?KB/qjnfN^WQMYT'L`lKagq0$pDNhnLPn)%(S<=YZ%;r4?FYr]L>t74jc0St"a>f5jO..9r-\&-QbL/GYmjmOoWZ%`RnY7-7u_\ec%okMiup<%0<7M%_,fsa.q?D3'-:MH>H.15)60FTeZ(*!RZ)H#)(IqlotsfFisPf%j3L867.<=Adl$tBKbA*J-N`okPIW)AZ5IQqcUB;Ciq7P/^K&*n>]*!/@JFLur%RYnjV-MJ_4liq.rl5d(e#doD'EHMS4LW!7!@J2*FOec!5H5I0J9@ljoksFSY""INFSB01;o:djVLIZ0p+JL%A>EH+<tN:AV<aUObb:L">4Wj+d[N6eDnKP*F4+CC<nnP,@b`gc[$.1^C\2j:"WEq8g'uT,f;gtTNpC+=Cq@fYq;j]*"E0<d*q(<p'tZMHre+e,SX+E+HKc?=el,Hk'VfY.6s)APe)kUs#SBcn?:/c:(8H*(rm`to%%JIf(N@c*2bGn9&Y)r`,4,BmrQd2Dd-D9K8Zfk(YP<TfBZ^1Od"W<RYS7<=Jm%ZMBGt<b.eW*`_)K*f[_O8J#/bsfM/L)DM\"#2fY%kj6PKR\j"ONFXJo1=O_2YoRQm:'c!n9VAN'/C0#Ng'kja<mOCsZjuQ;u,7tf.EGRm":N<-];ZsBuNX4tqpTdlQ:i!H47N50g(1`,'dF72q.LFRPnapQ[5>JVQBjPLFpN63p;2=7o.]EnRYI"<TEW9d-'K@Y9.[=ci%O5ikbnpoGb3t=Ua\Lr3!jP05G9U*tKt[#oorm!IrpKL9)rstW9U>9)5qT"+.qk3J7*c@U9lm/PZ96A3;2G=1*Kj]P;%Z7,GA/CFBL6TT1*5]+Bn]Ko)6bLh0Ra"6=s2bW&5l(2<M>rOYr]g+8)s$-6+P4g"GL?GW<kof)g5=I)gC^j@eWVGJU=%l5&3'K2p>otD*HN
 1ZJ%QE>/B40%R`%NpnMo`iZ<*LVjdq1[)ti:]W?air%<ujM8@DAO0GSdD'Db7!#9a`i>^]5U:`O\Vi?9q`s.Kt<`DL7K2VI4lhOeb8$tg^+pe`H0-kRf7O$j)`VgRQd[G?ED/u?3],(*B,q?(Wg#Rc6%@pN)e9/##d-Dp>b<="A]u$ldB#@B/d&p1T-RnUrXNt`gr^D]iDTAqX<S]N]`I2VZnkIm1(ef#%9m=d'\D'c$%VHO="-J/N?FS\!ks>k!DF??$Y[(aWgp]ZJW489^%(S<QIGrOoJa"igQZ&J6FbWFm64>Z)SJ4(ddr.Xo9^1^H]b<92?MdNe16DP\JZem?s04/n:1R#H9[>PmXV8lm-<4mW%U'oRg25j06uQ9&R4:'7T[H'$ndKNP-B9kI*##nhaFp&KT0!_U6(TiEqP$G=<<C?Gk\#(oaqSRtX.%FNK6ntF<0JAtHOl&kD5/9/DJcgDQK6GK@l/aRdugI_35g(\98@M!c4()Qo=e_B7_ZXPIf!`cVZN!UB(skN_^N-\k[U(3DC@]C>DmY#H#\WbF:ULbEo,cG6P5=$qVfIT`>2E)j.52ML"M`a(Kn9I]SI;-ne*RO>/N3j2K/sH\.ioN!:Me8U":*]=FPpY3Nt&fl`7BBCZYSb.^-O!H'!)RYPe+^iVVB%m\_bPq@%5O-F$_Jk+\GcI]"<QX(jHUMplXfQs'M#KX_Q1id_230lhK"Jg33ShWJ3h)d%)SEMm.m>1&FS?6?eu-R9UbTe+O*"p[E.O23#*@+H7u@>5`V1D/g8*fD^O2,"V\+auR7#.ZNl/3)2S+^#r(O_>TGdk0=:Nh06[KC1QYd@%i+QML;$f2?iEqAEh&&iQONNnb&58K;9NN+>eYO9)g#OS<rC;W5PG:RCs\bcsh<ekr%JB/!.iHp\['R2U8j%Yo5Tg+W"+%Xfsf1obZZ$N1I`&jaic[ks=^5R^hc@r$9u@__u=-ej8bZditl@eZjk<:Q
 thr6fED;s9:Uf`cE0(/?ij#a>D$7(>FnqscO%GG!),b:6,:hfY(&Lbu*1i=%u4&pMFN*<M%.(Ya$rY$*a=-O1WH[,A#rH_MN:24R\5J/a8s5e8!m;&&ma&*mP8F]i_YmEMo!m"k/(IJb[\+Fh\Zk&\f:Ef!\g*=unt:N6=*5\B!0N3K!u<W<@"H;ce[ShjgbBpkdAlp4)8=5nogL-Xk<(QYh1@oX45=r4L^iSFhs8@)sY9E-o?]q/XhPVO]6#0gmL5(])/6b<8?d(Q%N%5]'S?"X9l&i`*69u#YBr;VY&<'Jo\)'!o!^@k<+7=AS$6_XZGbOSVf?/L/IAUhS4ND/WP;]W&@D<BGW37M-j[g,m$"k9`XV4L+h?NO#iD[mu:,)KL82G%XT=5sq;=^EcF$8mfJJ,3S^?%MCoMm;+-9^5`5pK@%]rD.Y++(eY&[4UD1+W2-)gGouSp!jtgGa2f!p:?`c-JiM;$J-XpEQ"i54I#H]K5rqt%4TZ>k^u"uj^/(27Ko=M]V/!+][Jm<6@\hu5+;.a<L!(]f+->n"TW&dingkO?[JI1^;r%H,Q,M`$dNXC1;C6TQRYS<YL9RHHl(*"Qe.W2g2Bj+XbI%Q;^.`0)d1[4M/.=U4ZFZDJ&>F`LHR]!hrhq!48!eL+!)/"#^h,"KS'AJ\W'A(or%jr&.lut-`JP,en">_!/.:&dI'L$]sms"bju$rUBR(eM0;"nL?lC@r,#SK=3DnCFH_W!X+GqZ7M&/_c#T@ebL&WU"WUWrD#~>
 endstream
 endobj
-50 0 obj
+49 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 49 0 R
-/Annots 51 0 R
+/Contents 48 0 R
+/Annots 50 0 R
 >>
 endobj
-51 0 obj
+50 0 obj
 [
+51 0 R
 52 0 R
 53 0 R
 54 0 R
-55 0 R
 ]
 endobj
-52 0 obj
+51 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 466.296 456.313 526.944 444.313 ]
@@ -379,7 +367,7 @@
 /H /I
 >>
 endobj
-53 0 obj
+52 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 72.0 443.113 123.0 431.113 ]
@@ -390,7 +378,7 @@
 /H /I
 >>
 endobj
-54 0 obj
+53 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -401,7 +389,7 @@
 /H /I
 >>
 endobj
-55 0 obj
+54 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -412,30 +400,30 @@
 /H /I
 >>
 endobj
-56 0 obj
+55 0 obj
 << /Length 2175 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 GauHMgMYb*&:Ml+#^L+k1pff9\eISa2N<V1Rn^>2(Bp6k0K'qe.nclf47V4skWZAQ+SB?+U5hcA__Yr.U>A\+c6l,sNi7(*s$%QMN7aH^](!mK++?uh[u"m3b.9b4lfe:rb@-9T[]jT-;9*2.?Opa"/%`-BDgqLq))gE("+U.V7cV:Y2G?j-7s5'ZL4@_DH249*6)leF>2N+NAJ)p8X]*h(=.b094H'u5SRt3#9(o`P9I[V6>o!=BIe&7Oq7O*UpPCPlm2khsIj-O(OieJ4Pu=Pf:Vr"+]Ykq]"b\prkYu/7ffp@t-,R6Zd0^??<9(GYZ_Y?Bj_3a<ane<2Kdme*H;j8'(6d0R5>`.6<;**g@:$(Zbt4d1-.0U`StOqu!Rs_:(Btmt?>e`k8llWk5X]+an!@B/='m=>9[jG7+Dt#Z93+LA2Qk^jm_]<ur>#F[<'4*IRe8Hln#roYN%qZk8DTjABO3t%c7<LJ_aBuEruXLE0Hoi4^L#--#d;Xe!=?C[Xe`EQ^hn<Y+5kPY;nUX;=f,%Ej'kY3K<#@2-BtsAC0($CEdZ,30oG!7o/%-Bm5.HEL9=FI&2msVYI4cY&$QH[fEp9%G@)iaoA=)#(?T<V2ji"r7=.4Plkg[#GAJI,LWkWC396FJrXR&CpiI!+N=LL4lKjSFd6a8mgL?K2-Es"'0A%O'Y,>Ei(40PG'gZ%9jZG[+_sbTHqkE0Q-$C4g76!6<YPkPA-_JD*q_.[m@9r_jmge<kIt$/lX[e5s7U,CZ)uqQ91#/T>l="U,jt7sSD^G9n^+[C#qOo>?"3+Q%Br5nc(XRTi'Ug0%HE?_Vg3gNb-[4'oN!i85-4ocJ9uHc2JOrLR&lDp!UoC/X"*Z+JMNW<#I1u3-CpRggY>nVf7Pc4LP^#n6@L;X&6O8+t&t:&-<O6EoS3olp"\BJ1A`#9k8tF;co"#YI8pd%A-l,?G"_J!]_ZGJJ-<P<T&@JW\N3Y]3mr>771U0b
 RH>MYr1;[4M:,!&;`n+r#&$`[f6_'u02X\Gi632,sl/E\bgn`\Q;8\UBLa*sZd)qG`-dEeZ1k4dJAkZ-0VU-8WX(WMf/_c'42`It(^uRDG2&$:EH-emGK^%tQ;4&0?>E4dUn5?DHkDakSVF_du_lVt^FQW@W\8>1r_a?7q(SA'$2_JI_0'(@Tok_s]k!4.W2.:P)OK&^o(NM+Q'C^%Qb&F8\8R@+4Se9i4/8TCdDAV`NN!)krb`hZULT%s^*lpQ$,=[iM6gV8Yak)<Hc...@gVrMJ2Tra>A#dC'L<VcHQp35'FQ^e1*ge_-3,M(2E\e97HP)o:<u=^0c=U@[)0kr,qj38JM")LN/C\;F0.Pq"A*mRttIc&)M_Q?.Y^7#/uk"Xh%E_M+'*_Vug)G)f5;U<4=5Y9fgm6Q;>$Y9KmG=-$g
 8/YVqPi=iGAdZPb_ti409Q]2L_lamQ#Ua%,1jMOIAr.iY2YHWkQnS1/71ISHTl&-Qh:pl6)R[@om*-1CK>3)ZII)Fo2;5m?\AB>???#H<BbDk9\Y<u(UCRR)F*a(%8P]BQM]L40rjR_(7CM<g)JD>a+.hkDOIf:rqBMn;Z[Mf>*u=U?9DFuP#eER](%0-8.$,Q~>
 endstream
 endobj
-57 0 obj
+56 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 56 0 R
-/Annots 58 0 R
+/Contents 55 0 R
+/Annots 57 0 R
 >>
 endobj
-58 0 obj
+57 0 obj
 [
+58 0 R
 59 0 R
 60 0 R
-61 0 R
 ]
 endobj
-59 0 obj
+58 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 123.324 141.4 157.32 129.4 ]
@@ -446,7 +434,7 @@
 /H /I
 >>
 endobj
-60 0 obj
+59 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -457,7 +445,7 @@
 /H /I
 >>
 endobj
-61 0 obj
+60 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -468,30 +456,30 @@
 /H /I
 >>
 endobj
-62 0 obj
+61 0 obj
 << /Length 2438 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 GauHMD/\/e&H88.Tl4^tKFoZuXV_D@mF&-#d&ccA'uN5^12X(W-'sdXqVU`e^Z\Fi'W4KWU5gPcNlU>>StfUdc@21OI6HW9!rfqt$O(UB+:-n("qc5haB5[^Nub!dl.I.kY9mnKf:g)Fph_cNF'CX@rc)R$.m4YhiCm:t5L2G=fQ64Bpb)L8ln=Q'BtieKCl6qg=2fUE?'L1;f@=s*?YAqICSAoqcGRGK^OZY:r/F,r\`9'21]6:R\'AkeT$Lj`mW[bK+77,NJ`efA4W[5j`!H,J(L%%+mWllYT5Sq'rScn:ZJ1Pf/$nImf0u-0h;u:'NrTB`:!r]MWOn'6;e<L,nFAV(1>(WME>_WC$aX5UXcfMmo4#t-/7lSs1d@p!hR<o'(A?9$Y>6(+>%rkYl`k.'pd4/tW!n6PW_/b.!$8_r@^T,0XLjUk\]4-O(r8I&UrS%^epLMB$5<V\X5K_k&I_idpO7Sirp'4Nk%aJQ9AA>$fS,Q8#gn8[AJXqGU8*)r!ja7b?ZR=MrP_&E"t;4S&qsOE++U\"="-7jZo-K>p)&NXmO_$%H(*uhbX#`Ed9k)):==EVW;]EQHatD!YGT:04s_,i$J&6iG*FZdXA;:@?*"a_anrGM,/m"Fh<;IMhckX;,SPMI::%pR`(GHo_R7d9Ns[mcK/^$]oG<1>cL4Y0j@q1ue2#!HRqtHDA"G;\]brm7?ru=OAj+6uBEl*6mNGOoep1#jqgDWk0UnlTeaVS)_Bl@E\gK''^'L)Bb>ZTt00iP331#4cVpp(NKe/%T/KRt=CXDgWWFZY.3/"R"qb^k'OcUa3:[gEBcH"'jPdi]G(AB<7eg7r/VW(l^`T=I%Ze8ng]%Wd;'0sR!!.0^''f59!-E,i_cF%IU,,mhsKViJhZ*eYS(%+](Xb<'jm#k@\Rp<(g>\2Rm=]oK6j43gt83eS\?"eOm!!K#*8`,f[?CDm%;SeApD'JN6E$K-bfajX#kB7eaKBeo
 pho"*G76jUj<pU2/AnQl6dBh'^c\T%g[86]Y+,IS@7//Anl_Vn]H@A'Ir2Rd(B3eSK?.k!0N<Q]m,4M=0#DJkZ:BLRgqQahl$]O$q#qb.>3ZVEZ%Zd`_V+)h4@5`:br><]%ma4g_$*CM=3&SC[+0Y`Y(f>]RINL?BEI:.]LtquUV^CrD&%3$@f[!mmlR%*7DV>47/h/XCbOm:X;&FDW2c&TT#AD"W#f"55qn=ak0EWE>OmsjoJ3eHCTGH!;CBYb+PHZ]0#T"1)gij4`'f(/SMNp%]4g4/`j1^C[('&h2''&5n@I+PRO[H_4SY]09KqQ:n&guE4h@D)>1`aW-]>Y@aKm7/,iW3\T9%'r_6u]f]G]AZL3DqUaE$n=YWJ>*,+#$</rr#,=K*@(PmqU@9N"Y/%fn3Jp]"ssa9,*i.1P#Y9)!*4VjHZ^.-g&LA"L8DZ:?9J;OCGtOS-Lcf\.^j--Xt)lJ'98Gahm_YV8*uMhi&1:NDm)HcWK[(8Y%'Qb+s>k!`LlpT/c%IHEHe,c4_C[LuCVlWU,B^*cDO`G*%rXZI5fQL8rL3Zf`q%+F9L-Yq/q%Upp]?iV2FV\gj!-6R;`@Li[l[Fi'g`SJ*SB]Y3`5*,A9D8T"RV'eJ-YJs\Z#V6*)n,X$-hWKg&@aI=8:Zaik)4TJ8U)aicRL)^caA*[u!?k6ArMlpP@"S?.&qlmlE1nh!`A'>oHO+W7k\!t$bUX"dXKa%X5\7;Wh\/+t>3e<rR4J3H$Ts/fhqaeBbDpWrfc>D]X4pDl8h3K5sm17Z.d@Bt(`D3%8KPqHPcr&%Eg(u7)W<Mt2VEY&?E]<*[ZPdB''nt<",N%sYM1*B6a`:T]9Du8Q&AmU9`3n*FQ9#P/$7:!AU..9'`]/L_gCri!nA2B*-.4$35Bqon_d[Y^fn-Bf?!hiL<p6oiN2OZ?Dhf?!<u<"nKZi+/8OVX]UTlM?-P/G:.i$]HH%CFmhgc3/NuDCl>!uZfZ6<
 M=3h+mIPT+dWoS@<')VK>=MTBXq&BFoIV:lQ-Q*CQ6(.Tq@bPsfn@Q\R?*4!ZQ))e(q/^cbIW+:r8m6_!\TB4NV''^!>\rTJJ><Tns<Z288D!^P]F<_PdG*+p?FS5(ej84#4)a8e.]OOMjg&nft7_C7&a\jKnh@N^N4;*;D,Sa+qNl$GgZd9)Y`8b3@HD/Zt^)Ad(8_Yl6!AY(m:ZKRcc]YNL^K$#LqQSja2qXcNDr4o,Im=DrmuAH\@LR'ZG!KXZjuUfOX)?la!.TKj+\]UTm+ql=G<\pej"M%iZ`=jXEiX&iaDR@t[h_58LAoHuQ\fkqSaY1nf(C3]U2[U>NEX\_r.C=Y9\lh;!!(DGg]c]6U00"0Y`[c=]:1b2XeMag3MY,B%,Kd-DS#:MHdRCDOCBdEB0kT;k!n<)s0AZU0.nomXg3XXlXcNLqk/W;ClVsX4+R;4@"[1)~>
 endstream
 endobj
-63 0 obj
+62 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 62 0 R
-/Annots 64 0 R
+/Contents 61 0 R
+/Annots 63 0 R
 >>
 endobj
-64 0 obj
+63 0 obj
 [
+64 0 R
 65 0 R
 66 0 R
-67 0 R
 ]
 endobj
-65 0 obj
+64 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 504.852 502.494 534.18 490.494 ]
@@ -501,7 +489,7 @@
 /H /I
 >>
 endobj
-66 0 obj
+65 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -512,7 +500,7 @@
 /H /I
 >>
 endobj
-67 0 obj
+66 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -523,33 +511,33 @@
 /H /I
 >>
 endobj
-68 0 obj
+67 0 obj
 << /Length 3115 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 Gatm>=``=W&q9SY@*QkU<F]...@GEPDA1>R?HI=#do9pF.\<gf;R'52F?=rQ#M?U[rUn"BK]rK6'q0A;aIcH;I2E9,#teaInk2@gZ=]=;k-23V,RK>SlmcLQhhc_Dbf!bK(DkotDt!le?V`P9u\Qkq]E#M>m@u2E6s<::4eB'@&t:"Bd@LD)$[+oqk.qMuj4EKa$OHci`8
 BHgskQVSsj9U-]d8Q29@7"K=6fn,qi..djlH2;2&ADDCWlBn[.k"2F>+n.36crk%n8_sP_Uj,SuBIJEHi:9kfK?H3YT?=J4Mc/BI0GCN@+`>pE&*KPOscLnIZd/$'['AqZ#%e!q\5(FkB+66^]9PDoT?8h(#NS)m9i,ZhUY,unsHa;KNa(RYt72K.22h;c6bgfnl"6mc?GTCWSZmIZt>1Z/2m&Yu"h2X&[==aM@!Mn?Sk5gtkjYMaXq>_s%L!3sX&J4_5knY)rZDplUS:9<?,j!Uo$Nb"#%br%e@.XLs.NY:W%?MhJ""]DEAiT$d%H:hG5/T?l$QCZi&Gopp2-B<08U3L4iFj$rqs`l,<'JpV#(HsAGtJnNiQMY-1p,/P\U7?lWjM!*[+_C_+k[Uj9t\-)`s+L"ZtqF`)_lh!=P%[sl)#In^^MaD(</Splq6J6ImT0=TF>Eq5`\q2R:IWh6Bd"gg,lVYm_6GRT`)'Lc56\pIq)G_plJ4i3o6e;p1bQIa!tqBHN[[1ArQsP9"Iq09DDNGZCBB&fD-aL>kO:9LDG&[PE?o%""!Ycddjd\eQW48$*Pt\K`$N]eW"tm7^&nm$cIr\eVtdh\URmZeT,@#$'tfKWMsdV)'?3shEZCt"^XVZ#X+9`[&1F]Fo,Fqe:3ZrRB.K%Bd#L-[XP'TDTtFf8dC%fA>p&JlO"Mg;GO>+!/i8"65BPh.o]O31kEsS5G0h5LF#]#A:R3k"I(9T%S3q-Kq'Wp)5M1gama2&4Be5:@*LQHSCM&6k(]E66Pb[hh-U]']#tgX4_f\S%&o6s<+eXfeg!=?`l#2)c=Cclj'oF4UUGjlAe>g&,bTcKMT7Vi7qQb3l9r7kq,8!i68'0FVV0+"kCo($<fa\@>"^tq39$MAO7uO_c0)CO]\<k^@Nr-p[aM#.IL&4?D27FC:deg*0;?pT=17uR[`Ed+cs8'Q9TDlPE)Ei4=GAVti@nEAnsh$=RM)Se$ha
 >bikue`]KNf0CiMBg8CG9O5P`e0$qTTqIoR"Q*["Z9p7nr>"4Z23cbh_OHL9k4n'_GJIN:*%dij_8X4agTJ#l?ub2k6s8"%0S#HHmi&[?k\KA,"4==<,8'!Ggo=1=Y'L]03fm=;Vf6cb7%N_3SVFD,j,K<T[E&V('JPHk4].Z0:miCB0"'oMBCCABQAbt,H\'St-%5_f?l0d74Q_p4U(Kmf9o0,P3@\ZY?;OH<sEi<f@0bQ;ZBW2(==!)gPiX=BoE/*[mgg%UfjC-2Jh/Vbd#D_b9KTW"(AS@>6&!g'aN%Io)=81Z?)LQlN02>%:mYk?k##U+GJ*X3"rO+dk_U2t#&km?`k%#9ju;`L8ZFM:l7AteB,WnT3hPdDtfq_ClF:%/E<*aPa&BYP2(e(SRLb6jTm[d'*sZ<<;s/uqKR4]od<+er\\BJ"P!OJo1AGc$s%W0GOUBSdWii_9.1LM`iqOq`"]Ldk&:RH#JG$"TV:A*?eF`@3Ls.S1`dcD5RQ$n-KQ2V];&4Fdo2[n$0Zp^9[,mj*,Xfl&]SO`X*o$TeU4/'[-dj-*jMoas2ph`5$N@)+Q#aLs\I?&$Lq>4n^q?b[5fS=!%Y^BdgO)*fOR>*A+OL4fR]oHGX!^rl2Ca@J8SEUtd^EOd98*E^tWM[Nn-P&^Pg&<sG4\'@R3'B,b2Lq1im_'2Z2SR*X[C/-gBZoF&.kc':(VRmpUPL5B=>_%1k:fitf.s"_q9%-IF:=bI=\/R0K%2Qr4F0]55YXGr[8`:_'?8PCZACVtp1/6`QHuLi1eGT#N2(d&#&VXA7cm9O:0V'n"P^b.8+Jkr]l263mR.4#:Ch]:q\+L/l[)Fc%/K$?-9=_F4cLYt?Q&-bVLJ.FZ"/k>13[9`3fbTkdGh>74.J0@`SM0FqigD<r>q)c;(kXrL6<1?V-^4L9]BT/;_!2sn:S&X_G6MOe=qrah@.Z*Nm1)K!LOfH,dl1+aehf89UU5dW/9C%N6=
 46a<JMO_`q-_HIbuH^:(2"[C'd)uE$)1s+;MmuK4G#HhFIPi^sugQ87>bBc"ZqlZS:[(!H+S)Fgs0a^>])__hbEgLB9e](-n`#/Yc/6h`&g=mHlLtM[u(8m*haOHVJ08Dg1=%G-]Nq!M2&S?N~>
 endstream
 endobj
-69 0 obj
+68 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 68 0 R
-/Annots 70 0 R
+/Contents 67 0 R
+/Annots 69 0 R
 >>
 endobj
-70 0 obj
+69 0 obj
 [
+70 0 R
 71 0 R
 72 0 R
 73 0 R
 74 0 R
 75 0 R
-76 0 R
 ]
 endobj
-71 0 obj
+70 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 241.32 568.4 309.312 556.4 ]
@@ -560,7 +548,7 @@
 /H /I
 >>
 endobj
-72 0 obj
+71 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 332.64 568.4 404.64 556.4 ]
@@ -571,7 +559,7 @@
 /H /I
 >>
 endobj
-73 0 obj
+72 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 375.624 355.98 476.604 343.98 ]
@@ -582,7 +570,7 @@
 /H /I
 >>
 endobj
-74 0 obj
+73 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 302.616 172.246 381.948 160.246 ]
@@ -593,7 +581,7 @@
 /H /I
 >>
 endobj
-75 0 obj
+74 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -604,7 +592,7 @@
 /H /I
 >>
 endobj
-76 0 obj
+75 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -615,31 +603,31 @@
 /H /I
 >>
 endobj
-77 0 obj
+76 0 obj
 << /Length 2147 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
 GatU5968iG&AII3E."rQ0eGQip?#'/,b7]tVX!eMpAe'PL^?X,,\4sooj*@f\U[8.DW?R"K%S,QMg`G1=,RTi`OCQam,7oa"nCEF'?;j*%V#j\YPfkmIAc5QHL]bLID:3p-DBUbrmRijcIh]SO3SqP%SQsVi7\QEC@b]AnIkg]qWGYR-CQJhJp7g?Gu75@4[g%[rnE95r=1ZdI[Y:"]"*_=D2QkeYrnCF'7*Cd*2m>5"L59_SA-ZqYq*doUo[PkbEXuVApi:mnsS+IF2dIIX:&(+gq@b-G#gh[#g`&=<lU8Ol\]*7"uL/l5PfiY'1B#0=r9LiQQ<p0P8'KP0M$V(2-QsSQId,KB\[%dDL0p=`bKsKK9F:UZ9Z$CV@77E=q+8JMe$p39mdu_pN?6h1>NbZ<(QlshcWh<=;+Q/q0p5d`#X.RpVe':P7#9nO<roUS;B)/i/T&4XJZB615DWT-o4$oE>c@H&`QZYGDM3[%=m)CW@Sc$"FEaD!fmk-^(Y',b2&ldO'dr[7QRboF5!8kh^6Tm@@W?OX7[BWP^'?\K`9,6LAFLlQ;>+)6a=9JapFA(SAWM0AZ'++30k/Q4sW'/Ea&sE!K"]HaTV\bbeOGhYRM]h:(Tpu#I/V\aant3`-HNTD\L;>^Fkioln\'!VR^A75$'U7&Zls7XkFble7M<^Q\KUNBb.0j7?Dth&''j.,q#T:cXE9p9W;>Y@A=l=:Q")oo/@JH,mZmdrb9b9Qs)$J-uHn.`cLYAU^5<3IWbP27>D29_1=2lrHL2#:e'H8d"<qUU9QJ:Z@.?LPiX=SS,KqWhtBOT>+psto,@/@GeP%k#R)klNJdJE<$IsU(VR[fhpR`KJiO<r$=36mk"gAW;QFcI4&<SYGFsT3c7+W9o:2;\:*@0b?3udGBJ[+R(]bP#6`D]jbIB';E1s58B'Yci(lC1XOeL?QX?F`#060;)WU.,m7V-&XSsN7"Va8#9<=]D[3GZtd']);
 qN4r]4\jlcAWd?%]7]]$2'Ge@#?4qr?RAi#^/s':TXk$ltB)jR(;.)G]b#pdeP_Yn!cjM;;(9IKrIK]QSfCMIOL3Q=$XTH_+?K&[Wc2bnE#KCtrP!c0Zqs?;6C+(Q4)1A/l*O[i;<bQ...@eDc>FMSqo>h)UlE)tD6Bll4\q+9HmUW.sJ>KF3ZS]LD!N5_M#WV"=pmBVVjT1+ma<HG%,_QD;ME6pfDmK<#nPf3sjY'ngR:R'_Tn&mGa3#KhF:2Eo$7]&YI5)+M`0eGd8N8[6U,W:J%Ch6nib\:+C-2COrIOZfDJDQI!`8jr96,<MgNfb5:D6V\Qg%fX\jA8YtXg>cma";br?2R9]+GeJR:et9s5_RBkgZOo7JYS9/C-_LYBOC5N)Oj$Q<qj\fcL(LII%d=bC@D,YfN4.>Q,C;/lo-ss@#NHLsTg#=4L_7:1a?[=:J>@hiaebH9E4EO#c,u`VCke#rNYd_/>X2dX3Sp4Da9iHcKEe;ebh7hrisgur''cMd57,#H8tLF0B:r9@N#6OS+0RK6mV^@`bs[nj5tpcsh_T.7a-&b^(58ne>"#!\HI7[7@INhrqfB$O/n?(bTG(\sT$qYW*H-!H:@LmB;c#MoQUD@S+iHY,*uFq:9h!BN0ZD!YIGm%b/Q3%Z<ch6A3@lD5AYec]kTn=m9M[Wu;0"i7;iI#8:Wf6GP$0EYBrCW#HGT[i$pnmBDmA+brjQ*fjVI%\i(JG=$[M-*:Jg.+AtuUVC!l";kW(2N`R7Oe&tJ^?5WGE&2g`P%9@%Y23ojH$JYDX7:*O$&H@F:[r\EOM6JR745"p
 tO9A=d?0-/aYA4f\W^rlg[8^q<?YX2muJ]&LmT7egCSbRuC'_R%`;VkWd)&:?u8N]>DI43A`MhV5MlSu<$VnP0C64"*rC+FJ>d!!IsG6F!#Xd2i]Hq<]\NO69]FSmqkWZQ.s^)-UJAlU2+`aoBEY,lh+>?Tbj#5T,A]fl2~>
 endstream
 endobj
-78 0 obj
+77 0 obj
 << /Type /Page
 /Parent 1 0 R
 /MediaBox [ 0 0 612 792 ]
 /Resources 3 0 R
-/Contents 77 0 R
-/Annots 79 0 R
+/Contents 76 0 R
+/Annots 78 0 R
 >>
 endobj
-79 0 obj
+78 0 obj
 [
+79 0 R
 80 0 R
 81 0 R
 82 0 R
-83 0 R
 ]
 endobj
-80 0 obj
+79 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 330.636 599.4 437.064 587.4 ]
@@ -650,7 +638,7 @@
 /H /I
 >>
 endobj
-81 0 obj
+80 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 314.628 362.466 429.732 350.466 ]
@@ -661,7 +649,7 @@
 /H /I
 >>
 endobj
-82 0 obj
+81 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -672,7 +660,7 @@
 /H /I
 >>
 endobj
-83 0 obj
+82 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -683,145 +671,145 @@
 /H /I
 >>
 endobj
-85 0 obj
+84 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\123\0\171\0\163\0\164\0\145\0\155\0\40\0\122\0\145\0\161\0\165\0\151\0\162\0\145\0\155\0\145\0\156\0\164\0\163)
- /Parent 84 0 R
- /Next 86 0 R
+ /Parent 83 0 R
+ /Next 85 0 R
  /A 9 0 R
 >> endobj
-86 0 obj
+85 0 obj
 <<
  /Title (\376\377\0\62\0\40\0\111\0\156\0\163\0\164\0\141\0\154\0\154\0\141\0\164\0\151\0\157\0\156)
- /Parent 84 0 R
- /First 87 0 R
- /Last 88 0 R
- /Prev 85 0 R
- /Next 89 0 R
+ /Parent 83 0 R
+ /First 86 0 R
+ /Last 87 0 R
+ /Prev 84 0 R
+ /Next 88 0 R
  /Count -2
  /A 11 0 R
 >> endobj
-87 0 obj
+86 0 obj
 <<
  /Title (\376\377\0\62\0\56\0\61\0\40\0\111\0\156\0\163\0\164\0\162\0\165\0\143\0\164\0\151\0\157\0\156\0\163)
- /Parent 86 0 R
- /Next 88 0 R
+ /Parent 85 0 R
+ /Next 87 0 R
  /A 13 0 R
 >> endobj
-88 0 obj
+87 0 obj
 <<
  /Title (\376\377\0\62\0\56\0\62\0\40\0\120\0\162\0\157\0\142\0\154\0\145\0\155\0\163)
- /Parent 86 0 R
- /Prev 87 0 R
+ /Parent 85 0 R
+ /Prev 86 0 R
  /A 15 0 R
 >> endobj
-89 0 obj
+88 0 obj
 <<
  /Title (\376\377\0\63\0\40\0\123\0\164\0\141\0\162\0\164\0\151\0\156\0\147\0\40\0\106\0\117\0\120\0\40\0\141\0\163\0\40\0\141\0\40\0\123\0\164\0\141\0\156\0\144\0\141\0\154\0\157\0\156\0\145\0\40\0\101\0\160\0\160\0\154\0\151\0\143\0\141\0\164\0\151\0\157\0\156)
- /Parent 84 0 R
- /First 90 0 R
- /Last 93 0 R
- /Prev 86 0 R
- /Next 94 0 R
+ /Parent 83 0 R
+ /First 89 0 R
+ /Last 92 0 R
+ /Prev 85 0 R
+ /Next 93 0 R
  /Count -4
  /A 17 0 R
 >> endobj
-90 0 obj
+89 0 obj
 <<
  /Title (\376\377\0\63\0\56\0\61\0\40\0\125\0\163\0\151\0\156\0\147\0\40\0\164\0\150\0\145\0\40\0\146\0\157\0\160\0\40\0\163\0\143\0\162\0\151\0\160\0\164\0\40\0\157\0\162\0\40\0\142\0\141\0\164\0\143\0\150\0\40\0\146\0\151\0\154\0\145)
- /Parent 89 0 R
- /Next 91 0 R
+ /Parent 88 0 R
+ /Next 90 0 R
  /A 19 0 R
 >> endobj
-91 0 obj
+90 0 obj
 <<
  /Title (\376\377\0\63\0\56\0\62\0\40\0\127\0\162\0\151\0\164\0\151\0\156\0\147\0\40\0\171\0\157\0\165\0\162\0\40\0\157\0\167\0\156\0\40\0\163\0\143\0\162\0\151\0\160\0\164)
- /Parent 89 0 R
- /Prev 90 0 R
- /Next 92 0 R
+ /Parent 88 0 R
+ /Prev 89 0 R
+ /Next 91 0 R
  /A 21 0 R
 >> endobj
-92 0 obj
+91 0 obj
 <<
  /Title (\376\377\0\63\0\56\0\63\0\40\0\122\0\165\0\156\0\156\0\151\0\156\0\147\0\40\0\167\0\151\0\164\0\150\0\40\0\152\0\141\0\166\0\141\0\47\0\163\0\40\0\55\0\152\0\141\0\162\0\40\0\157\0\160\0\164\0\151\0\157\0\156)
- /Parent 89 0 R
- /Prev 91 0 R
- /Next 93 0 R
+ /Parent 88 0 R
+ /Prev 90 0 R
+ /Next 92 0 R
  /A 23 0 R
 >> endobj
-93 0 obj
+92 0 obj
 <<
  /Title (\376\377\0\63\0\56\0\64\0\40\0\106\0\117\0\120\0\47\0\163\0\40\0\144\0\171\0\156\0\141\0\155\0\151\0\143\0\141\0\154\0\40\0\143\0\154\0\141\0\163\0\163\0\160\0\141\0\164\0\150\0\40\0\143\0\157\0\156\0\163\0\164\0\162\0\165\0\143\0\164\0\151\0\157\0\156)
- /Parent 89 0 R
- /Prev 92 0 R
+ /Parent 88 0 R
+ /Prev 91 0 R
  /A 25 0 R
 >> endobj
-94 0 obj
+93 0 obj
 <<
  /Title (\376\377\0\64\0\40\0\125\0\163\0\151\0\156\0\147\0\40\0\130\0\141\0\154\0\141\0\156\0\40\0\164\0\157\0\40\0\103\0\150\0\145\0\143\0\153\0\40\0\130\0\123\0\114\0\55\0\106\0\117\0\40\0\111\0\156\0\160\0\165\0\164)
- /Parent 84 0 R
- /Prev 89 0 R
- /Next 95 0 R
+ /Parent 83 0 R
+ /Prev 88 0 R
+ /Next 94 0 R
  /A 27 0 R
 >> endobj
-95 0 obj
+94 0 obj
 <<
  /Title (\376\377\0\65\0\40\0\115\0\145\0\155\0\157\0\162\0\171\0\40\0\125\0\163\0\141\0\147\0\145)
- /Parent 84 0 R
- /Prev 94 0 R
- /Next 96 0 R
+ /Parent 83 0 R
+ /Prev 93 0 R
+ /Next 95 0 R
  /A 29 0 R
 >> endobj
-96 0 obj
+95 0 obj
 <<
  /Title (\376\377\0\66\0\40\0\120\0\162\0\157\0\142\0\154\0\145\0\155\0\163)
- /Parent 84 0 R
- /Prev 95 0 R
+ /Parent 83 0 R
+ /Prev 94 0 R
  /A 31 0 R
 >> endobj
-97 0 obj
+96 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F3
 /BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-98 0 obj
+97 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-99 0 obj
+98 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F6
 /BaseFont /Times-Italic
 /Encoding /WinAnsiEncoding >>
 endobj
-100 0 obj
+99 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F1
 /BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-101 0 obj
+100 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F9
 /BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
-102 0 obj
+101 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F2
 /BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-103 0 obj
+102 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -831,18 +819,18 @@
 1 0 obj
 << /Type /Pages
 /Count 7
-/Kids [6 0 R 35 0 R 50 0 R 57 0 R 63 0 R 69 0 R 78 0 R ] >>
+/Kids [6 0 R 35 0 R 49 0 R 56 0 R 62 0 R 68 0 R 77 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 84 0 R
+ /Outlines 83 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 97 0 R /F5 98 0 R /F1 100 0 R /F6 99 0 R /F9 101 0 R /F2 102 0 R /F7 103 0 R >> 
+/Font << /F3 96 0 R /F5 97 0 R /F1 99 0 R /F6 98 0 R /F9 100 0 R /F2 101 0 R /F7 102 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
@@ -854,186 +842,185 @@
 11 0 obj
 <<
 /S /GoTo
-/D [35 0 R /XYZ 67.0 318.066 null]
+/D [35 0 R /XYZ 67.0 312.066 null]
 >>
 endobj
 13 0 obj
 <<
 /S /GoTo
-/D [35 0 R /XYZ 67.0 275.932 null]
+/D [35 0 R /XYZ 67.0 269.932 null]
 >>
 endobj
 15 0 obj
 <<
 /S /GoTo
-/D [35 0 R /XYZ 67.0 179.579 null]
+/D [35 0 R /XYZ 67.0 173.579 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [50 0 R /XYZ 67.0 611.4 null]
+/D [49 0 R /XYZ 67.0 611.4 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [50 0 R /XYZ 67.0 569.266 null]
+/D [49 0 R /XYZ 67.0 569.266 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [63 0 R /XYZ 67.0 659.0 null]
+/D [62 0 R /XYZ 67.0 659.0 null]
 >>
 endobj
 23 0 obj
 <<
 /S /GoTo
-/D [63 0 R /XYZ 67.0 549.447 null]
+/D [62 0 R /XYZ 67.0 549.447 null]
 >>
 endobj
 25 0 obj
 <<
 /S /GoTo
-/D [63 0 R /XYZ 67.0 371.094 null]
+/D [62 0 R /XYZ 67.0 371.094 null]
 >>
 endobj
 27 0 obj
 <<
 /S /GoTo
-/D [63 0 R /XYZ 67.0 166.341 null]
+/D [62 0 R /XYZ 67.0 166.341 null]
 >>
 endobj
 29 0 obj
 <<
 /S /GoTo
-/D [69 0 R /XYZ 67.0 277.38 null]
+/D [68 0 R /XYZ 67.0 277.38 null]
 >>
 endobj
 31 0 obj
 <<
 /S /GoTo
-/D [78 0 R /XYZ 67.0 402.8 null]
+/D [77 0 R /XYZ 67.0 402.8 null]
 >>
 endobj
-84 0 obj
+83 0 obj
 <<
- /First 85 0 R
- /Last 96 0 R
+ /First 84 0 R
+ /Last 95 0 R
 >> endobj
 xref
-0 104
+0 103
 0000000000 65535 f 
-0000030080 00000 n 
-0000030180 00000 n 
-0000030272 00000 n 
+0000029810 00000 n 
+0000029910 00000 n 
+0000030002 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000001112 00000 n 
-0000001232 00000 n 
-0000001348 00000 n 
-0000030421 00000 n 
-0000001480 00000 n 
-0000030484 00000 n 
-0000001614 00000 n 
-0000030550 00000 n 
-0000001750 00000 n 
-0000030616 00000 n 
-0000001886 00000 n 
-0000030682 00000 n 
-0000002022 00000 n 
-0000030746 00000 n 
-0000002158 00000 n 
-0000030812 00000 n 
-0000002294 00000 n 
-0000030876 00000 n 
-0000002430 00000 n 
-0000030942 00000 n 
-0000002566 00000 n 
-0000031008 00000 n 
-0000002702 00000 n 
-0000031074 00000 n 
-0000002838 00000 n 
-0000031139 00000 n 
-0000002974 00000 n 
-0000003156 00000 n 
-0000003342 00000 n 
-0000006443 00000 n 
-0000006566 00000 n 
-0000006670 00000 n 
-0000006840 00000 n 
-0000007018 00000 n 
-0000007194 00000 n 
-0000007382 00000 n 
-0000007576 00000 n 
-0000007765 00000 n 
-0000007955 00000 n 
-0000008122 00000 n 
-0000008292 00000 n 
-0000008461 00000 n 
-0000008643 00000 n 
-0000008829 00000 n 
-0000011672 00000 n 
-0000011795 00000 n 
-0000011843 00000 n 
-0000012032 00000 n 
-0000012216 00000 n 
-0000012398 00000 n 
-0000012584 00000 n 
-0000014852 00000 n 
-0000014975 00000 n 
-0000015016 00000 n 
-0000015183 00000 n 
-0000015365 00000 n 
-0000015551 00000 n 
-0000018082 00000 n 
-0000018205 00000 n 
-0000018246 00000 n 
-0000018384 00000 n 
-0000018566 00000 n 
-0000018752 00000 n 
-0000021960 00000 n 
-0000022083 00000 n 
-0000022145 00000 n 
-0000022317 00000 n 
-0000022491 00000 n 
-0000022689 00000 n 
-0000022903 00000 n 
-0000023085 00000 n 
-0000023271 00000 n 
-0000025511 00000 n 
-0000025634 00000 n 
-0000025682 00000 n 
-0000025851 00000 n 
-0000026020 00000 n 
-0000026202 00000 n 
-0000031203 00000 n 
-0000026388 00000 n 
-0000026592 00000 n 
-0000026810 00000 n 
-0000026984 00000 n 
-0000027134 00000 n 
-0000027515 00000 n 
-0000027815 00000 n 
-0000028066 00000 n 
-0000028362 00000 n 
-0000028688 00000 n 
-0000028986 00000 n 
-0000029163 00000 n 
-0000029303 00000 n 
-0000029416 00000 n 
-0000029526 00000 n 
-0000029637 00000 n 
-0000029746 00000 n 
-0000029853 00000 n 
-0000029970 00000 n 
+0000001110 00000 n 
+0000001230 00000 n 
+0000001346 00000 n 
+0000030150 00000 n 
+0000001478 00000 n 
+0000030213 00000 n 
+0000001612 00000 n 
+0000030279 00000 n 
+0000001748 00000 n 
+0000030345 00000 n 
+0000001884 00000 n 
+0000030411 00000 n 
+0000002020 00000 n 
+0000030475 00000 n 
+0000002156 00000 n 
+0000030541 00000 n 
+0000002292 00000 n 
+0000030605 00000 n 
+0000002428 00000 n 
+0000030671 00000 n 
+0000002564 00000 n 
+0000030737 00000 n 
+0000002700 00000 n 
+0000030803 00000 n 
+0000002836 00000 n 
+0000030868 00000 n 
+0000002972 00000 n 
+0000003154 00000 n 
+0000003340 00000 n 
+0000006364 00000 n 
+0000006487 00000 n 
+0000006584 00000 n 
+0000006754 00000 n 
+0000006944 00000 n 
+0000007132 00000 n 
+0000007317 00000 n 
+0000007498 00000 n 
+0000007688 00000 n 
+0000007853 00000 n 
+0000008023 00000 n 
+0000008192 00000 n 
+0000008374 00000 n 
+0000008560 00000 n 
+0000011403 00000 n 
+0000011526 00000 n 
+0000011574 00000 n 
+0000011763 00000 n 
+0000011947 00000 n 
+0000012129 00000 n 
+0000012315 00000 n 
+0000014583 00000 n 
+0000014706 00000 n 
+0000014747 00000 n 
+0000014914 00000 n 
+0000015096 00000 n 
+0000015282 00000 n 
+0000017813 00000 n 
+0000017936 00000 n 
+0000017977 00000 n 
+0000018115 00000 n 
+0000018297 00000 n 
+0000018483 00000 n 
+0000021691 00000 n 
+0000021814 00000 n 
+0000021876 00000 n 
+0000022048 00000 n 
+0000022222 00000 n 
+0000022420 00000 n 
+0000022634 00000 n 
+0000022816 00000 n 
+0000023002 00000 n 
+0000025242 00000 n 
+0000025365 00000 n 
+0000025413 00000 n 
+0000025582 00000 n 
+0000025751 00000 n 
+0000025933 00000 n 
+0000030932 00000 n 
+0000026119 00000 n 
+0000026323 00000 n 
+0000026541 00000 n 
+0000026715 00000 n 
+0000026865 00000 n 
+0000027246 00000 n 
+0000027546 00000 n 
+0000027797 00000 n 
+0000028093 00000 n 
+0000028419 00000 n 
+0000028717 00000 n 
+0000028894 00000 n 
+0000029034 00000 n 
+0000029147 00000 n 
+0000029257 00000 n 
+0000029368 00000 n 
+0000029476 00000 n 
+0000029583 00000 n 
+0000029700 00000 n 
 trailer
 <<
-/Size 104
+/Size 103
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-31254
+30983
 %%EOF

Modified: xmlgraphics/site/deploy/fop/trunk/running.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/running.xml?rev=614164&r1=614163&r2=614164&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/running.xml (original)
+++ xmlgraphics/site/deploy/fop/trunk/running.xml Tue Jan 22 02:24:13 2008
@@ -17,7 +17,7 @@
 <document>
   <header>
     <title>Running Apache FOP</title>
-    <version>$Revision: 569104 $</version>
+    <version>$Revision: 614156 $</version>
   </header>
 
   <body>
@@ -25,21 +25,24 @@
       <title>System Requirements</title>
       <p>The following software must be installed:</p>
       <ul>
-        <li>Java 1.3.x or later Runtime Environment.</li>
+        <li>
+          Java 1.4.x or later Runtime Environment.
+          <ul>
+            <li>
+              Many JREs &gt;=1.4 contain older JAXP implementations (which often contain bugs). It's
+              usually a good idea to replace them with a current implementation.
+            </li>
+          </ul>
+        </li>
         <li>
           Apache FOP. The <link href="../download.html">FOP distribution</link> includes all libraries that you will 
           need to run a basic FOP installation. These can be found in the [fop-root]/lib directory. These 
           libraries include the following:
           <ul>
-            <li>
-              A JAXP-compatible XML Parser (FOP comes with <link class="fork" href="ext:xerces">Apache Xerces-J</link>).
-            </li>
-            <li>
-              A JAXP-compatible XSLT Processor (FOP comes with <link class="fork" href="ext:xalan">Apache Xalan-J</link>).
-            </li>
+            <li><link class="fork" href="ext:xmlgraphics.apache.org/commons">Apache XML Graphics Commons</link>, an shared library for Batik and FOP.</li>
             <li><link class="fork" href="ext:batik">Apache Batik</link>, an SVG library.</li>
-            <li><link class="fork" href="ext:jakarta/commons/logging">Apache Jakarta Commons Logging</link>, a logger abstraction kit.</li>
-            <li><link class="fork" href="ext:jakarta/commons/io">Apache Jakarta Commons IO</link>, a library with I/O utilities.</li>
+            <li><link class="fork" href="ext:commons-logging">Apache Commons Logging</link>, a logger abstraction kit.</li>
+            <li><link class="fork" href="ext:commons-io">Apache Commons IO</link>, a library with I/O utilities.</li>
             <li><link class="fork" href="ext:excalibur/framework">Apache Excalibur/Avalon Framework</link>, for XML configuration handling.</li>
           </ul>
         </li>
@@ -48,8 +51,7 @@
       <ul>
         <li>
           Graphics libraries. Generally, FOP contains direct support for the most important
-          bitmap image formats (including PNG, TIFF, JPEG and GIF). If you're using JDK 1.3, 
-          you may need additional packages to get GIF images to work. See 
+          bitmap image formats (including PNG, JPEG and GIF). See 
           <link href="graphics.html">FOP: Graphics Formats</link> for details.
         </li>
         <li>



---------------------------------------------------------------------
Apache XML Graphics Project URL: http://xmlgraphics.apache.org/
To unsubscribe, e-mail: commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: commits-help@xmlgraphics.apache.org