xmlgraphics-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vhenneb...@apache.org
Subject svn commit: r569118 [43/49] - in /xmlgraphics/site/deploy/fop: ./ 0.93/ 0.94/ 0.94/images/ dev/ dev/design/ skin/ trunk/
Date Thu, 23 Aug 2007 19:00:51 GMT
Added: xmlgraphics/site/deploy/fop/trunk/embedding.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/embedding.xml?rev=569118&view=auto
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/embedding.xml (added)
+++ xmlgraphics/site/deploy/fop/trunk/embedding.xml Thu Aug 23 12:00:37 2007
@@ -0,0 +1,684 @@
+<?xml version="1.0" encoding="ISO-8859-1"?><!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--><!-- $Id$ --><!-- Embedding FOP --><!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "document-v13.dtd">
+<document>
+  <header>
+    <title>Apache FOP: Embedding</title>
+    <subtitle>How to Embed FOP in a Java application</subtitle>
+    <version>$Revision: 538485 $</version>
+  </header>
+
+  <body>
+  <section id="overview">
+    <title>Overview</title>
+    <p>
+      Review <link href="running.html">Running FOP</link> for important information that applies 
+      to embedded applications as well as command-line use, such as options and performance.
+    </p>
+    <p>
+      To embed Apache FOP in your application, first create a new
+      org.apache.fop.apps.FopFactory instance. This object can be used to launch multiple
+      rendering runs. For each run, create a new org.apache.fop.apps.Fop instance through
+      one of the factory methods of FopFactory. In the method call you specify which output
+      format (i.e. Renderer) to use and, if the selected renderer requires an OutputStream,
+      which OutputStream to use for the results of the rendering. You can customize FOP's
+      behaviour in a rendering run by supplying your own FOUserAgent instance. The
+      FOUserAgent can, for example, be used to set your own Renderer instance (details
+      below). Finally, you retrieve a SAX DefaultHandler instance from the Fop object and
+      use that as the SAXResult of your transformation.
+    </p>
+    <note>
+      We recently changed FOP's outer API to what we consider the final API. This might require
+      some changes in your application. The main reasons for these changes were performance
+      improvements due to better reuse of reusable objects and reduced use of static variables
+      for added flexibility in complex environments.
+    </note>
+  </section>
+  <section id="basics">
+    <title>Basic Usage Pattern</title>
+    <p>
+      Apache FOP relies heavily on JAXP. It uses SAX events exclusively to receive the XSL-FO 
+      input document. It is therefore a good idea that you know a few things about JAXP (which
+      is a good skill anyway). Let's look at the basic usage pattern for FOP...
+    </p>
+    <p>Here is the basic pattern to render an XSL-FO file to PDF:
+    </p>
+    <source xml:space="preserve"><![CDATA[
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.MimeConstants;
+
+/*..*/
+
+// Step 1: Construct a FopFactory
+// (reuse if you plan to render multiple documents!)
+FopFactory fopFactory = FopFactory.newInstance();
+
+// Step 2: Set up output stream.
+// Note: Using BufferedOutputStream for performance reasons (helpful with FileOutputStreams).
+OutputStream out = new BufferedOutputStream(new FileOutputStream(new File("C:/Temp/myfile.pdf")));
+
+try {
+  // Step 3: Construct fop with desired output format
+  Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, out);
+
+  // Step 4: Setup JAXP using identity transformer
+  TransformerFactory factory = TransformerFactory.newInstance();
+  Transformer transformer = factory.newTransformer(); // identity transformer
+           
+  // Step 5: Setup input and output for XSLT transformation 
+  // Setup input stream
+  Source src = new StreamSource(new File("C:/Temp/myfile.fo"));
+
+  // Resulting SAX events (the generated FO) must be piped through to FOP
+  Result res = new SAXResult(fop.getDefaultHandler());
+            
+  // Step 6: Start XSLT transformation and FOP processing
+  transformer.transform(src, res);
+
+} finally {
+  //Clean-up
+  out.close();
+}]]></source>
+    <p>
+      Let's discuss these 5 steps in detail:
+    </p>
+    <ul>
+      <li>
+        <strong>Step 1:</strong> You create a new FopFactory instance. The FopFactory instance holds 
+        references to configuration information and cached data. It's important to reuse this
+        instance if you plan to render multiple documents during a JVM's lifetime.
+      </li>
+      <li>
+        <strong>Step 2:</strong> You set up an OutputStream that the generated document
+        will be written to. It's a good idea to buffer the OutputStream as demonstrated 
+        to improve performance.
+      </li>
+      <li>
+        <strong>Step 3:</strong> You create a new Fop instance through one of the factory
+        methods on the FopFactory. You tell the FopFactory what your desired output format
+        is. This is done by using the MIME type of the desired output format (ex. "application/pdf").
+        You can use one of the MimeConstants.* constants. The second parameter is the
+        OutputStream you've setup up in step 2.
+      </li>
+      <li>
+        <strong>Step 4</strong> We recommend that you use JAXP Transformers even 
+        if you don't do XSLT transformations to generate the XSL-FO file. This way 
+        you can always use the same basic pattern. The example here sets up an 
+        "identity transformer" which just passes the input (Source) unchanged to the 
+        output (Result). You don't have to work with a SAXParser if you don't do any 
+        XSLT transformations.
+      </li>
+      <li>
+        <strong>Step 5:</strong> Here you set up the input and output for the XSLT 
+        transformation. The Source object is set up to load the "myfile.fo" file. 
+        The Result is set up so the output of the XSLT transformation is sent to FOP. 
+        The FO file is sent to FOP in the form of SAX events which is the most efficient 
+        way. Please always avoid saving intermediate results to a file or a memory buffer 
+        because that affects performance negatively.
+      </li>
+      <li>
+        <strong>Step 6:</strong> Finally, we start the XSLT transformation by starting 
+        the JAXP Transformer. As soon as the JAXP Transformer starts to send its output 
+        to FOP, FOP itself starts its processing in the background. When the 
+        <code>transform()</code> method returns FOP will also have finished converting 
+        the FO file to a PDF file and you can close the OutputStream.
+        <note label="Tip!">
+          It's a good idea to enclose the whole conversion in a try..finally statement. If
+          you close the OutputStream in the finally section, this will make sure that the
+          OutputStream is properly closed even if an exception occurs during the conversion.
+        </note>
+      </li>
+    </ul>
+    <p>
+      If you're not totally familiar with JAXP Transformers, please have a look at the 
+      <link href="#examples">Embedding examples</link> below. The section contains examples
+      for all sorts of use cases. If you look at all of them in turn you should be able
+      to see the patterns in use and the flexibility this approach offers without adding
+      too much complexity.
+    </p>
+    <p>
+      This may look complicated at first, but it's really just the combination of an 
+      XSL transformation and a FOP run. It's also easy to comment out the FOP part
+      for debugging purposes, for example when you're tracking down a bug in your 
+      stylesheet. You can easily write the XSL-FO output from the XSL transformation
+      to a file to check if that part generates the expected output. An example for that
+      can be found in the <link href="#examples">Embedding examples</link> (See "ExampleXML2FO").
+    </p>
+    <section id="basic-logging">
+      <title>Logging</title>
+      <p>
+        Logging is now a little different than it was in FOP 0.20.5. We've switched from
+        Avalon Logging to <link href="ext:jakarta/commons/logging">Jakarta Commons Logging</link>.
+        While with Avalon Logging the loggers were directly given to FOP, FOP now retrieves
+        its logger(s) through a statically available LogFactory. This is similar to the
+        general pattern that you use when you work with Apache Log4J directly, for example.
+        We call this "static logging" (Commons Logging, Log4J) as opposed to "instance logging" 
+        (Avalon Logging). This has a consequence: You can't give FOP a logger for each
+        processing run anymore. The log output of multiple, simultaneously running FOP instances
+        is sent to the same logger.
+      </p>
+      <note>
+        We know this may be an issue in multi-threaded server environments if you'd like to 
+        know what's going on in every single FOP processing run. We're planning to add an
+        additional feedback facility to FOP which can be used to obtain all sorts of specific
+        feedback (validation messages, layout problems etc.). "Static logging" is mainly 
+        interesting for a developer working on FOP and for advanced users who are debugging 
+        FOP. We don't consider the logging output to be useful to normal FOP users. Please
+        have some patience until we can add this feature or jump in and help us build it. We've
+        set up a <link href="http://wiki.apache.org/xmlgraphics-fop/ProcessingFeedback">Wiki page</link>
+        which documents what we're going to build.
+      </note>
+      <p>
+        By default, <link href="ext:jakarta/commons/logging">Jakarta Commons Logging</link> uses
+        JDK logging (available in JDKs 1.4 or higher) as its backend. You can configure Commons
+        Logging to use an alternative backend, for example Log4J. Please consult the
+        <link href="ext:jakarta/commons/logging">documentation for Jakarta Commons Logging</link> on
+        how to configure alternative backends.
+      </p>
+    </section>
+  
+    <section id="render">
+      <title>Processing XSL-FO</title>
+      <p>
+        Once the Fop instance is set up, call <code>getDefaultHandler()</code> to obtain a SAX 
+        DefaultHandler instance to which you can send the SAX events making up the XSL-FO 
+        document you'd like to render. FOP processing starts as soon as the DefaultHandler's
+        <code>startDocument()</code> method is called. Processing stops again when the
+        DefaultHandler's <code>endDocument()</code> method is called. Please refer to the basic
+        usage pattern shown above to render a simple XSL-FO document.
+      </p>
+    </section>
+
+    <section id="render-with-xslt">
+      <title>Processing XSL-FO generated from XML+XSLT</title>
+      <p>
+        If you want to process XSL-FO generated from XML using XSLT we recommend 
+        again using standard JAXP to do the XSLT part and piping the generated SAX 
+        events directly through to FOP. The only thing you'd change to do that 
+        on the basic usage pattern above is to set up the Transformer differently:
+      </p>
+      <source xml:space="preserve"><![CDATA[
+  //without XSLT:
+  //Transformer transformer = factory.newTransformer(); // identity transformer
+  
+  //with XSLT:
+  Source xslt = new StreamSource(new File("mystylesheet.xsl"));
+  Transformer transformer = factory.newTransformer(xslt);]]></source>
+    </section>
+  </section>
+  <section id="input">
+    <title>Input Sources</title>
+    <p>
+      The input XSL-FO document is always received by FOP as a SAX stream (see the 
+      <link href="../dev/design/parsing.html">Parsing Design Document</link> for the rationale).
+    </p>
+    <p>
+      However, you may not always have your input document available as a SAX stream. 
+      But with JAXP it's easy to convert different input sources to a SAX stream so you
+      can pipe it into FOP. That sounds more difficult than it is. You simply have
+      to set up the right Source instance as input for the JAXP transformation. 
+      A few examples:
+    </p>
+    <ul>
+      <li>
+        <strong>URL:</strong> <code>Source src = new StreamSource("http://localhost:8080/testfile.xml");</code>
+      </li>
+      <li>
+        <strong>File:</strong> <code>Source src = new StreamSource(new File("C:/Temp/myinputfile.xml"));</code>
+      </li>
+      <li>
+        <strong>String:</strong> <code>Source src = new StreamSource(new StringReader(myString)); // myString is a String</code>
+      </li>
+      <li>
+        <strong>InputStream:</strong> <code>Source src = new StreamSource(new MyInputStream(something));</code>
+      </li>
+      <li>
+        <strong>Byte Array:</strong> <code>Source src = new StreamSource(new ByteArrayInputStream(myBuffer)); // myBuffer is a byte[] here</code>
+      </li>
+      <li>
+        <strong>DOM:</strong> <code>Source src = new DOMSource(myDocument); // myDocument is a Document or a Node</code>
+      </li>
+      <li>
+        <strong>Java Objects:</strong> Please have a look at the <link href="#examples">Embedding examples</link> which contain an example for this.
+      </li>
+    </ul>
+    <p>
+      There are a variety of upstream data manipulations possible.
+      For example, you may have a DOM and an XSL stylesheet; or you may want to
+      set variables in the stylesheet. Interface documentation and some cookbook 
+      solutions to these situations are provided in 
+      <link href="http://xml.apache.org/xalan-j/usagepatterns.html">Xalan Basic Usage Patterns</link>.
+    </p>
+  </section>
+  <section id="config-internal">
+    <title>Configuring Apache FOP Programmatically</title>
+    <p>
+      Apache FOP provides two levels on which you can customize FOP's
+      behaviour: the FopFactory and the user agent.
+    </p>
+    <section id="fop-factory">
+      <title>Customizing the FopFactory</title>
+      <p>
+        The FopFactory holds configuration data and references to objects which are reusable over
+        multiple rendering runs. It's important to instantiate it only once (except in special 
+        environments) and reuse it every time to create new FOUserAgent and Fop instances.
+      </p>
+      <p>
+        You can set all sorts of things on the FopFactory:
+      </p>
+      <ul>
+        <li>
+          <p>
+            The <strong>font base URL</strong> to use when resolving relative URLs for fonts. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.setFontBaseURL("file:///C:/Temp/fonts");]]></source>
+        </li>
+        <li>
+          <p>
+            The <strong>hyphenation base URL</strong> to use when resolving relative URLs for 
+            hyphenation patterns. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.setHyphenBaseURL("file:///C:/Temp/hyph");]]></source>
+        </li>
+        <li>
+          <p>
+            Disable <strong>strict validation</strong>. When disabled FOP is less strict about the rules 
+            established by the XSL-FO specification. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.setStrictValidation(false);]]></source>
+        </li>
+        <li>
+          <p>
+            Enable an <strong>alternative set of rules for text indents</strong> that tries to mimic the behaviour of many commercial 
+            FO implementations, that chose to break the specification in this respect. The default of this option is 
+            'false', which causes Apache FOP to behave exactly as described in the specification. To enable the 
+            alternative behaviour, call:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.setBreakIndentInheritanceOnReferenceAreaBoundary(true);]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>source resolution</strong> for the document. This is used internally to determine the pixel 
+            size for SVG images and bitmap images without resolution information. Default: 72 dpi. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.setSourceResolution(96); // =96dpi (dots/pixels per Inch)]]></source>
+        </li>
+        <li>
+          <p>
+            Manually add an <strong>ElementMapping instance</strong>. If you want to supply a special FOP extension
+            you can give the instance to the FOUserAgent. Normally, the FOP extensions can be automatically detected 
+            (see the documentation on extension for more info). Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.addElementMapping(myElementMapping); // myElementMapping is a org.apache.fop.fo.ElementMapping]]></source>
+        </li>
+        <li>
+          <p>
+            Set a <strong>URIResolver</strong> for custom URI resolution. By supplying a JAXP URIResolver you can add
+            custom URI resolution functionality to FOP. For example, you can use 
+            <link href="ext:xml.apache.org/commons/resolver">Apache XML Commons Resolver</link> to make use of XCatalogs. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[fopFactory.setURIResolver(myResolver); // myResolver is a javax.xml.transform.URIResolver]]></source>
+          <note>
+            Both the FopFactory and the FOUserAgent have a method to set a URIResolver. The URIResolver on the FopFactory
+            is primarily used to resolve URIs on factory-level (hyphenation patterns, for example) and it is always used 
+            if no other URIResolver (for example on the FOUserAgent) resolved the URI first.
+          </note>
+        </li>
+      </ul>
+    </section>
+    <section id="user-agent">
+      <title>Customizing the User Agent</title>
+      <p>
+        The user agent is the entity that allows you to interact with a single rendering run, i.e. the processing of a single 
+        document. If you wish to customize the user agent's behaviour, the first step is to create your own instance
+        of FOUserAgent using the appropriate factory method on FopFactory and pass that 
+        to the factory method that will create a new Fop instance:
+      </p>
+      <source xml:space="preserve"><![CDATA[
+  FopFactory fopFactory = FopFactory.newInstance(); // Reuse the FopFactory if possible!
+  // do the following for each new rendering run
+  FOUserAgent userAgent = fopFactory.newFOUserAgent();
+  // customize userAgent
+  Fop fop = fopFactory.newFop(MimeConstants.MIME_POSTSCRIPT, userAgent, out);]]></source>
+      <p>
+        You can do all sorts of things on the user agent:
+      </p>
+      <ul>
+        <li>
+          <p>
+            The <strong>base URL</strong> to use when resolving relative URLs. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setBaseURL("file:///C:/Temp/");]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>producer</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. The default producer is "Apache FOP". Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setProducer("MyKillerApplication");]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>creating user</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setCreator("John Doe");]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>author</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setAuthor("John Doe");]]></source>
+        </li>
+        <li>
+          <p>
+            Override the <strong>creation date and time</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setCreationDate(new Date());]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>title</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setTitle("Invoice No 138716847");]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>keywords</strong> of the document. This is metadata information that can be used for certain output formats such as PDF. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setKeywords("XML XSL-FO");]]></source>
+        </li>
+        <li>
+          <p>
+            Set the <strong>target resolution</strong> for the document. This is used to 
+            specify the output resolution for bitmap images generated by bitmap renderers 
+            (such as the TIFF renderer) and by bitmaps generated by Apache Batik for filter 
+            effects and such. Default: 72 dpi. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setTargetResolution(300); // =300dpi (dots/pixels per Inch)]]></source>
+        </li>
+        <li>
+          <p>
+            Set <strong>your own Renderer instance</strong>. If you want to supply your own renderer or 
+            configure a Renderer in a special way you can give the instance to the FOUserAgent. Normally,
+            the Renderer instance is created by FOP. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setRendererOverride(myRenderer); // myRenderer is an org.apache.fop.render.Renderer]]></source>
+        </li>
+        <li>
+          <p>
+            Set <strong>your own FOEventHandler instance</strong>. If you want to supply your own FOEventHandler or 
+            configure an FOEventHandler subclass in a special way you can give the instance to the FOUserAgent. Normally, 
+            the FOEventHandler instance is created by FOP. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setFOEventHandlerOverride(myFOEventHandler); // myFOEventHandler is an org.apache.fop.fo.FOEventHandler]]></source>
+        </li>
+        <li>
+          <p>
+            Set a <strong>URIResolver</strong> for custom URI resolution. By supplying a JAXP URIResolver you can add
+            custom URI resolution functionality to FOP. For example, you can use 
+            <link href="ext:xml.apache.org/commons/resolver">Apache XML Commons Resolver</link> to make use of XCatalogs. Example:
+          </p>
+          <source xml:space="preserve"><![CDATA[userAgent.setURIResolver(myResolver); // myResolver is a javax.xml.transform.URIResolver]]></source>
+          <note>
+            Both the FopFactory and the FOUserAgent have a method to set a URIResolver. The URIResolver on the FOUserAgent is
+            used for resolving URIs which are document-related. If it's not set or cannot resolve a URI, the URIResolver
+            from the FopFactory is used.
+          </note>
+        </li>
+      </ul>
+      <note>
+        You should not reuse an FOUserAgent instance between FOP rendering runs although you can. Especially
+        in multi-threaded environment, this is a bad idea.
+      </note>
+    </section>
+  </section>
+  <section id="config-external">
+    <title>Using a Configuration File</title>
+    <p>
+      Instead of setting the parameters manually in code as shown above you can also set 
+      many values from an XML configuration file:
+    </p>
+    <source xml:space="preserve"><![CDATA[
+import org.apache.avalon.framework.configuration.Configuration;
+import org.apache.avalon.framework.configuration.DefaultConfigurationBuilder;
+
+/*..*/
+
+DefaultConfigurationBuilder cfgBuilder = new DefaultConfigurationBuilder();
+Configuration cfg = cfgBuilder.buildFromFile(new File("C:/Temp/mycfg.xml"));
+fopFactory.setUserConfig(cfg);
+
+/* ..or.. */
+
+fopFactory.setUserConfig(new File("C:/Temp/mycfg.xml"));]]></source>
+    <p>
+      The layout of the configuration file is described on the <link href="configuration.html">Configuration page</link>.
+    </p>
+  </section>
+  <section id="hints">
+    <title>Hints</title>
+    <section id="object-reuse">
+      <title>Object reuse</title>
+      <p>
+        Fop instances shouldn't (and can't) be reused. Please recreate
+        Fop and FOUserAgent instances for each rendering run using the FopFactory.
+        This is a cheap operation as all reusable information is held in the 
+        FopFactory. That's why it's so important to reuse the FopFactory instance.
+     </p>
+    </section>
+    <section id="awt">
+      <title>AWT issues</title>
+      <p>
+        If your XSL-FO files contain SVG then Apache Batik will be used. When Batik is
+        initialised it uses certain classes in <code>java.awt</code> that
+        intialise the Java AWT classes. This means that a daemon thread
+        is created by the JVM and on Unix it will need to connect to a
+        DISPLAY.
+      </p>
+      <p>
+        The thread means that the Java application may not automatically quit
+        when finished, you will need to call <code>System.exit()</code>. These
+        issues should be fixed in the JDK 1.4.
+      </p>
+      <p>
+        If you run into trouble running FOP on a head-less server, please see the
+        <link href="graphics.html#batik">notes on Batik</link>.
+      </p>
+    </section>
+    <section id="render-info">
+      <title>Getting information on the rendering process</title>
+      <p>
+        To get the number of pages that were rendered by FOP you can call 
+        <code>Fop.getResults()</code>. This returns a <code>FormattingResults</code> object 
+        where you can look up the number of pages produced. It also gives you the 
+        page-sequences that were produced along with their id attribute and their 
+        numbers of pages. This is particularly useful if you render multiple 
+        documents (each enclosed by a page-sequence) and have to know the number of 
+        pages of each document.
+      </p>
+    </section>
+  </section>
+  <section id="performance">
+    <title>Improving performance</title>
+    <p>
+      There are several options to consider:
+    </p>
+    <ul>
+      <li>
+        Whenever possible, try to use SAX to couple the individual components involved 
+        (parser, XSL transformer, SQL datasource etc.).
+      </li>
+      <li>
+        Depending on the target OutputStream (in case of a FileOutputStream, but not 
+        for a ByteArrayOutputStream, for example) it may improve performance considerably 
+        if you buffer the OutputStream using a BufferedOutputStream: 
+        <code>out = new java.io.BufferedOutputStream(out);</code>
+        <br/>
+        Make sure you properly close the OutputStream when FOP is finished.
+      </li>
+      <li>
+        Cache the stylesheet. If you use the same stylesheet multiple times 
+        you can set up a JAXP <code>Templates</code> object and reuse it each time you do
+        the XSL transformation.  (More information can be found
+        <link class="fork" href="http://www.javaworld.com/javaworld/jw-05-2003/jw-0502-xsl.html">here</link>.)
+      </li>
+      <li>
+        Use an XSLT compiler like <link class="fork" href="http://xml.apache.org/xalan-j/xsltc_usage.html">XSLTC</link>
+        that comes with Xalan-J.
+      </li>
+      <li>
+        Fine-tune your stylesheet to make the XSLT process more efficient and to create XSL-FO that can
+        be processed by FOP more efficiently. Less is more: Try to make use of property inheritance where possible.
+      </li>
+    </ul>
+  </section>
+  <section id="multithreading">
+    <title>Multithreading FOP</title>
+    <p>
+      Apache FOP may currently not be completely thread safe.
+      The code has not been fully tested for multi-threading issues, yet.
+      If you encounter any suspicious behaviour, please notify us.
+    </p>
+    <p>
+      There is also a known issue with fonts being jumbled between threads when using 
+      the Java2D/AWT renderer (which is used by the -awt and -print output options).
+      In general, you cannot safely run multiple threads through the AWT renderer.
+    </p>
+  </section>
+<section id="examples">
+  <title>Examples</title>
+  <p>
+   The directory "{fop-dir}/examples/embedding" contains several working examples. 
+  </p>
+  <section id="ExampleFO2PDF">
+    <title>ExampleFO2PDF.java</title>
+    <p>This
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleFO2PDF.java?view=markup">
+            example</link>
+demonstrates the basic usage pattern to transform an XSL-FO
+file to PDF using FOP.
+    </p>
+    <figure src="images/EmbeddingExampleFO2PDF.png" alt="Example XSL-FO to PDF"/>
+  </section>
+  <section id="ExampleXML2FO">
+    <title>ExampleXML2FO.java</title>
+    <p>This 
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2FO.java?view=markup">
+            example</link>
+has nothing to do with FOP. It is there to show you how an XML 
+file can be converted to XSL-FO using XSLT. The JAXP API is used to do the
+transformation. Make sure you've got a JAXP-compliant XSLT processor in your 
+classpath (ex. <link href="http://xml.apache.org/xalan-j">Xalan</link>).
+    </p>
+    <figure src="images/EmbeddingExampleXML2FO.png" alt="Example XML to XSL-FO"/>
+  </section>
+  <section id="ExampleXML2PDF">
+    <title>ExampleXML2PDF.java</title>
+    <p>This 
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleXML2PDF.java?view=markup">
+        example</link>
+demonstrates how you can convert an arbitrary XML file to PDF 
+using XSLT and XSL-FO/FOP. It is a combination of the first two examples 
+above. The example uses JAXP to transform the XML file to XSL-FO and FOP to 
+transform the XSL-FO to PDF.
+    </p>
+    <figure src="images/EmbeddingExampleXML2PDF.png" alt="Example XML to PDF (via XSL-FO)"/>
+    <p>
+The output (XSL-FO) from the XSL transformation is piped through to FOP using 
+SAX events. This is the most efficient way to do this because the 
+intermediate result doesn't have to be saved somewhere. Often, novice users 
+save the intermediate result in a file, a byte array or a DOM tree. We 
+strongly discourage you to do this if it isn't absolutely necessary. The 
+performance is significantly higher with SAX.
+    </p>
+  </section>
+  <section id="ExampleObj2XML">
+    <title>ExampleObj2XML.java</title>
+    <p>This 
+    <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2XML.java?view=markup">
+        example</link>
+is a preparatory example for the next one. It's an example that 
+shows how an arbitrary Java object can be converted to XML. It's an often 
+needed task to do this. Often people create a DOM tree from a Java object and 
+use that. This is pretty straightforward. The example here, however, shows how
+to do this using SAX, which will probably be faster and not even more 
+complicated once you know how this works.
+    </p>
+    <figure src="images/EmbeddingExampleObj2XML.png" alt="Example Java object to XML"/>
+    <p>
+For this example we've created two classes: ProjectTeam and ProjectMember 
+(found in xml-fop/examples/embedding/java/embedding/model). They represent 
+the same data structure found in 
+xml-fop/examples/embedding/xml/xml/projectteam.xml. We want to serialize to XML a 
+project team with several members which exist as Java objects. 
+Therefore we created the two classes: ProjectTeamInputSource and 
+ProjectTeamXMLReader (in the same place as ProjectTeam above).
+    </p>
+    <p>
+The XMLReader implementation (regard it as a special kind of XML parser) is 
+responsible for creating SAX events from the Java object. The InputSource 
+class is only used to hold the ProjectTeam object to be used.
+    </p>
+    <p>
+Have a look at the source of ExampleObj2XML.java to find out how this is 
+used. For more detailed information see other resources on JAXP (ex. 
+<link class="fork" href="http://java.sun.com/xml/jaxp/dist/1.1/docs/tutorial/xslt/3_generate.html">An older JAXP tutorial</link>).
+    </p>
+  </section>
+  <section id="ExampleObj2PDF">
+    <title>ExampleObj2PDF.java</title>
+    <p>This 
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleObj2PDF.java?view=markup">
+            example</link>
+combines the previous and the third to demonstrate 
+how you can transform a Java object to a PDF directly in one smooth run
+by generating SAX events from the Java object that get fed to an XSL 
+transformation. The result of the transformation is then converted to PDF 
+using FOP as before.
+    </p>
+    <figure src="images/EmbeddingExampleObj2PDF.png" alt="Example Java object to PDF (via XML and XSL-FO)"/>
+  </section>
+  <section id="ExampleDOM2PDF">
+    <title>ExampleDOM2PDF.java</title>
+    <p>This 
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleDOM2PDF.java?view=markup">
+            example</link>
+has FOP use a DOMSource instead of a StreamSource in order to 
+use a DOM tree as input for an XSL transformation.
+    </p>
+  </section>
+  <section id="ExampleSVG2PDF">
+    <title>ExampleSVG2PDF.java (PDF Transcoder example)</title>
+    <p>This 
+        <link href="http://svn.apache.org/viewcvs.cgi/xmlgraphics/fop/trunk/examples/embedding/java/embedding/ExampleSVG2PDF.java?view=markup">
+            example</link>
+shows the usage of the PDF Transcoder, a sub-application within FOP.  
+It is used to generate a PDF document from an SVG file.
+    </p>
+  </section>
+  <section id="example-notes">
+    <title>Final notes</title>
+    <p>
+These examples should give you an idea of what's possible. It should be easy 
+to adjust these examples to your needs. Also, if you have other examples that you
+think should be added here, please let us know via either the fop-users or fop-dev
+mailing lists.  Finally, for more help please send your questions to the fop-users
+mailing list.
+    </p>
+  </section>
+</section>
+  </body>
+</document>
\ No newline at end of file

Propchange: xmlgraphics/site/deploy/fop/trunk/embedding.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/site/deploy/fop/trunk/embedding.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: xmlgraphics/site/deploy/fop/trunk/extensions.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/extensions.html?rev=569118&r1=569117&r2=569118&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/extensions.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/extensions.html Thu Aug 23 12:00:37 2007
@@ -58,10 +58,10 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../0.20.5/index.html">Version 0.20.5</a>
+<a class="base-not-selected" href="../0.93/index.html">Version 0.93</a>
 </li>
 <li>
-<a class="base-not-selected" href="../0.93/index.html">Version 0.93</a>
+<a class="base-not-selected" href="../0.94/index.html">Version 0.94</a>
 </li>
 <li class="current">
 <a class="base-selected" href="../trunk/index.html">FOP Trunk</a>
@@ -178,10 +178,20 @@
     |start content
     +-->
 <div id="content">
+<div title="raw XML" class="xmllink">
+<a class="dida" href="extensions.xml"><img alt="XML - icon" src="../skin/images/xmldoc.gif" class="skin"><br>
+        XML</a>
+</div>
 <div title="Portable Document Format" class="pdflink">
 <a class="dida" href="extensions.pdf"><img alt="PDF -icon" src="../skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
 </div>
+<div class="trail">
+<text>Font size:</text> 
+	          &nbsp;<input value="Reset" class="resetfont" title="Reset text" onclick="ndeSetTextSize('reset'); return false;" type="button">      
+	          &nbsp;<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
+	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
+</div>
 <h1>Standard FOP Extensions</h1>
 <div id="minitoc-area">
 <ul class="minitoc">
@@ -226,7 +236,7 @@
     
 <div class="note">
 <div class="label">Note</div>
-<div class="content">All extensions required the correct use of an appropriate namespace in your input document.</div>
+<div class="content">All extensions require the correct use of an appropriate namespace in your input document.</div>
 </div>
     
 <a name="N1001E"></a><a name="svg"></a>
@@ -249,27 +259,20 @@
         </p>
 <pre class="code">&lt;fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
                xmlns:fox="http://xmlgraphics.apache.org/fop/extensions"&gt;</pre>
-<div class="note">
-<div class="label">Note</div>
-<div class="content">
-          Currently, no extension elements are implemented in FOP Trunk which use the 
-          FOP extension namespace.
-        </div>
-</div>
-<a name="N10046"></a><a name="bookmarks"></a>
+<a name="N10043"></a><a name="bookmarks"></a>
 <h3 class="underlined_5">PDF Bookmarks</h3>
 <p>
           In previous versions of Apache FOP there was a <span class="codefrag">fox:outline</span> element
           which was used to create outlines in PDF files. The redesigned code makes use
-          of the new <a href="http://www.w3.org/TR/xsl11/#fo_bookmark-tree">bookmark feature defined in the latest XSL 1.1 working draft</a>.
+          of the new <a class="external" href="http://www.w3.org/TR/xsl11/#fo_bookmark-tree">bookmark feature defined in the latest XSL 1.1 working draft</a>.
         </p>
-<a name="N10057"></a><a name="named-destinations"></a>
+<a name="N10054"></a><a name="named-destinations"></a>
 <h3 class="underlined_5">Anchors or Named Destinations</h3>
 <p>This extension element hasn't been reimplemented for the redesigned code, yet.</p>
-<a name="N10063"></a><a name="table-continue-label"></a>
+<a name="N10060"></a><a name="table-continue-label"></a>
 <h3 class="underlined_5">Table Continuation Label</h3>
 <p>This extension element hasn't been reimplemented for the redesigned code, yet.</p>
-<a name="N1006F"></a><a name="widow-orphan-content-limit"></a>
+<a name="N1006C"></a><a name="widow-orphan-content-limit"></a>
 <h3 class="underlined_5">fox:orphan-content-limit and fox:widow-content-limit</h3>
 <p>
           The two proprietary extension properties, fox:orphan-content-limit and

Modified: xmlgraphics/site/deploy/fop/trunk/extensions.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/extensions.pdf?rev=569118&r1=569117&r2=569118&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/extensions.pdf (original)
+++ xmlgraphics/site/deploy/fop/trunk/extensions.pdf Thu Aug 23 12:00:37 2007
@@ -5,10 +5,10 @@
 /Producer (FOP 0.20.5) >>
 endobj
 5 0 obj
-<< /Length 696 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 691 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!#Z_/c#!&A@ZM3ojZj/>SO6Z>X^rGG`i'P(r4tdt<TjRu*,0TT/jCQ,#]<dkU*/-8$:b_W,@fY-b6D&qi&qJ7F1oAO,#q%1$,@'G5[j'SCfMEIq==;6iVt#EP.m(TLRGd0O2q^CFk"pYNF9=#qujPF"Z/%4*+_";F^H-9,HLP%#nd_g:uYs308:'2QS-J-9dt[>Zi7r(i7``=\"H`^J'1gANRmXFXONEGBO[AE>rgLlu73l1bF?nMkFMBGZ%?B+-0Ga"Qn:W1F@r2ch"ibhU1b!.)'%0occbTN?IF4M139mOj5%LVl/AXjC8OH21r_$UV+COcRg7T+Z^o&cS!Jl>ie#I<!Y02.qn^G_Klb/\"f/0("Y`0)ki^jqBs:k%UlRVp"2Xq*O(BkF4sCdoJKp=5Lc#kNU\7AZ+)nId@if_OEKqXKl)2DmCbi2Z#UO.i;[N++k(&UtWPh'fO6be2mQ_O(tgVDn%"HSd3XG+@61])ZYu6k$cXZJ.@$Bp(LBkeg_a^g<4/nD6qBc[r'S5%fVtMbk!:[++iP*=hEa%eD;OgpU[3Q/X"gN&\I/j3\%rg:nc8lGR127-ie*h#aQ$Cd5_L5!s]pS[a#n:I++V76E<_&:'L5rIXH"5iEDkD(i&MCG-J)Q$7,$$K8+h\<P(g>m^JZcTm#`Q/[;=$YUNW3dd0<(n2C@`eCX~>
+Gb!#Z9lHLT(r#SlI-;_6`;#OWgmYX=1ehbtU0Xc>*+Ata^^SkarVP90@Y1U*e"gSp^kRWbIbmjR,0*te5Sum38fV@_Z%Kj3_#W^="/"e$*^c$8!Jkdc1jNn*Ynkl9$>.3eo[h4UmbU]VGE"0=9GR47HjA%H]`88(F:0(mnc2#sY`ADAX8J6Nhr^5^HQbl&cEDO`+(4dXUPGO5]oFf[X0"3CF!GIp&j)+RTf:ZW*HH\X+^\XP3V?hEGBA'8*m"`1#lOJbitSjn_>iY4m0K]%(mpDKg2RDs]c;&jqZ+:AZ\BM*_hH@/2heZd<r[18Tp]tT+b,afO#\:,%f$/)Mo]I8MHF1iZr,(]-^pR!RKXVbX$5\>:A#0JJ$ZMB?RYT;MsC+YIQ)U>rn79_*f%7,:/<A^i3/%u<E22\23f2O?s)1JNNAVN&C%iJ`8>m5H$oi@OI`hr!'dKl+*<4]MP%"Gqt@?uamD/ZKZSMV3s0`j(k;atk!=IM!!@VCG&pZKW@2BUp+kB7H.H*j\o$/XJ\P`2oeK#:K5h;]m6gk1L2S="8))JH(5[0/pa1A_7n&MY:e?a.&'i$3"\<PJ"9[X>4u`i[8dmhXI@],*I+OnK8r?(J:'I]UG'pEm@4FbpL3@c(441/li#pCg7lpLRC!+!PmdfbB&nRNN2&%VQ<7Su_<9[S?IfL;(eCj~>
 endstream
 endobj
 6 0 obj
@@ -126,10 +126,10 @@
 >>
 endobj
 24 0 obj
-<< /Length 2537 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2461 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm>D/\/e&H88.+lpg)?tI7m;.?a=B\0-6cu%TJ$jDB6:i&0.,"nLQa2u*R;/\S>P+s@<d+G(<n&N%qkIb#h?!IOSA]4<YlSIG14enSZ5L^(cRLC$q^@2nBn"4OU4auS-@=\sThk'.h8nV^uBBS1,eUt=![lVh$;k,#j<F!N:WS5:UI9L*[)oQZ]`_4"NcUijoB`,\aNu3?Am1YYQ0DA\A<E%>0d_=%Jpu#Ltna!t:>S5Ao,[RS[?'\TrS&YiK^0H/6F7k<:/ups9`Pm_e-1'SbI%OrYaFi-Qb>"KQjjl&do)`pgmritR3TPV$8eeJ05<c]fO-n*9@D031.5IjEO`i89K!gW>4nrU2bAj3\DXO9lhs4`PPfoV(-L51[='u[Ze_C[kheBg?[+6&6R=U'11fi,R3m!]PIYB^&P%s$%(ASgL4i&N&=8<VJ=N5'4Jfimj8NQ8+a*^*dEhFh;3g5%r3s8[7E\eqtp`T8OZV.jP*i34maMuoF:>)I)/oa:e*lPWJnAF8P^GAt"U54(Y@?cKZ??mqfk]qZ+oZjt06o"eoqfT0tH6V98E7V4g5S+*mGOVc]r]GP:R-%K*HG)s'?f]c3qHg)q:)E"NZP=I[@hb0*'qE0@%[[I736efdb`X0f51gFm1i"McBFqo-X<@sZb'a?'T!ZX<,-*oJ[p:3:k19,l>DZiL8.e&`o8HZ?>,TB]Z;FenS..dp^HhtsrJ#oee17nMK+/o8H:1Kd5EN%?-B465Q&JO>;c28+SO"2KG+/3c.eK[s+9RLkfB=^e_HP:aSlbd:9cGB$ZsNK!>ONRc>OOFqFRBefRd%N*"[WjY=qNTeo0)Rog.(=]F=_/2<^k'-8sq(4J>s<INUu#(l06Jmkl:@5dhJ?B\BKjt02W89j._F3["HDB]-?,I8R14T*,fu1".1t&J))S=J6?1XlqUEK4JGIignQ8F6"`;Ki90t*O)>FrD0:X[$\_.j#&2Otd_pnfT,KH
 2rE17++eq)lg?@IJC3'/\ZX5,3pG5DYg5eP*@uZ;'$>lnjXbK:K,uR.&#SiI78g&i*L)-B4c?cWajWgCid`PS,BGI)fC(AG.A]XpW/(c_uZF?YT7(.1T=<k\FRa2+PGU"+32K*YqbZ;:V$s#Q[cN:OR`>X2a@'jG$ImE2neP]X;5S[f#;k3`05PH&SO`I`ICuf(aq@SRok\S28p30^s?I(=_I&8qn!tq-2MlVAI]:D9U'VBGkGm"Tcq=3iqR:l8U8J&)oa5]0\VfA\X/lk_5G&$dI3e'+R=atXL?7-9)hhul6Z#dh&A`&V`N&\O1E:@,b3F_WXkhZ_CWXOn<O=Ko8CQFQ<M?=5Q,,oZAfMpDho&AY;S!"V5D`#RogP^3g]?nH:1`"hr.S-fF:NI$a0g(!IlF1.k'fj!pl;X8$1&s=2a8>r.2l&Pm'eZj^GOiX8aghZXK%d;+,]l,.6Jr6P/-(`aW_rSIFai"Y$J<:1$;SdebB<gEH0`GeiBRmcp)m@-?$s3^FE*Q^E9TJ,G_F5.5?%q\>Q,YPLRoNfg_TEtP:XoAi10i>67gAq8:7,&NM^"XYJeoFQ\=nl!pW_6-P861'k*5N4\4CCnk;a%J;JM'W.$(5X`m;4[BQ+9I9hOmj1q;]!/n05I7-LTb==&Wd32"+h&Z<-GKklAq34hM(WASM6SfN<0Uk'S_-o*nA7'9r?o$<?=V)/dd&q(mB_(ut'cK-qq;!q]mTpQq(tLg4F#u>pOILDT<(8mGIksiVBFi<?RF="]PC/DmH*<,l\&KHZD-b1/@SjU6^dD?fNGu20RFA&6U1,FBOC%)H.SV[HU431l,BQ3(k2p2@3GRrPJb43M@l,C2A\K_&Et<(eSA7$XnuS$SQPc;R4]JV,RG;CVRq9=N?P:;$\st_qP8GXqL\[](BEV!90GbXZ16XZ,`@0:j4RXb2\QUB;[)ZjoC9Ao<3r;^P2MYl)Z4$`n1G1%Xp'12Cet@2D5MM
 bVXaEkf,FSBO;,Pgp9M03%!i'(CN<?t#B?].HW@J6"6\dfNGm6p."0c>*\T,q/``PQC:GREm3Y5f^nrn+WYiGnPHsU&/Tf(r4Af,n4(@gCgLgaD]"<F*m73"fDKn<B,?SVGnP)Npo9(EsVb%7O8]WcL"eeA,VoBgM9(qJY&;/nU4iJj:=8l',;TnL_"AKV3\6R.#I/HZKudS+DNV[pKf['gtFii`7fG-4!2/0d8:.=;WK@)+NSF0hdhl02#M0&h"22HK-Gg9".;;]5jnWi1QI*!(l)flE8m(oX,7SJa=//FadAE0AcC^=NLk<'kflHnKZ?P*410T0#%;KL\!4]<A.&?QMnu:!e+5ELD6-So;!]0_--qXZ5@dC(=31\#2`ULAMBs@051/"G;r%?3gS0*JCq?s2;`-#t$LsANdWmT-n6Gi8VaPd,3e[f6A+;4E,1jFJsujH@\TAKAmMd;j-995U;L941b;Kj9)2FJ28/4T-,a!?r230C9_[oec)OVo?&[BJ,7R*[s*_l\[L4Ci=%J17Y/[9.&=c&f@5o$qWNF-/(bs~>
+Gb!;f>Ar7c(4Q"]+T0Y?d#9tdEf=jdA.o2RAD?J)=9MauJX/b@&W0OZb&[L[T&K>N7EUh4023!^*6l$Ak;MK3oB,K#l:(uBOYF<">_Kr2"V!fn97t<g.ERAQ7<#^DrqGHB07O@90c@k)O-f".2L1Q'q;kE4lHtQ_G:(GPV^+dNl_I:qVg=i^j3n?6h'7CG/6SD6pmgK6Ku%-_%uB2BIsjSFMq)6Knp3lR>)f0G!l"FS\GPI-,[;#1Rj;.?92ehmYPTs\H@<C'nET01n[YZ`I%?L;1+luCDj/3uIm=dfVHn&&4KWeed\\E)kJMaUPdNkBpo?a\](u<"MgYd^;hPU!mkY*F/s(6lA:fe4l3#[Mai[1h->"=3?Tae*bKJGmXO9hS8nu.0Ai1)F$%'qc0^WP3e&]>A[g"AJBV":dm'+L!O(l:M/;rj'NaCY-*9pu<(fj4o+m1568X_58qb(prKe,)-E=_lsNC/4RXgT9W`/-HUCg8Gpp*fir@m85q29J*=8VK<Bbf&*B^isu=IpTpZN+3WVKM`X:prt$0U*06Wqr!'A72-Dc5&?,,/eF0Z_:c&U!C893i#(6Ur;5Kuh(lb9+W*m6njQT-CE?2NlqLX]i2tp:*NPhoYFlD)2.7t%ELpkTCa;HbhMj/]KJf$-22Js_es$=ljWT1\c_;=,&ZUo66Q\koE#X%rXi(5M;FCe?!\;h#DF.iFfda+@bfYaZ:XB)j^7q8G%8%;hA)QrP:T,`?"4GHcUp7A(M@lj-.S;e-*jh*8o>F]h;*`%-1SDg6XhIC?elhFMU,LV@fOt;g%JnthZejs;BY@H-hL'pnT%7[O+;EcT$JCU=>Mtua>GYQP3Nq,E.R*7"[.U_XY"CM#)Xhg7SNiN7oB.8KVmUM,1!A"Hck1T>2&-pAV]FO\b@4hU8W?O*A7qo*FBS4UY?U'8>ulH&p.<cPNp'sX+&S79fjgqYpUU7kHT-W;XuO@W7Dd%QK;e#:C#M]
 (:9>?mr0^N8:iR.ESTAa4[3>L_h(Q.Nq\^[gmDhAqK1<d[Ks&q<e9OLe,tc+,Lbqs9.NjFM6OVdpRLNMaasT)3Vj4<9eLEb`Pn2'jA]^USf!&qHjaa0T6s09kC`:0YP0X8HGp=6*CYfdcak!>D(9Dg?Scrr.R^N&1_9L:#q&N)n(CP3`%b6O6LH#h7I\nubgl6?iaQG730o<I)1#f;5D6+U.#;!7>l!@4YjB5_m9>\a:.O*XuGBjVjMtlOQ].3AA#UFB@:\4"EX4"LU3b+FRO.F^I\LF+&c^*I:Bf>2h1A>(Z^t>'YERf7Y=qIT1!sc_4]ch"N7!C7CX"kNp7&i']en'q,nH4se;,k(ED!QCsI<G4ib=D]I[tYUY_ptX:?^YUHc1tC<%1tMWBr@%1i"BL7fRaQ4(3h;dRB`#gdc*M0$RLIE7!W;N>Vt$e`@lu`k9>K^F9l's3HBaQUXfgR/>*r=FK=ui2oTp;.<Hn;;_VB]?#PUm00:[*O%46ON<Q<4qWcPsLT?o=KTYkH@M,UYr_OjSmJ-G2Sd'ABnk^\1D7Za5STFT7/t-hbKu</V($uA9/t3s?hOsb-UA2Aob0M_D2OTS]f#kJ50[5Cj[tEG":N9f^Jp$j;c(0N:9T'"Q)il[E\s3D2n*A!5$^IQ3mjF,ejWs)"f'uR&"!1qm_8k0HU!D*AS4P:B]f(!>]@9)L5\t6QPWCc?Ab.q(TZu];DcI^R5OB.i.(W13CspO,\8F@LD:YRV+*+I,W`\;nbN-!Lp%Bf:\N0ND#geA],lk%iOhD:0W*0/uD%5@CF0OSNQTtIq3I:%\W'@&D&&[%.-ppOLY*Kn7=9c&396[B!%Af%28KkjB<t->;j1'GB'\h"h:p'+6iV79,`4&6[`.1sgiFg)T0Q\-36O$n%]:?nrOpt5cs*GbfL_\(Y$2%`J?&%.X)^F$diiC'I5&l>P?>#(N1R,2Ik&VrhM(^V4CK:<JP8BBl`Tf6gIFr
 7hSYf`=kc"b#cq=(#E.h>ei]DSI0S%8"e6XO-Z2k.Ue/O,m"f0!Aq->[Z#.m>X*C$%N,M<(W=HoGI(I#Q0*(a2:4=Ag;Tl_/AG"-rsaZq^!h(m[5Es$g9E7daRlSBDg,S&kKcfD#LGb)%H7>]bOF;82]>1=P)KksKTk$m:<4&L@J.CaRL$Gjd'mClY$'ZOW7UAd"eI`"2;<p-9NgEor""+%[?-HE5f]%a\>fO3"<9't)STjdPNWLn=7/W$0c]jh4`p"\/2s!V9<cO\j6:quiM\Mr1L\ro\TM>)u5Kb0RHWu]<Uldk&Kl:;]/6sr\T5]4GH"VWYbXD@BE]6E8#8JKkT3]7C0_t1`^)HaMW'/X-[m&USk8ijHPFK1,0OQJ8.i+.Z@_7G&1KL@SKUS#^Q)B]kBY#(WkENoL/h0d^H,uNIMV\s1!j$NWm"kq;_W7O3lW1Ea?6):G]g1Z9e3k[(IR`e2?r?#^XI#\~>
 endstream
 endobj
 25 0 obj
@@ -176,7 +176,7 @@
 29 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 417.264 226.486 502.236 214.486 ]
+/Rect [ 417.264 274.096 502.236 262.096 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.w3.org/TR/xsl11/#fo_bookmark-tree)
@@ -187,7 +187,7 @@
 30 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 72.0 213.286 278.64 201.286 ]
+/Rect [ 72.0 260.896 278.64 248.896 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
 /A << /URI (http://www.w3.org/TR/xsl11/#fo_bookmark-tree)
@@ -218,10 +218,10 @@
 >>
 endobj
 33 0 obj
-<< /Length 1180 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 1041 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gatm:9lJcG&A@sB&@p:n`3cI]"mDZI2T6F>1i7YDD"^-IPXInd[1lmos*i"S$k?RRblU<FgV_A3B''Qcm:u?D2>_U;8.GS@Am%Y,P,9[U`b>pTM_I\8&Z!>N;U.JPhQCJ6]8Ws"k#U"`3:714O-*jh*79@lA@3_5cU/W"CH*LE?tR.4ALj;H:+IjFNa&KJ)uYteU:hoROO_AP=[7&JZBW.K)J1^O(L[n36;1*+:O`+)7P5:gO0]LhKI2Ms"SF19Z!/8))LBU@_SUl7c^JE%8D(_(e]?SZ&l2Q,hW$"fYnbEmJVNpa's^IUcuLAl[MuZ2N>o%-EJA<5hQRU*X;,'Tef/Vhb\(AKk[b`/O&V9TPU49tPR5<Q5M^)'2-_`a&4SpnB]W8=$=%HGja4Pcqt&@Q/Bg[d:fbLf%<I\$1j-tZn5!C(k9LLM=QHA>,G3`(G"-+dB;Dce4T@)I%dSeQ;Y2o_g:'#9F+*g<V!/1L2[KDca2qd&(W\b7^PN>tf(*Ie6dTq/k%&BHAZOFDr<;Q]:_A#<=+?n1E%k;uL;;,qE9:K\``ZNKDuc+[K<$@^'1F`BH,dIAUHN>Z3>O4KdS!SM,Y%7#*ElqHM$c?5Rm<.VM1Y0[GV,#trk_e3Z>D6\`=TKU&V9.i`X=H?">'i$HTUK)0E<ticLZ_IQRF(4Ff>Mh$]O%AF<:!V5ggPJPi*O'.`,nN)05)dZIeKhH9k@bcC0/+f?!;?Z'LZ)qVh8W56Mj`OhCIr+$BXiU6\D;m^SsG9:C=>T(_Ni_Z^h1_o9dXSVn3'Vb"frlq63(qCj=qrr3Wj0+F_/W(ZU,o?)hh/X#j2M88Rs<J`Ta)4IVum2:c@'be6$k%Z:1RcO2Ihtk8%ch?a%9D.VOaK>9_rIj#pCp-ZAl<T>#s&d4\J9(@`D'q??RB(XHrqg$s0,*ooSG2u"lXf]saeBBQDLa:b]##>/P4qa&hb0/MltSkMe+gNk4G0Q'Kk"'QeO$L
 N3BB%@BT],7RGWG(p[%XPGJ!VG'ketT#;Qj=QAh@;F9fk+UH8&[C_?kA.*k?kpJB2Lq]`t/"[`q)N=YYE$#6od-p6:Ma1u<R47@[64!&JD11*EE)3ludPgAdlRuX\-$lSCVAM625k^:iA3P`nGnbgD\mWQ-gg:"EJ*>HVeo&E#8RsJ6%DWr/5+.3B1C]~>
+Gatm:?#SFN'Rf.G=FDWhMM[lWK!^;6/(O@!DW>:HHSEqU<YIQ9bb4ub-3<q2L:*3l"Mq?aIEq@G2tqJZ\=4"X%1"HMpO83%*2"QKlu/+^m-f`u)('?Z1e5a*Qbi':0V5+sKQ_7)%taMc^jZRSSrH(,&W5]cqD"d*``HhAj1rqKF1%Je?*BY9XctYIRSbL`@GD2:+8t;*nYimoX+-l>V[dj"-\S9%ZIac,OhG?`M[2Y\5j'N0hP12!0ZI7[*gt#-"tY+3#m20XjhtnqGd>8DcqY?`&sD5s-ClFR20TbZ<k1Mu<NQE`9L$.YHtSj+6:lYIf1,8lqL<:-I1Y"c+,"lZK[2K*^M,Z`B`JrH=d6ZE;b4N2cY<QTW>s-=`f-4[>!4`UYT(#%Gm!X&,C%uJG(VZ)&D0P[2r"bHG,'pdGQ?1U:?n1g`*%VSUGC]OO%N^[Jm0Qr09AZE![?$,gFqb'b/\QOhJ]R58G;IMZ[r:u^-eu+;3pC<63n<Q![*qkp5YJ*Jd-g<NTh029lY7hcSL1$0X0]$\r[oo"iToKCCb^,D:3.6g9[Al&PNSRO?k=^N@Hm,3s8^%XP'bq$4NDmY=.eKhf%DI6P<f7m)AgDoF/+fKojaFNk;\YkNTrc^TqL)F(i#$fui<n"V,(V,\,h+i/.=R.-LSZ3B&T#KX@X0%'3-/q,"@"p-'o;i5g28o+gm8R*4%PKLEF@&+;2p[F7=ibO5Z'\mn`Go'*3OqY`kHf"?'R$)YAH!-tP%-"-as'8(ifB:&M,d)1]0Y3MSApX8hT1\,"rRV#KD)80B4>'!QB/Qka4!bU68hQKto[jG>&F$-42Jtj-#nC52;$-bNRhi'^7VHZo7%Em1QU>bJ1K/^M+^:,&b?a8ud)it1O:?+\h&Qo)%qhY1&8!%$g=bJ0e!Q0PlkMCY2?pK=H$*fJNm<`<hU!\tipR4L9c/AXE50V_GHQ^4k/O'L'F>oN3mf-#+<aCH%j-I!;*g@;
 -9]A4j8U=&AA*W<']W91AZe?2:#.$3!<k9.2WZF6QrW'TbOAu~>
 endstream
 endobj
 34 0 obj
@@ -319,8 +319,8 @@
 46 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
 47 0 obj
@@ -333,22 +333,22 @@
 48 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
 49 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
 50 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
 51 0 obj
@@ -372,7 +372,7 @@
 endobj
 3 0 obj
 << 
-/Font << /F3 46 0 R /F5 47 0 R /F1 48 0 R /F9 49 0 R /F2 50 0 R /F7 51 0 R >> 
+/Font << /F1 46 0 R /F5 47 0 R /F3 48 0 R /F2 49 0 R /F9 50 0 R /F7 51 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
@@ -396,25 +396,25 @@
 15 0 obj
 <<
 /S /GoTo
-/D [25 0 R /XYZ 67.0 273.439 null]
+/D [25 0 R /XYZ 67.0 321.049 null]
 >>
 endobj
 17 0 obj
 <<
 /S /GoTo
-/D [25 0 R /XYZ 67.0 190.286 null]
+/D [25 0 R /XYZ 67.0 237.896 null]
 >>
 endobj
 19 0 obj
 <<
 /S /GoTo
-/D [34 0 R /XYZ 67.0 659.0 null]
+/D [25 0 R /XYZ 67.0 181.143 null]
 >>
 endobj
 21 0 obj
 <<
 /S /GoTo
-/D [34 0 R /XYZ 67.0 602.247 null]
+/D [34 0 R /XYZ 67.0 659.0 null]
 >>
 endobj
 38 0 obj
@@ -425,57 +425,57 @@
 xref
 0 52
 0000000000 65535 f 
-0000010368 00000 n 
-0000010440 00000 n 
-0000010532 00000 n 
+0000010148 00000 n 
+0000010220 00000 n 
+0000010312 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
-0000000858 00000 n 
-0000000978 00000 n 
-0000001059 00000 n 
-0000010666 00000 n 
-0000001191 00000 n 
-0000010730 00000 n 
-0000001327 00000 n 
-0000010796 00000 n 
-0000001463 00000 n 
-0000010862 00000 n 
-0000001598 00000 n 
-0000010928 00000 n 
-0000001734 00000 n 
-0000010994 00000 n 
-0000001870 00000 n 
-0000011058 00000 n 
-0000002005 00000 n 
-0000002187 00000 n 
-0000002373 00000 n 
-0000005003 00000 n 
-0000005126 00000 n 
-0000005188 00000 n 
-0000005359 00000 n 
-0000005530 00000 n 
-0000005728 00000 n 
-0000005922 00000 n 
-0000006104 00000 n 
-0000006290 00000 n 
-0000007563 00000 n 
-0000007686 00000 n 
-0000007720 00000 n 
-0000007902 00000 n 
-0000011124 00000 n 
-0000008088 00000 n 
-0000008197 00000 n 
-0000008406 00000 n 
-0000008562 00000 n 
-0000008755 00000 n 
-0000009042 00000 n 
-0000009300 00000 n 
-0000009706 00000 n 
-0000009819 00000 n 
-0000009929 00000 n 
-0000010037 00000 n 
-0000010143 00000 n 
-0000010259 00000 n 
+0000000853 00000 n 
+0000000973 00000 n 
+0000001054 00000 n 
+0000010446 00000 n 
+0000001186 00000 n 
+0000010510 00000 n 
+0000001322 00000 n 
+0000010576 00000 n 
+0000001458 00000 n 
+0000010642 00000 n 
+0000001593 00000 n 
+0000010708 00000 n 
+0000001729 00000 n 
+0000010774 00000 n 
+0000001865 00000 n 
+0000010840 00000 n 
+0000002000 00000 n 
+0000002182 00000 n 
+0000002368 00000 n 
+0000004922 00000 n 
+0000005045 00000 n 
+0000005107 00000 n 
+0000005278 00000 n 
+0000005449 00000 n 
+0000005647 00000 n 
+0000005841 00000 n 
+0000006023 00000 n 
+0000006209 00000 n 
+0000007343 00000 n 
+0000007466 00000 n 
+0000007500 00000 n 
+0000007682 00000 n 
+0000010904 00000 n 
+0000007868 00000 n 
+0000007977 00000 n 
+0000008186 00000 n 
+0000008342 00000 n 
+0000008535 00000 n 
+0000008822 00000 n 
+0000009080 00000 n 
+0000009486 00000 n 
+0000009594 00000 n 
+0000009704 00000 n 
+0000009817 00000 n 
+0000009933 00000 n 
+0000010039 00000 n 
 trailer
 <<
 /Size 52
@@ -483,5 +483,5 @@
 /Info 4 0 R
 >>
 startxref
-11175
+10955
 %%EOF

Added: xmlgraphics/site/deploy/fop/trunk/extensions.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/extensions.xml?rev=569118&view=auto
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/extensions.xml (added)
+++ xmlgraphics/site/deploy/fop/trunk/extensions.xml Thu Aug 23 12:00:37 2007
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="ISO-8859-1"?><!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--><!-- $Id$ --><!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "document-v13.dtd">
+<document>
+  <header>
+    <title>Standard FOP Extensions</title>
+    <version>$Revision: 569104 $</version>
+  </header>
+  <body>
+    <p>
+      By "extension", we mean any data that can be placed in the input XML document that 
+      is not addressed by the XSL-FO standard.
+      By having a mechanism for supporting extensions, FOP is able to add features that 
+      are not covered in the specification.
+    </p>
+    <p>
+      The extensions documented here are included with FOP, and are automatically available 
+      to you. If you wish to add an extension of your own to FOP, please see the 
+      <link href="../dev/extensions.html">Developers' Extension Page</link>.
+    </p>
+    <note>All extensions require the correct use of an appropriate namespace in your input document.</note>
+    <section id="svg">
+      <title>SVG</title>
+      <p>
+        Please see the <link href="graphics.html#svg">SVG documentation</link> for more details.
+      </p>
+    </section>
+    <section id="fo-extensions">
+      <title>FO Extensions</title>
+      <section id="fox-namespace">
+        <title>Namespace</title>
+        <p>
+          By convention, FO extensions in FOP use the "fox" namespace prefix.
+          To use any of the FO extensions, add a namespace entry for 
+          <code>http://xml.apache.org/fop/extensions</code> to the root element:
+        </p>
+        <source xml:space="preserve"><![CDATA[<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+               xmlns:fox="http://xmlgraphics.apache.org/fop/extensions">]]></source>
+      </section>
+      <section id="bookmarks">
+        <title>PDF Bookmarks</title>
+        <p>
+          In previous versions of Apache FOP there was a <code>fox:outline</code> element
+          which was used to create outlines in PDF files. The redesigned code makes use
+          of the new <link href="http://www.w3.org/TR/xsl11/#fo_bookmark-tree">bookmark feature defined in the latest XSL 1.1 working draft</link>.
+        </p>
+      </section>
+      <section id="named-destinations">
+        <title>Anchors or Named Destinations</title>
+        <p>This extension element hasn't been reimplemented for the redesigned code, yet.</p>
+        <!--p>Use the fox:destination element to define "named destinations" inside a PDF document.
+These are useful as fragment identifiers, e.g. "http://server/document.pdf#anchor-name".
+fox:destination elements can be placed almost anywhere in the fo document, including a child of
+root, a block-level element, or an inline-level element.
+For the destination to actually work, it must correspond to an "id" attribute on some fo element
+within the document. In other words, the "id" attribute actually creates the "view" within the
+PDF document. The fox:destination simply gives that view an independent name.
+</p>
+        <source><![CDATA[<fox:destination internal-destination="table-of-contents"/>
+...
+<fo:block id="table-of-contents">Table of Contents</fo:block>]]></source>
+        <warning>It is possible that in some future release of FOP, <em>all </em>elements with
+"id" attributes will generate named-destinations, which will eliminate the need for
+fox:destination.</warning-->
+      </section>
+      <section id="table-continue-label">
+        <title>Table Continuation Label</title>
+        <p>This extension element hasn't been reimplemented for the redesigned code, yet.</p>
+        <!--p>Use the fox:continued-label element to create content in table-header and
+table-footer cells that will appear only on pages after the first page that the table
+appears. fox:continued-label is itself inline content, and is a container of fo:inline
+content. This content will be laid out only if the table does not fit on a single page and flows
+to following pages. Here is an example of FO code creating such a table-header:</p>
+<source><![CDATA[<fo:table-header>
+  <fo:table-row>
+    <fo:table-cell>
+      <fo:block>Header column 1 with continued label
+          <fox:continued-label><fo:inline> (cont.)</fo:inline></fox:continued-label>
+      </fo:block>
+    </fo:table-cell>
+    <fo:table-cell>
+      <fo:block>Header column 2 with no continued label</fo:block>
+    </fo:table-cell>
+  </fo:table-row>
+</fo:table-header>]]></source-->
+      </section>
+      <section id="widow-orphan-content-limit">
+        <title>fox:orphan-content-limit and fox:widow-content-limit</title>
+        <p>
+          The two proprietary extension properties, fox:orphan-content-limit and
+          fox:widow-content-limit, are used to improve the layout of list-blocks and tables.
+          If you have a table with many entries, you don't want a single row to be left over
+          on a page. You will want to make sure that at least two or three lines are kept
+          together. The properties take an absolute length which specifies the area at the
+          beginning (fox:widow-content-limit) or at the end (fox:orphan-content-limit) of a
+          table or list-block. The properties are inherited and only have an effect on fo:table
+          and fo:list-block. An example: fox:widow-content-limit="3 * 1.2em" would make sure
+          the you'll have at least three lines (assuming line-height="1.2") together on a table
+          or list-block.
+        </p>
+      </section>
+    </section>
+  </body>
+</document>
\ No newline at end of file

Propchange: xmlgraphics/site/deploy/fop/trunk/extensions.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/site/deploy/fop/trunk/extensions.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: xmlgraphics/site/deploy/fop/trunk/fonts.html
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/fonts.html?rev=569118&r1=569117&r2=569118&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/fonts.html (original)
+++ xmlgraphics/site/deploy/fop/trunk/fonts.html Thu Aug 23 12:00:37 2007
@@ -58,10 +58,10 @@
 <a class="base-not-selected" href="../index.html">Home</a>
 </li>
 <li>
-<a class="base-not-selected" href="../0.20.5/index.html">Version 0.20.5</a>
+<a class="base-not-selected" href="../0.93/index.html">Version 0.93</a>
 </li>
 <li>
-<a class="base-not-selected" href="../0.93/index.html">Version 0.93</a>
+<a class="base-not-selected" href="../0.94/index.html">Version 0.94</a>
 </li>
 <li class="current">
 <a class="base-selected" href="../trunk/index.html">FOP Trunk</a>
@@ -178,10 +178,20 @@
     |start content
     +-->
 <div id="content">
+<div title="raw XML" class="xmllink">
+<a class="dida" href="fonts.xml"><img alt="XML - icon" src="../skin/images/xmldoc.gif" class="skin"><br>
+        XML</a>
+</div>
 <div title="Portable Document Format" class="pdflink">
 <a class="dida" href="fonts.pdf"><img alt="PDF -icon" src="../skin/images/pdfdoc.gif" class="skin"><br>
         PDF</a>
 </div>
+<div class="trail">
+<text>Font size:</text> 
+	          &nbsp;<input value="Reset" class="resetfont" title="Reset text" onclick="ndeSetTextSize('reset'); return false;" type="button">      
+	          &nbsp;<input value="-a" class="smallerfont" title="Shrink text" onclick="ndeSetTextSize('decr'); return false;" type="button">
+	          &nbsp;<input value="+a" class="biggerfont" title="Enlarge text" onclick="ndeSetTextSize('incr'); return false;" type="button">
+</div>
 <h1>Apache FOP: Fonts</h1>
 <div id="minitoc-area">
 <ul class="minitoc">
@@ -364,11 +374,11 @@
 <ul>
         
 <li>
-<a href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a>
+<a class="external" href="http://partners.adobe.com/asn/developer/type/ftypes.html">Adobe font types</a>
 </li>
         
 <li>
-<a href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a>
+<a class="external" href="http://partners.adobe.com/asn/developer/technotes/fonts.html">Adobe Font Technote</a>
 </li>
       
 </ul>
@@ -543,8 +553,8 @@
           
 <li>Either an "embed-url" or a "metrics-url" must be specified for font tag configurations.</li>
           
-<li>The font "kerning" attribute is optional. Kerning is currently not used at all.</li>
-	      
+<li>The font "kerning" attribute is optional.</li>
+          
 <li>If embedding is off, the output will position the text correctly (from the metrics file), but it will not be displayed or printed correctly unless the viewer has the applicable font available to their local system.</li>
           
 <li>When setting the "embed-url" attribute for Type 1 fonts, be sure to specify the PFB (actual font data), not PFM (font metrics) file that you used to generate the XML font metrics file.</li>
@@ -587,15 +597,9 @@
 <p>When FOP embeds a font, it adds a prefix to the fontname to ensure that the name will not match the fontname of an installed font.
 This is helpful with older versions of Acrobat Reader that preferred installed fonts over embedded fonts.</p>
 <p>When embedding PostScript fonts, the entire font is always embedded.</p>
-<p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the original font, containing only the glyphs used, is embedded in the output document.
-Currently, this embedded font contains only the minimum data needed to be embedded in a pdf document, and does not contain any codepage information.
-The PDF document contains indexes to the glyphs in the font instead of to encoded characters.
-While the document will be displayed correctly, the net effect of this is that searching, indexing, and cut-and-paste will not work properly.</p>
-<p>One workaround for this behavior is to use the "-enc ansi" option when generating metrics with TTFReader.
-This will cause the whole font to be embedded in the pdf document.
-Characters will be WinAnsi encoded (as specified in the PDF spec), so you lose the ability to use characters from other character sets.
-See <a href="#ttf-encoding">Table of TTF Encoding Options</a> for more details.</p>
-<a name="N102AB"></a><a name="embedding-base14"></a>
+<p>When embedding TrueType fonts (ttf) or TrueType Collections (ttc), a subset of the
+          original font, containing only the glyphs used, is embedded in the output document.</p>
+<a name="N102A4"></a><a name="embedding-base14"></a>
 <h3 class="underlined_5">Explicitly embedding the base 14 fonts</h3>
 <p>
           There are cases where you might want to force the embedding of one or more of the base 14 fonts that

Modified: xmlgraphics/site/deploy/fop/trunk/fonts.pdf
URL: http://svn.apache.org/viewvc/xmlgraphics/site/deploy/fop/trunk/fonts.pdf?rev=569118&r1=569117&r2=569118&view=diff
==============================================================================
--- xmlgraphics/site/deploy/fop/trunk/fonts.pdf (original)
+++ xmlgraphics/site/deploy/fop/trunk/fonts.pdf Thu Aug 23 12:00:37 2007
@@ -8,7 +8,7 @@
 << /Length 875 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gb!$FbAu;j'Sc@2$8&P+1QBc32VA+b7:n<NM.aD5].c\k9e^a%PD6QMHp_qki+uS+(*Ha@3r`jWpL+[o_`7mR5m2eIK?CC=5p1>)5l-+a7s(BH&>ZH>JctugN3b4lLhgrs4C?tbbSLf!<\)u@q).pNJiatk"&/",STrr1&GrPhGP*@jA1l?%'nnG1W+Xgca+tFg:'K\a@bN*;4ICtL6A\*b\`p[)8JtIQnr)`>;J#*\mG\p">IVX'-,Z9f:\T^iT>fcVP6Wd'Pn_3!@pCArKZe5?#VR>3d^AlkBk5)X`W8QbG^^O&,7jX0fC?(.q@2HsGrtk:T-U,Y)-73_MdKZ#IU%u#(Dr5tjief4\(*hAP]oSm_Hbl(AnX+Bo[4k^m8O0q+!KQNaBD<FQ[h5Fr&klL182QOmUF)ml&Z]*\I]Rj/EaEepESr`Kr!8:HI^cFVu++t0.$3@!3DB$*^;di?rXQPjU`F5^iP8Q,7]!C6?(!slbQjDVKFO!-)4,K.<@aE46WSn?"7^[Shl%SL-6\VHdO/1))1:I4k(*PI0AcT2\sHl3CB_OF=+XJ0MT#\&Jb-gS6lh#Gple>5XXJC&:A"nNkoeNcp4f_4Gm6U#?:/nTl'dk`Q#L"GkdmmU0O(kefX`c\AU-naSSie'5#?aXB*m+i=ku1_t=cf@,UbDB$Bs;[pQU-@J6.,AL*3$_)u@==L;AQ`]>PA>u+R/C)%NMJ+mR>*Xo5L3=DA7<NTS-Ron9hT!g\hXAKQT*%1j=c8TB6f(e=I%mch4RXcjW#pn^&&V]#@_*!+9RrUGc+tU[TFP-9ZM*D):G/reL6eCM:f5E`KLYie7Fup\X-JMXVfg`R\%')?A<Uk%!Aj`?_0.qR?Jc~>
+Gb!$Fb>R(K'Sc@2$8#A5RA/p1$bJ[AJf+b"T'<!:_Jp8[6QE_D6cn(a^.O,Rbbbip,*=DsSc?%gqrB5KVDf2#"q_,B%][6P#D'h0!9k!u*moBg6]elC#ZL5&1<ZG;/^D09nU,b'Ec_8"Bsk6`=e(+O+M?6u0u0Rk4c%.,%'e-IG\<)s72@Z5>#DdK@)Pb9XH,n<E$ui!&CWPR`SO;$'hY8W.SS1E:Wf&NQ=!<eQmk\SI%.di`4A*9.N*(tqg+UOi`YXFS32>TTqj)k*9/BF0Nr;X7<eu]P-)ss=<eJ;2%D;Y`q-8+*-onD]SVF2d;Kj,jR)0/?(+5TB3[(q:O[$JqJef)?!p"=PVYOSDPr2I.3FM_M@+?SRA&GScr5Rq[o3BZI>!-++mUu4;$-ITg%TH3T*lC!EgmmU:]$k#l%uq6AN=\Y],snr.3tH*2QGUTID%/Rlr5a$!l-kMp@6TV!.q5q.#4`+!08.LN&]n9$/n(WX9T8ER+@fVQ&JK>Vof&5FtcYn]>iPA4D"jN%=:F?G%+#'1LSSqH`/1)`X'r,2\sHl0gfU[$mrV7E1Li(+tiO]\2YXtl;4^>JVLs1+o'-g*.u:ZTnQlMGSH"a%]J5e6eD5\bI)Karo&@pLh^A@3e%u:i=a<V+Wj3_:RJ$fZ!>juLJQid$o_C@J;H@fRk`Y6h/V9EK_]DtOg-GrHh3b]@F94_C[7cIF?O&XWE!'%rnX&TGVHd2jZIX6f<op1D.6f>H.qQ=W^]F=E1d>93T$@-Wl?DL56QDoB`b0M-^7TJ!t)TjJ9gp9A'3V0M5V+]dp^k[#Q>.=g%E`!L9AjRYMXN!$,8+9r,OiH9fIodo!NWU(tEV6VNU0nbGRhg?UgQTKE~>
 endstream
 endobj
 6 0 obj
@@ -383,10 +383,10 @@
 >>
 endobj
 54 0 obj
-<< /Length 2695 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2660 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gau`VD/\IE&cSA/U#sfVE2H']eB?it5khiR>^P3uG>kk6dgr`Q42T+&92Wh,hfl$NTe-!c=J38sCf-_]bVR.l6S]`*mlinkrV)=548AX9/muV?I,B_:g^iB<6EkunOln.WXRH.;p[OsXkF;Z&rE\FS^_Ml&!pTs5Hj7sW3,7X#^\mYd1GJs-+n6Bf@C_78lGBUBm@@H#k/)W5K\VB@&C`b%Hfs;T^0bc9>lX<Mq2b.BQVf[p,Z3'7qnln5hHBWVdJ6PZ?!;!BL6agBL'RZ.LBjTg`/doi%$,+_F:;N?<6:+Pe8]/*/>eD;&YWNHA2!YoNussb4s*j<D#4*NBV/8_7YK7j\"AslPT%G-'G2K,_d]^lZD-!G@B^&L[6>T[Q)MaP];e7O]VbONGhU).5/"]J!"h]=O2_49(iCg'VD%M$pKCSf*f#JU$B=O"&d;4-M(;luA"@K;$T)$225in#*2J0mq$t5]KTPVABM&_+A25+I3R<,?cn96q4c<qEjg]Lt?\NG*'6qrj?,)+(@#f:ErkYL>Il9]6g2&/[156+]-[t8uO4>6.P)u8sbd>r"E=+oQ]=fa'nHN,C8/TiSPd]UY+Y+Bk0>(Nn4`=39>E-H-#`1DMriOQ<K7tD(32M2TIF=-H:RVOd)EV.#Qq.')iG0QT.:J2PN&RK_,Od&5`oom6.Vd.lE5GQ!O$"XV+kWsTJG2LHV",65S-_Som6acfWkHV69Ud4JR^\!ViH@X,RY?S!X?M#X_ZE7O0J;p):]M=:h)ijR8H?l`[:CC&?k%F)^,EFGl8+Ip[+O\5cE)JC\D"0l)9/oM]OBD?%ED'EjHB#qQ$*WHU<'#MMgV#^.b+`rFq)KU$.3KX6?ROa=;a_0e],[s6S"2Z55qZ-`Mj9E&a^Vt[P_?3r">o1]ZuV+/nS(q5"d/hlJ]@TnresaZ:S+VW0+-/q\?22YA#H#Ri1-E7W.A0N7[i\r845b:@lC*i)iqa^eIhGnq*&
 if,.gZHX?m')8BEBG-[.;&FK(N&h\Fha:i'X(D%qqp&$]L@F,AZj3'*s1K]`o#?\O#C$am)7[E.0Ci)uA;QFnl7.XrllSd"`M,j<J7:q(c$W;Dm==)-7Hbfoe'63&aSHs+;i;+H6-_;m?EJ^+ob,k=U`Ves@Sen8J?.*hG6lFB"2"L1;PZLeA#=Qjb%L*/kK>DoTj%pW(@GbNr+;DYOS2]Y#5X>$m\DFNR*FP:Ck:O;4kt&eMi=p#a5-M;:W0]m^?/dsVb@WR4_4nSjJb/9+)%(KNhD@ScJ9OJ18e!f>))Q`UQi"0a(7!&1&I[RCW,FI,b>I^k&/!&ljC3CrRrk,lCVm*^frJW$FV^g?QN?*]82gRf)3cPO^uIQSh#A^$%P3S:NA[B5Xu).b?G[2lj>]MJoWO77l2Ip[:f,;FL_91Z=^[G,N8D@1i%cu_O8:d9".N<""6O5a5'<SFZYgK3/R&!%(+^q`W0#i=BtZIl#dGdVHel,`[JX=jZqt?fQ<Ejj<HoOkUt^j9Q\_R6aO2rSbcL[Tr,,-&%MIN@.oJA"PI*G_nI^NdBDt2n\]-9M*38XHIZ62'0qQipH"$B)%u1S%TN2q@k;]K*-Cf8t>20I#O;&Ro'sPqO;nq2*?;+/@Cf>4C:F"4"gHVg7Xd!#8(Q=PG2_gRLJpKO#cmri5=FN1LqQa!T'kbF>`u,7,<Zc<^`uA;%6r-/O9AI<gFsrPVa&[Lj$2Un&CsAH+3ig3,LRB^G=A1nTN*]HHm::*02roqDs8)Z:q7:K$FY>,,cYhc)ch@XX4';j9nFul9&5"'lc,'kSqPlRnS_d)%$L=@Fdi?Q#,Hql#F&7HSro9+!>g?6[9Uh$]6tS_&eh\=1.-kOsf$CkA[d^lsO3u8!YZ[>?aor`b<]qeO3([_eZe'p-5]X_QF2HG;g`/iX']'p%?;<TEh8j(K^op?lFDCOZ'5r7VH#5b!,[bJ^]&Vk.dFOLSMauTSa7'[RQ_S
 UZ5sF"gi=j_qefP\'\'YA;Jq5OT2DuS#j2m11C!`B0U/gb.mp;efBel;),N.0%SpM>ZW_bikn_%Vq=Qg2n@+gshD47BSe`A>9-d&pV$Ng;9^*>j^`=q8[PZ=TYI?%sq^Dr<DLZ8Rp-__`8JL9`0jpGEs97'EUr-CA>gq.Db`Aes:1>XmYStVZ7K'<`OG7qramd_[LW`WUlZC)sM,:obA`!3e;`0m2E*ZYN[/O@bkq6R3S3WPO-&@;Z.TkQ@0D6ZPZp^LZ;:TsUd1Sdk*:i@P3BG;$s[PoA"#_^<t@4-nmLVi`f-hL+[\KkVrmr(a/?M7IF1noZNTYLLRip>J[%0[&mmQ;Wk[J*S^DS'St)msUsm]tqm]^MRka[Y]&0>,S%T=sch^/#pbI(Lo4cB8Z*:;U6']I49sm2Q^tm.Dd>9t7I?Q+ckEM[E4,mS/pt%n3J4DH(qtf+Bc6J4<@hQ5%bV'"gf"kb5'fLI.\h7o`--LO6>/`J5[=Q!*RQOfG`,jaes"TYN9`E6'*_"\o%C6<SY*s//5sBlF=Z&d:I?g='TfcnHNTSDLYpgC6[rg8S@bB]D)!Ylt1up-R)^+O>YjJ;8A^&+:_RqS-/V+`NRZ[pBVk(bXn-8pfh%nE3fR.'+"[ZK'o@TdeN\n&XbiH+5ZseMBhq:`+Wj]>'>Nf)"lE\bplJm8SIXL(,qqCIP$q]B-I\/-h.5#K/l29`~>
+Gau`VlYkgn&c\H;6HuE6i(T%CWQ4"E5khiR>]JLkG>kk6dgrfS42T+&:SO$DJ)?rk6Wrt)=J38sCf-_]4F].4oC;A=e)T9QGLY<^cVJ`c,Hg)(55aPl#eq1-"XK$hVbk\8mN6Wp0+r6L8T6HB,sDiEiOC/+?GOct!$dM&m%!m<?[d#B<hM8p*^_G/=-5jUGkJS[F)/TspeRHB)c@7L>N^"pr9)o1bAEj8+5T*ZFWUQ@Rc];LMV;co=tJMl$f<g(h\BmmPZeg>LeQ:V5sMF/_6>T_A!P$NA!.uV_q-jse4/W?E>Vk1VM/OmTjB6[:\M\e+.f&f+'3&kqYbFOT4HnMK[]t1SsEWG)SnfU&Kr(/,j&]1O`/W&=G3t`T<=D,1umh+<?`/a'E($UD.K?3hHtAT#UA>!@g?B\DQ9F)?IYV9F]#,bll(&h28YDF'MQ&,<]],2SSZ(WBXLrV@#'\^:^,(cG/u4)E9SFUVUWCL`O!:Ke(f-RmGc.,ZY3BHNb?u>.YLH^^e%UNo,9T=*9SsPK298]Ck1GcfK_]4";@A&r6XCDX"hC9+[#joBs+Ap'RkRUH^PZI%CAfj0W:s!D:cIQ<\S]gGe"0-gnG(`)M&b+&o129pKXa0QMj@m.1Mg8PBK3;1-F3mOe]<+o8%mmq&0pVPd!Ub`Z*@l/at+@7d,SKb%o1cE5GPtO$#d!_:c!K)"3B/8^o6n3"lS=g4qZF<-smE8=M^\L:;G:S(eZdBF5CTZhj1U%0_VY+C+!FU0qA2FRLp8-NO?S2j+5nJ/\(FHu3Ddj_#:r@Bo!RPZdt]E4'(`0oTN!H,6Xl)NL3mLaD$+1[Pkp8<H5'k1MZG<CQ5(=uGYB-:H#t&_6=6Ht=G&W&BCE*(I1lp[Yct'W3.J[V5E>Z)-]>jblf1\P<a)c=^7l4tB$hki$kcAL/4fAJ;4a:g:*Rm8oCPGYLg'h95rH&uh9B0j`rRl+][7S7Jm9J7Dn/")b+OapS^
 Y9Om[G[J.'p3oQDULecO[(4prU;SiTU'R=.]oE=0,T[%IC&-a`&5JR,J1kUBB4@&"gVen(G)c`1[^9oiO.pXD>7%2)9;n#>uN3BhU0.I,5]HGd<KIp/kV_;01ie6*c?jD;<2Rn3KNY>,&CK[C*6Xf8n7Qu<JL\&C,Y$7@?OXMFMJ4;SK<U+=4nGpXucU$K>E"I9_GT8ah2sa$C$A9V5&b?4@a:Jp]+0LrH,R6jefQkTA?ohc%G;t:_NR.4_($[616C0Be6eRDf7^+"RTAt1..74,2h4$/6#^@`8Vo4*!cCj.n^"TYi]Vp_[*ha.:N93$t=H7"^!JjSM+r/:Rg*GE@=UA<VAZqC*lRYR[0,o]L,2HcPcCdU?#p/9WkPdD?A:VNf?`CjKlUkYoiY$Dg,0TVabg7j92ouL*8@OfYB7pZ#&+*P/8[R<JWal-0?Kjh2e9t'VD-McqH(!;2eKWT0%ui_QQu,`9+ksH@--Ds"K?6UOVtWa123uINj9b$-h+MAn>PKbAM97e,&#h\NW5LuI.$@9aQP56V=ZTp(9](`Vc)U]m9R/UnYWK3Q'Kc4h$T"Khb>@$:X[NjJ5aoS#'P1jh\\&cNT%QEb&tXiNa..W^rD]c'T'tbf0k_cS/F7UD*mcEP)mK6Xg@]#WbVXq]<#oTsHrtg8;(X`<1)<#q#umMt<btjW;G/OQXT3cOICA]YU'3#d>@<Tt$S0VHkS(/a_0.:a#7kQ=kC8!\ja9]Z9&7Ykjg3_2cL\^MmnPPT/UuZMd%CBEb6b=sl`42gFKd[:.[2>5P75p0e#<K=5Yutsr*u)P=ABN76-UHY,-mk/lB)RK@<Je#oeZ#a/UQ=J-X>gjCt;8nQ/&fJb8u;3N8n'qfl`uP/"BGh*<(%02^a;BK_HjJQc"i/2rYYcn>jD9*N4D(^`+@7?5nq`#ZuGCm\G&9[In'EnYeP-(d<B7@W\b#a@86<I(4H+rF(h<)dKTq(uSk7gSQd`3*D
 A"NAY@^BQ^(@],+H]8N\(=,K$^I5PIcRXAD,oiRt2O=Qg2j@*':eD3?3s[EL0ULV:1L(C9pVqi:<e*KS-F.'$<ClRZ\u^[.#j]Aj)M-bLRR!@I/^jpG?q.m#+>I(el)mbP>#@@Rk-N->`/`uAYd7sY4'S]#M[\pBKQ-2$BKPXuE@`+h>,Cd[s[/(8e'd/ag4()0ciT5D$fhL+Iec<@G29uD6oM_tjXDeLKp@&Zqj+bToPH4qGiUPR:$]qjRS+Id`sG*;X]->X2o6Jk1o9-P/ArpjO\AUb(],>&d^qQ"<Sc<a/m:lo(Pc3*'5HY%<e,)QT;@Je'6.%C4UX!e=GCui>'0'XGLfukf/q]lfj\%@Xb,jC9/8U/F$']gL3SKaf%^"s*7,AuR[BlC\IU4O&NHP<O>6XK&]Rj'lNRf\ko!$eF0MfWGQ$/VI,oMASD6XHF:a.cK*%ejL<M[r=Z0!jD/,?AG9aoba"YQDjI_'+,l(H;GG#\EDrq-OVPe(>fL8/1jCBb,O[5_F=VhK[Z7[Mt;n[&I?g2.JktYlk,/p-R)^+O5R>J-WWkQhQUHrL]:8&?n^`$RtR-//N>'V7dChq!4ql'\4$N</8B95gu_jhiZ@[o5L8PZY,NtTeQ6[G(6skXS(PiEr!a>h%fMM$l`e&CITR&G0=`O=:R7c+4Q99Qi~>
 endstream
 endobj
 55 0 obj
@@ -451,10 +451,10 @@
 >>
 endobj
 61 0 obj
-<< /Length 2921 /Filter [ /ASCII85Decode /FlateDecode ]
+<< /Length 2483 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-GatU6>BAQ/'n5n\@/[CQN(o4S12khkhPSb=gl4AZ[-e#a5n[dT>7d%#J):?j'G!`bB!TOs[V28eLP,&c"6AY<c):6Z+#f4fLO[(o7'=5/_D$YHIMfuSqnNU++S%'YXj,*TDgm.8^l'DkFiWsSXHi1Vi"(2G0Ae@q[rd[\qo--<<`3]E8?JJjE:9mpfNG.p,4301&Db#P)CJG4pMD:g83'FXG(FJf](<cLO-/Nphq#CL5L<du<pQq"Ykcj2\,Q9e+/PY!hHKrcepm!:g558XOk"r*3qT;1#P;1aHMDkL?AMnqJK*?M(Ic]./k=iTA6Ys9;;J6849ejA@^j5,GuDlXmDKH<nC@j@f"-&-WUJ*7/B%%7e\f]jbH'tlI&?^oDRX_GhC_2VHkKQKe&OshK4XZbM&?^;-2L&6(.ZLNh:g[?bO?L\c]'ikG&OK*[\QQT7jX\VAQJ0j#&-@]R2V/1S>N/'4PI'RrK:f.AA]cmCm=u'0/H&sk%rCoEV.!(82V!2ZV;[C4ZrVSlbH<s#SP1<H2u6%1VCISMk:P#F[]6;q[jnY,&6\==I'h*F#16,H%[pS9UO=o"jTE57fu!jgHc>MV`W%8OUdf.&Oa6rjPPt9d"<ht"@3)kc?&8Qdo9.6Vdl\6MZeKF-h.V-Nhon\R1Ypbcl`=&YJo`Fi<AQVKgd"t9UHWkR`>M<XXbE"nC<"'Y;UE/^7YqOo3.h6JUaRslXDC:]posbYbFn5R9st]KL-qKY]k7:+$P)Ir:(iVZr@lbbo=5X=/.?JRl3djE(G,&G=]]rD3H.IX>lB%+WD)0Y5b4O9`MFc,q5b1a92JAp$\Z(fc^XsdNb]278<lSe3p*,D2.mfU4t\;B"*RK.`'9ec4gCI"CL<$&H1;DI!+NbNWZJ6iojZCCPdh^\M1"b)Lu6p3'G(7=RdHJ5g^VY-_M,u=]=j*4nTIb)L$#om6D7oO'eJJ+JAdl)S2X#PH@-J!odfF1Z;j*"j*b
 C<Edl]=7VTC<`rEX;n[2qdY"^lplQi:%]WU#/CDb[Bul08&@G5o_Plb'&%H>i59FQ>m@"Fg+V)S([`+.8rDX5qUXo>753:l1A+^ceMKk&T#)"\7UE5*R;LZ11<+uHQDB,pPBqKZrh:C;7*^7s6Wi#N;.VnQ3jfB(>h04S^!H)Ir;6rs%'04[n+S9!PT'\-'qGh-QINuf!q(9I)QBseVVDK$&-:f0Ao32>#g7!/j!TMJ(NIk6Rfq&p(dfp7ead#mr"<i,'_?qT*[II2>m'CbU5gD`@Nk7l[=U1IW-Kc=F@?031Bp2J,-[t:FXcbBdhDAOl#mY@pkO\n-H;XGt+I+lGnrsEe=p:a,;]X9YiHf/k1N.J9<,e_UYt"m]lj^V3/a:KT-Y(3ncM4kQ>*6MHcp6On8qmIL8CB>Cp)_PRc&+*$_&aMqcT(Zpj-nVqe\Fg6,Eq1XTNT1`;Td^l;nNn?)M.DFTX7RRi@,1M`P\[[ATa9#ZXU+ke5+,aO/j_[<X1:6#-O`5*U#0hM5eXs-+p+.V[&lP]@$2KO47=F&bkeQ^*9se<q9$4ruLh\AOUlff!;jLK`eT..B'8"n?OL-IEtVBDs2`l)?)cTA0__X@25)Ma2gQCp?ZKZ3Dl]E[SKs/&><rp4D70eFLPR@[bZS@M]'bo`#R1h:hI`Go4-RQkh!*Zk5=O7)geah@?h7cL]*Y5k*,cAr.a.9\'%>P>82TSG#D-cj#'.oR>%rp#W^SBN/=k^An@f:%6-FUjuRHd.#:r"/AWI\ke[.$?u#R2WHt)@$KB^G<jq<R;$c'm..k-(#m\KL,RD4qE8dDDEh1j+j6M=+hN*<13a#hEEr_uHmeGfT`LmtMZBe":M`i$T!KO_9XCDW;WZ".!#7mQUXL!uN.Z)bg[lft=*GO3!\%G,.5?8[*G3HFD_RYQ`j]Of#%qoKFg5b?502WXKP^4k;%TbH%ILYKjM?<W"M;pqM$_nW0P7C"P%P1HqNKs
 >JQY@"";15FTH/oSP5)SrZ%1#Q<btC0nD(2i8=Zr9q7$]'Y9#dbKDA_)9ijS[`+[e2[?E/s\9M@*(bbn>XJn`X&eUgf%Wtfi/`h=@Ink@S.r9K'%iKk2MeoAcgaGm@3O*34(oB6CMm1-<]:o<bGQgkd2ob'@[SEl.H`gGZp.7B1hU\^ugEcSTQi#[fD8i`tkC+;uIQ,%6IM&S-iRM\QIksB,7R1$RS@l#%CeRhfAE%L)&P)ZY$cqmUrBUNha-V)8>[_N=A)&sHGn*uJL%D7dT&oKFaN1MFfh*K"_!EJmi/P:MhKe9\k:+g?3^BXbOW6P-gRm-%8*o>pV@4=7>b+V0M65dYSA)6C3RZMf+DrR<P[6_1iYCI@-!hcuu_(jo?m]SH/;Sc6f=Y'4IA]#BC2#juA6uJTC=O@f@>LVMWqt6Itapb]UarGO#+&_Ji6@9^rlIum\GIg>933lV6UkeLD0]W)Y?9gb:?pp58h@bthV<!Ak>(>Xe)0X?iUnF2C'tU;*B8)I"Y2s[fURfIFk\cX4ie47%hFqJPIWJP.!_+.06f7lNE9ZWW=!S(S]57hg-r71S?a_T&/PKC2[ZCDg)fiG,=R8Sa7QFs5W4^pXk\%0BW&VB^="ZbXLl;k68L8.+)3(\e.K"/^YMsa+WVA:hVB6ta1*5bgZS*Y42,n^h53$u8Xr`ee;]Eh+IsQ;g2=s.oURMcgaKcKI6O$_2e>`Vg<j=T#R."<g6S+H$C='q[Q3rg`f;lG_D#9Ds,_Bdk\4IXbqhh2O^JSMh;<V=EbrbU7Uud2gW'poZcRA"G+lMiT\I3SfjqHX4UX&^7G7o0Y'd;K3CNo!uTQLW='C0tIZk`HL8%1&*e/lSq'tISPDMJJaIhZUH7M3[BN_gKs%WYtt89a*mk@u0?G7P3;H+)n3JkB8%jJ'^Jq>Of(<Y#9trs/<u(Jk~>
+GatU5D0+Gi')q<+_:+aj1D(nHPF3\e['=tg\Mh0&S_Qm+"%5EfkP03C.*)A%$\9!.'HfE84dJKn]@_P9qs5s5_s6B%Fn>VPf@e!t:H,OKQ;/,_n/=\$]Zrkt-%>,@S2oo)J)'s@<PXN?&p_shQd1`s9DF)4kkOT8SR]80lVGf#\s-C9:ho[b$?LD_').edc_OkA"4?LYd3P!O5sX5t.-8&=ZHnUA4n#]Gi]_NjC"mCWis-JBf2;5G1%><X<BC/*nOkIdX'=c%cK]?HMBiX92g0q"[n#obp5#<G@t63TaYV=C&9nNJ](.%EU<c?fRq.f39%:4`Mu1jm'R!-.SM.t[J>?MI^g$3Z/OX"qotB#/Po-^qG5U.XAQ(^Nf;r5`c%^)^e!6lP.tQ57]Y?sPj99me`%29s2>SMtWrqC6D+MFddQQ2$@RKsgEbbuqV0ub,C[NU7o4hoEOB$C.kRLbNkuu*CU2@Uh?ck_0CqQLm7WUia]$U)QT.Ki"L<_l@<)Xrb^?u+Kj1PuX*XiL.0QfrL!:Ws3j7AbOq@:?h2D!%\hdV4,6k>m0]I5>C\Xor+EJ,M;QE[?f.ia1>Nrabj+lND$B3WAYQ&UpT'8/t(q:egM\oApJ0MDMjbFCWDF=q7$e#CiZ7D^/jBl\bqVc&C;/r3f/cnGT:?fCX6nd7->@o:jG''=12_sJ$iAP*IM]EVI-;P"!^KusSV=$k5Qr%"V.M+ZuI3A^;98)9am5F/hk)NfD7mVHZ&?MsTWr>`\]eeiPK419HM-7RO"OsB9PKY"r:ddVS3AOo*n*GCS129r/2rJSrT_e4s$1<uh`#QFPjh^<^&,7*fp+K0?MaT.mU7\j=*LO(:E_joKD1IN%=aQr,fbmB75^+OCKqQnq%FltTA"09/rkZQ27M2/mOE)p0P!(0Yo"2LQ"l5bD+]\QL]5prtDA`@Gf%8p#koPFA<cOaX]+!2gP+U>"7\u"?6NCB]Fim,;DE$$U6BZ\J
 ZZE!<%(8oZjbIWiEeZ5JigRAOG&52T[Tt4]DNA:ls@:$?nl>;+e7TFrGa%Zs@]Os[>m0`35fV9aN%GlKrVclWOenigIN7Vj(eZXpHiX/6Z#Z4.P!JKT;I_"<7)'-Y-*:Q#PIHL'>@U'jups:"]L>MBmDT-N3cPnUdrR)<%^o]VH<jPJX8,C`,4(5SOo83K`X04;%k8-I$5MmYI0CmPPZ74%O*XP_7pA#I)JPriAej(5;YgMs?H+qHP=r<fbY2hu$'7u=Z1<h>oD8#JgQJ!!KboR`5h)XmMF2L3"E3pM?M$A%nVTuc9<JW?&ZgnQYkpK-`V4R6/+;%6%].Zm@B=U!oU[//%9j;`$#&!gnS(\"VYmB'h,kBq[[V$X<BL@Dfq,6p(b&DUu^%c]26,JP8(k*0]A:30blL*V@$u8<%6g3'JpG@<XPbRps"4qP!UHbcDnhT+in^'O@B&\CB<B@JZ/V^CCZ!CF7CnnsbDIN5h4*dD5IK1c+fLuo^Y?b?';UrD_;Orb9.%f35a;`/_4j^j'o.Ka_@^r(YLD.BNVuRf1bSQ&)4Yi&GY2OX0c,SpN'`T8U#u1[)]GP5npJaLaHT^6)L+[Z>%YmZJTupHR-k>WZqec5U%a9[OQ/ol_J%c+Eq@B*ZhuLR*Mg_>@S%l8g^dOb;P1F6']&PfRWS4nCi)D&L*-Ut:nr;47i(!UQVfH&ZW4CL)2eN)ec1X<q#>IQIS)Eeakii`BZbb+=r<P+;pb<77&.TNhX^A.QQr-DW=[kKc4'K*#feYWqK%2Vn[1.cX/b@--(33S?$^u-$]d+Z`DA(@V&Q+a^EXF^357)[V(OKJ4]=l1ZL\m^+,g9*'idOll?M+2`\cB4DV9EcFIV*[^%Rq4dH*bs(:lEKVe7`a%e9KX2^=a!TVMInb=5(_>9P)7s#_V:Y5KnS[rWaQGG8K(o>f9XN!G0;$`i1l>l)s=KoE!:6>]71C?mGL.:M6S+6hg4,RA(*B#Ot
 >\5c^G^F^W4jFr-2C^1)^H^763Jp:d<(_B`ga_%0#p3?kfoOYNdocZ1/%7Q/HqL-;HC9UURKG"Q.:WRL,tBrL4Eh/H41Fn^TU9elSo8/0"c&3@MWL#,S=a)L3`hJ)u[e.-fJO@3T.(StZA[s'8^=[[GD8OA"g<d)1U?6,+t9*L'=3T&%'EG"7u_=KUlhcKRDAG5t+PJ]#3f9&-CQ2rfaj/1ER@((>:>Q*mHcCI[p,_8nrhSc+b6k8?t<=HQIN-C6/@7$-!O?Vgb_YddAE;?C:HiMsfOnsBDqSK2K:PjE"18E*AcX`l$)o_gB"hHll,b>+bT5=jM0QFd*l$:n-9LW5,P;J<4@qBn]h`)Q+T^PrdY`&Ur4sZe"%CO)Pf=62HO<j6qJ"SlOm24M?7+5%o'g[Wc?p3D2CB5off*?\QC`+Tjg,Y`oDT3X\5:c"Tni/WE64IeXF%MULdbH)h)A43^=,R5MmuGj$g<#Z-UEWV-*CNK*(]jI8G8;+h~>
 endstream
 endobj
 62 0 obj
@@ -469,23 +469,12 @@
 63 0 obj
 [
 64 0 R
-66 0 R
-67 0 R
+65 0 R
 ]
 endobj
 64 0 obj
 << /Type /Annot
 /Subtype /Link
-/Rect [ 190.956 304.78 345.612 292.78 ]
-/C [ 0 0 0 ]
-/Border [ 0 0 0 ]
-/A 65 0 R
-/H /I
->>
-endobj
-66 0 obj
-<< /Type /Annot
-/Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
 /C [ 0 0 0 ]
 /Border [ 0 0 0 ]
@@ -494,7 +483,7 @@
 /H /I
 >>
 endobj
-67 0 obj
+65 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -505,29 +494,29 @@
 /H /I
 >>
 endobj
-68 0 obj
-<< /Length 706 /Filter [ /ASCII85Decode /FlateDecode ]
+66 0 obj
+<< /Length 408 /Filter [ /ASCII85Decode /FlateDecode ]
  >>
 stream
-Gat$ubDt:1']%q&XK7cm2msAa5es=n_FWLI[csM,c,'SsORd.LNo9Bl"K)PS;lN(dqrZ\S3BlRSFOm/Wb988lhe,GU^kd&LScP2?3@-ii&ti-tSb'gGqL?/e@>HbEnDN4_%@[kof2P4jirFc^HC;9-<H6Z`Z?W;4C7Re=ZZ[G;PVR'Z'5^*bUsrD<U\aV[P=lut<PP\t]&10"jS*&/aNJdXXrci!kYu1P4J5aiI_):_8-^/poi\+[U?<<El@jco!],Kq&7<fH=-s7[AW5Jqq=PV.KrGTq;clX'[fXke_,l2+VnsDTFrb>fGYSo>L?#<I\u\YP[WDg`[h!\iQgXTe1R7CgC5aa6EF:S,pQ0%\1t?_oMQ4BeI4=g:%=`3G`4`>tK;OCa+T,Z-9Vm(.m?6o.AE!3Dd:C'Z$Ce-GS_e_R3%b2p%VN?**hC%]hVT-E-("\\Bc*gYHISkf=Kf7((Z&OaRMuO*SPJ>X.6([ZkC;Xi!WoFI$c&g^GT2Mc"N+^Zbfuos5fP`J\lKm['j]'8"O%"HBX7HHS_jX1^=A3/c-:&8QXBiG=g)8,XDusfEuMT]J=4]so[,3D-Xm>5Wqa$9*&-THMEt-KgtD]N:nKZ5N!+gf6ed(F["XrO-;gaBXnR6OGNm]]dd>mF^6=j\!aN%N_G]%_a1<ncSnG2q>cQds/.AO1"F1k(',FoXd3%)j3fs~>
+Gat=%4)_ti&Dm@9DM3S!mFXT-Th7ajOLgZWfapND+[IS(%2nBEmj3XbKN(s;SbQOK_rF-I-fS>YaE^PaBp@PGj3p!6k<MI,)QF2]i_>C3="_l<Oqo=+$9?@<iWqf7_u8Zn"TAB4`"=E>R:IUS92"hRi(_[74\pcB"1-it5:Eg[?ITMHgaG/<qCm]cjeg@Ko_-Wj6_&?X6*.ntBqULJL:QQ1J@VH'd@o[,9UA3!LOgehLn'3+r&Pj)#I\"4Y+'blM935IPp@X0l'82aUNUcZX)8eW7LjhPO[2b`JSCQ[_tsfF-b%H<1A8R@*U3ih/Ps$"D>FsUK,QAUAX0*7p2LQnIa7s0U>%a[^9L^SKoU"]Q2^P.79u7t+P:Tro-u>Mol>h%3s`;q*iue]E;&K3pU-=+~>
 endstream
 endobj
-69 0 obj
+67 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 66 0 R
+/Annots 68 0 R
 >>
 endobj
-70 0 obj
+68 0 obj
 [
-71 0 R
-72 0 R
+69 0 R
+70 0 R
 ]
 endobj
-71 0 obj
+69 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 232.25 683.0 361.75 673.0 ]
@@ -538,7 +527,7 @@
 /H /I
 >>
 endobj
-72 0 obj
+70 0 obj
 << /Type /Annot
 /Subtype /Link
 /Rect [ 221.685 671.75 372.315 661.75 ]
@@ -549,121 +538,121 @@
 /H /I
 >>
 endobj
-74 0 obj
+72 0 obj
 <<
  /Title (\376\377\0\61\0\40\0\123\0\165\0\155\0\155\0\141\0\162\0\171)
- /Parent 73 0 R
- /Next 75 0 R
+ /Parent 71 0 R
+ /Next 73 0 R
  /A 9 0 R
 >> endobj
-75 0 obj
+73 0 obj
 <<
  /Title (\376\377\0\62\0\40\0\102\0\141\0\163\0\145\0\55\0\61\0\64\0\40\0\106\0\157\0\156\0\164\0\163)
- /Parent 73 0 R
- /Prev 74 0 R
- /Next 76 0 R
+ /Parent 71 0 R
+ /Prev 72 0 R
+ /Next 74 0 R
  /A 11 0 R
 >> endobj
-76 0 obj
+74 0 obj
 <<
  /Title (\376\377\0\63\0\40\0\101\0\127\0\124\0\57\0\117\0\160\0\145\0\162\0\141\0\164\0\151\0\156\0\147\0\40\0\123\0\171\0\163\0\164\0\145\0\155\0\40\0\106\0\157\0\156\0\164\0\163)
- /Parent 73 0 R
- /Prev 75 0 R
- /Next 77 0 R
+ /Parent 71 0 R
+ /Prev 73 0 R
+ /Next 75 0 R
  /A 13 0 R
 >> endobj
-77 0 obj
+75 0 obj
 <<
  /Title (\376\377\0\64\0\40\0\103\0\165\0\163\0\164\0\157\0\155\0\40\0\106\0\157\0\156\0\164\0\163)
- /Parent 73 0 R
- /First 78 0 R
- /Last 83 0 R
- /Prev 76 0 R
+ /Parent 71 0 R
+ /First 76 0 R
+ /Last 81 0 R
+ /Prev 74 0 R
  /Count -6
  /A 15 0 R
 >> endobj
-78 0 obj
+76 0 obj
 <<
  /Title (\376\377\0\64\0\56\0\61\0\40\0\124\0\171\0\160\0\145\0\40\0\61\0\40\0\106\0\157\0\156\0\164\0\40\0\115\0\145\0\164\0\162\0\151\0\143\0\163)
- /Parent 77 0 R
- /Next 79 0 R
+ /Parent 75 0 R
+ /Next 77 0 R
  /A 17 0 R
 >> endobj
-79 0 obj
+77 0 obj
 <<
  /Title (\376\377\0\64\0\56\0\62\0\40\0\124\0\162\0\165\0\145\0\124\0\171\0\160\0\145\0\40\0\106\0\157\0\156\0\164\0\40\0\115\0\145\0\164\0\162\0\151\0\143\0\163)
- /Parent 77 0 R
- /Prev 78 0 R
- /Next 80 0 R
+ /Parent 75 0 R
+ /Prev 76 0 R
+ /Next 78 0 R
  /A 19 0 R
 >> endobj
-80 0 obj
+78 0 obj
 <<
  /Title (\376\377\0\64\0\56\0\63\0\40\0\124\0\162\0\165\0\145\0\124\0\171\0\160\0\145\0\40\0\103\0\157\0\154\0\154\0\145\0\143\0\164\0\151\0\157\0\156\0\163\0\40\0\106\0\157\0\156\0\164\0\40\0\115\0\145\0\164\0\162\0\151\0\143\0\163)
- /Parent 77 0 R
- /Prev 79 0 R
- /Next 81 0 R
+ /Parent 75 0 R
+ /Prev 77 0 R
+ /Next 79 0 R
  /A 21 0 R
 >> endobj
-81 0 obj
+79 0 obj
 <<
  /Title (\376\377\0\64\0\56\0\64\0\40\0\122\0\145\0\147\0\151\0\163\0\164\0\145\0\162\0\40\0\106\0\157\0\156\0\164\0\163\0\40\0\167\0\151\0\164\0\150\0\40\0\106\0\117\0\120)
- /Parent 77 0 R
- /Prev 80 0 R
- /Next 82 0 R
+ /Parent 75 0 R
+ /Prev 78 0 R
+ /Next 80 0 R
  /A 23 0 R
 >> endobj
-82 0 obj
+80 0 obj
 <<
  /Title (\376\377\0\64\0\56\0\65\0\40\0\105\0\155\0\142\0\145\0\144\0\144\0\151\0\156\0\147)
- /Parent 77 0 R
- /Prev 81 0 R
- /Next 83 0 R
+ /Parent 75 0 R
+ /Prev 79 0 R
+ /Next 81 0 R
  /A 25 0 R
 >> endobj
-83 0 obj
+81 0 obj
 <<
  /Title (\376\377\0\64\0\56\0\66\0\40\0\105\0\170\0\160\0\154\0\151\0\143\0\151\0\164\0\154\0\171\0\40\0\145\0\155\0\142\0\145\0\144\0\144\0\151\0\156\0\147\0\40\0\164\0\150\0\145\0\40\0\142\0\141\0\163\0\145\0\40\0\61\0\64\0\40\0\146\0\157\0\156\0\164\0\163)
- /Parent 77 0 R
- /Prev 82 0 R
+ /Parent 75 0 R
+ /Prev 80 0 R
  /A 27 0 R
 >> endobj
-84 0 obj
+82 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F3
-/BaseFont /Helvetica-Bold
+/Name /F1
+/BaseFont /Helvetica
 /Encoding /WinAnsiEncoding >>
 endobj
-85 0 obj
+83 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F5
 /BaseFont /Times-Roman
 /Encoding /WinAnsiEncoding >>
 endobj
-86 0 obj
+84 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F1
-/BaseFont /Helvetica
+/Name /F3
+/BaseFont /Helvetica-Bold
 /Encoding /WinAnsiEncoding >>
 endobj
-87 0 obj
+85 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F9
-/BaseFont /Courier
+/Name /F2
+/BaseFont /Helvetica-Oblique
 /Encoding /WinAnsiEncoding >>
 endobj
-88 0 obj
+86 0 obj
 << /Type /Font
 /Subtype /Type1
-/Name /F2
-/BaseFont /Helvetica-Oblique
+/Name /F9
+/BaseFont /Courier
 /Encoding /WinAnsiEncoding >>
 endobj
-89 0 obj
+87 0 obj
 << /Type /Font
 /Subtype /Type1
 /Name /F7
@@ -673,18 +662,18 @@
 1 0 obj
 << /Type /Pages
 /Count 8
-/Kids [6 0 R 31 0 R 36 0 R 43 0 R 48 0 R 55 0 R 62 0 R 69 0 R ] >>
+/Kids [6 0 R 31 0 R 36 0 R 43 0 R 48 0 R 55 0 R 62 0 R 67 0 R ] >>
 endobj
 2 0 obj
 << /Type /Catalog
 /Pages 1 0 R
- /Outlines 73 0 R
+ /Outlines 71 0 R
  /PageMode /UseOutlines
  >>
 endobj
 3 0 obj
 << 
-/Font << /F3 84 0 R /F5 85 0 R /F1 86 0 R /F9 87 0 R /F2 88 0 R /F7 89 0 R >> 
+/Font << /F1 82 0 R /F5 83 0 R /F3 84 0 R /F2 85 0 R /F9 86 0 R /F7 87 0 R >> 
 /ProcSet [ /PDF /ImageC /Text ] >> 
 endobj
 9 0 obj
@@ -744,50 +733,44 @@
 27 0 obj
 <<
 /S /GoTo
-/D [62 0 R /XYZ 67.0 281.78 null]
+/D [62 0 R /XYZ 67.0 395.38 null]
 >>
 endobj
-65 0 obj
-<<
-/S /GoTo
-/D [null /XYZ 0.0 0.0 null]
->>
-endobj
-73 0 obj
+71 0 obj
 <<
- /First 74 0 R
- /Last 77 0 R
+ /First 72 0 R
+ /Last 75 0 R
 >> endobj
 xref
-0 90
+0 88
 0000000000 65535 f 
-0000029047 00000 n 
-0000029154 00000 n 
-0000029246 00000 n 
+0000028132 00000 n 
+0000028239 00000 n 
+0000028331 00000 n 
 0000000015 00000 n 
 0000000071 00000 n 
 0000001037 00000 n 
 0000001157 00000 n 
 0000001259 00000 n 
-0000029380 00000 n 
+0000028465 00000 n 
 0000001393 00000 n 
-0000029443 00000 n 
+0000028528 00000 n 
 0000001527 00000 n 
-0000029509 00000 n 
+0000028594 00000 n 
 0000001663 00000 n 
-0000029575 00000 n 
+0000028660 00000 n 
 0000001798 00000 n 
-0000029639 00000 n 
+0000028724 00000 n 
 0000001934 00000 n 
-0000029705 00000 n 
+0000028790 00000 n 
 0000002070 00000 n 
-0000029770 00000 n 
+0000028855 00000 n 
 0000002206 00000 n 
-0000029835 00000 n 
+0000028920 00000 n 
 0000002342 00000 n 
-0000029901 00000 n 
+0000028986 00000 n 
 0000002478 00000 n 
-0000029966 00000 n 
+0000029051 00000 n 
 0000002614 00000 n 
 0000002796 00000 n 
 0000002982 00000 n 
@@ -815,47 +798,45 @@
 0000017063 00000 n 
 0000017245 00000 n 
 0000017431 00000 n 
-0000020219 00000 n 
-0000020342 00000 n 
-0000020390 00000 n 
-0000020560 00000 n 
-0000020729 00000 n 
-0000020911 00000 n 
-0000021097 00000 n 
-0000024111 00000 n 
-0000024234 00000 n 
-0000024275 00000 n 
-0000030031 00000 n 
-0000024412 00000 n 
-0000024594 00000 n 
-0000024780 00000 n 
-0000025578 00000 n 
-0000025701 00000 n 
-0000025735 00000 n 
-0000025917 00000 n 
-0000030090 00000 n 
-0000026103 00000 n 
-0000026236 00000 n 
-0000026416 00000 n 
-0000026675 00000 n 
-0000026878 00000 n 
-0000027090 00000 n 
-0000027330 00000 n 
-0000027641 00000 n 
-0000027892 00000 n 
-0000028062 00000 n 
-0000028385 00000 n 
-0000028498 00000 n 
-0000028608 00000 n 
-0000028716 00000 n 
-0000028822 00000 n 
-0000028938 00000 n 
+0000020184 00000 n 
+0000020307 00000 n 
+0000020355 00000 n 
+0000020525 00000 n 
+0000020694 00000 n 
+0000020876 00000 n 
+0000021062 00000 n 
+0000023638 00000 n 
+0000023761 00000 n 
+0000023795 00000 n 
+0000023977 00000 n 
+0000024163 00000 n 
+0000024663 00000 n 
+0000024786 00000 n 
+0000024820 00000 n 
+0000025002 00000 n 
+0000029116 00000 n 
+0000025188 00000 n 
+0000025321 00000 n 
+0000025501 00000 n 
+0000025760 00000 n 
+0000025963 00000 n 
+0000026175 00000 n 
+0000026415 00000 n 
+0000026726 00000 n 
+0000026977 00000 n 
+0000027147 00000 n 
+0000027470 00000 n 
+0000027578 00000 n 
+0000027688 00000 n 
+0000027801 00000 n 
+0000027917 00000 n 
+0000028023 00000 n 
 trailer
 <<
-/Size 90
+/Size 88
 /Root 2 0 R
 /Info 4 0 R
 >>
 startxref
-30141
+29167
 %%EOF



---------------------------------------------------------------------
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


Mime
View raw message