vmote       2003/08/20 11:09:46

  Modified:    src/java/org/apache/fop/apps Driver.java
               src/java/org/apache/fop/extensions Bookmarks.java
               src/java/org/apache/fop/mif MIFHandler.java
               src/java/org/apache/fop/render PrintRenderer.java
               src/java/org/apache/fop/render/awt AWTRenderer.java
                        FontSetup.java
               src/java/org/apache/fop/render/pdf FontSetup.java
                        PDFRenderer.java PDFXMLHandler.java
               src/java/org/apache/fop/render/ps PSDocumentGraphics2D.java
                        PSGraphics2D.java PSProcSets.java PSRenderer.java
                        PSTextElementBridge.java PSTextPainter.java
                        PSTranscoder.java PSXMLHandler.java
               src/java/org/apache/fop/render/svg SVGRenderer.java
               src/java/org/apache/fop/render/xml XMLRenderer.java
               src/java/org/apache/fop/rtf/renderer RTFHandler.java
               src/java/org/apache/fop/svg PDFDocumentGraphics2D.java
                        PDFGraphics2D.java PDFTextElementBridge.java
                        PDFTextPainter.java PDFTranscoder.java
               src/java/org/apache/fop/tools AreaTreeBuilder.java
  Added:       src/java/org/apache/fop/apps Document.java
  Removed:     src/java/org/apache/fop/control Document.java
  Log:
  move control/Document to apps/Document
  
  Revision  Changes    Path
  1.32      +1 -1      xml-fop/src/java/org/apache/fop/apps/Driver.java
  
  Index: Driver.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/apps/Driver.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- Driver.java       20 Aug 2003 17:56:24 -0000      1.31
  +++ Driver.java       20 Aug 2003 18:09:45 -0000      1.32
  @@ -52,7 +52,7 @@
   
   // FOP
   import org.apache.fop.area.AreaTree;
  -import org.apache.fop.control.Document;
  +
   import org.apache.fop.fo.ElementMapping;
   import org.apache.fop.fo.FOTreeBuilder;
   import org.apache.fop.fo.FOUserAgent;
  
  
  
  1.1                  xml-fop/src/java/org/apache/fop/apps/Document.java
  
  Index: Document.java
  ===================================================================
  /*
   * $Id: Document.java,v 1.1 2003/08/20 18:09:45 vmote Exp $
   * ============================================================================
   *                    The Apache Software License, Version 1.1
   * ============================================================================
   *
   * Copyright (C) 1999-2003 The Apache Software Foundation. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without modifica-
   * tion, are permitted provided that the following conditions are met:
   *
   * 1. Redistributions of source code must retain the above copyright notice,
   *    this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright notice,
   *    this list of conditions and the following disclaimer in the documentation
   *    and/or other materials provided with the distribution.
   *
   * 3. The end-user documentation included with the redistribution, if any, must
   *    include the following acknowledgment: "This product includes software
   *    developed by the Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself, if
   *    and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "FOP" and "Apache Software Foundation" must not be used to
   *    endorse or promote products derived from this software without prior
   *    written permission. For written permission, please contact
   *    [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache", nor may
   *    "Apache" appear in their name, without prior written permission of the
   *    Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
   * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
   * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
   * APACHE SOFTWARE FOUNDATION OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
   * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLU-
   * DING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
   * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
   * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   * ============================================================================
   *
   * This software consists of voluntary contributions made by many individuals
   * on behalf of the Apache Software Foundation and was originally created by
   * James Tauber <[EMAIL PROTECTED]>. For more information on the Apache
   * Software Foundation, please see <http://www.apache.org/>.
   */
  package org.apache.fop.apps;
  
  // Java
  import java.util.Map;
  import java.io.IOException;
  
  // FOP
  import org.apache.fop.area.AreaTree;
  import org.apache.fop.area.AreaTreeModel;
  
  
  import org.apache.fop.fo.FOTreeControl;
  import org.apache.fop.fo.FOTreeEvent;
  import org.apache.fop.fo.FOTreeListener;
  import org.apache.fop.fo.pagination.PageSequence;
  import org.apache.fop.fonts.Font;
  import org.apache.fop.fonts.FontMetrics;
  import org.apache.fop.layout.LayoutStrategy;
  
  // SAX
  import org.xml.sax.SAXException;
  
  /**
   * Class storing information for the FOP Document being processed, and managing
   * the processing of it.
   */
  public class Document implements FOTreeControl, FOTreeListener {
  
      /** The parent Driver object */
      private Driver driver;
  
      /** Map containing fonts that have been used */
      private Map usedFonts;
  
      /** look up a font-triplet to find a font-name */
      private Map triplets;
  
      /** look up a font-name to get a font (that implements FontMetrics at least) */
      private Map fonts;
  
      /**
       * the LayoutStrategy to be used to process this document
       * TODO: this actually belongs in the RenderContext class, when it is
       * created
       */
      private LayoutStrategy layoutStrategy = null;
  
      /**
       * The current AreaTree for the PageSequence being rendered.
       */
      public AreaTree areaTree;
      public AreaTreeModel atModel;
  
      /**
       * Main constructor
       * @param driver the Driver object that is the "parent" of this Document
       */
      public Document(Driver driver) {
          this.driver = driver;
          this.triplets = new java.util.HashMap();
          this.fonts = new java.util.HashMap();
          this.usedFonts = new java.util.HashMap();
      }
  
      /**
       * Checks if the font setup is valid (At least the ultimate fallback font
       * must be registered.)
       * @return True if valid
       */
      public boolean isSetupValid() {
          return triplets.containsKey(Font.DEFAULT_FONT);
      }
  
      /**
       * Adds a new font triplet.
       * @param name internal key
       * @param family font family name
       * @param style font style (normal, italic, oblique...)
       * @param weight font weight
       */
      public void addFontProperties(String name, String family, String style,
                                    int weight) {
          /*
           * add the given family, style and weight as a lookup for the font
           * with the given name
           */
  
          String key = createFontKey(family, style, weight);
          this.triplets.put(key, name);
      }
  
      /**
       * Adds font metrics for a specific font.
       * @param name internal key
       * @param metrics metrics to register
       */
      public void addMetrics(String name, FontMetrics metrics) {
          // add the given metrics as a font with the given name
  
          this.fonts.put(name, metrics);
      }
  
      /**
       * Lookup a font.
       * <br>
       * Locate the font name for a given family, style and weight.
       * The font name can then be used as a key as it is unique for
       * the associated document.
       * This also adds the font to the list of used fonts.
       * @param family font family
       * @param style font style
       * @param weight font weight
       * @return internal key
       */
      public String fontLookup(String family, String style,
                               int weight) {
          String key;
          // first try given parameters
          key = createFontKey(family, style, weight);
          String f = (String)triplets.get(key);
          if (f == null) {
              // then adjust weight, favouring normal or bold
              f = findAdjustWeight(family, style, weight);
  
              // then try any family with orig weight
              if (f == null) {
                  key = createFontKey("any", style, weight);
                  f = (String)triplets.get(key);
              }
  
              // then try any family with adjusted weight
              if (f == null) {
                  f = findAdjustWeight(family, style, weight);
              }
  
              // then use default
              if (f == null) {
                  f = (String)triplets.get(Font.DEFAULT_FONT);
              }
  
          }
  
          usedFonts.put(f, fonts.get(f));
          return f;
      }
  
      /**
       * Find a font with a given family and style by trying
       * different font weights according to the spec.
       * @param family font family
       * @param style font style
       * @param weight font weight
       * @return internal key
       */
      public String findAdjustWeight(String family, String style,
                               int weight) {
          String key;
          String f = null;
          int newWeight = weight;
          if (newWeight < 400) {
              while (f == null && newWeight > 0) {
                  newWeight -= 100;
                  key = createFontKey(family, style, newWeight);
                  f = (String)triplets.get(key);
              }
          } else if (newWeight == 500) {
              key = createFontKey(family, style, 400);
              f = (String)triplets.get(key);
          } else if (newWeight > 500) {
              while (f == null && newWeight < 1000) {
                  newWeight += 100;
                  key = createFontKey(family, style, newWeight);
                  f = (String)triplets.get(key);
              }
              newWeight = weight;
              while (f == null && newWeight > 400) {
                  newWeight -= 100;
                  key = createFontKey(family, style, newWeight);
                  f = (String)triplets.get(key);
              }
          }
          if (f == null) {
              key = createFontKey(family, style, 400);
              f = (String)triplets.get(key);
          }
  
          return f;
      }
  
      /**
       * Determines if a particular font is available.
       * @param family font family
       * @param style font style
       * @param weight font weight
       * @return True if available
       */
      public boolean hasFont(String family, String style, int weight) {
          String key = createFontKey(family, style, weight);
          return this.triplets.containsKey(key);
      }
  
      /**
       * Creates a key from the given strings.
       * @param family font family
       * @param style font style
       * @param weight font weight
       * @return internal key
       */
      public static String createFontKey(String family, String style,
                                         int weight) {
          return family + "," + style + "," + weight;
      }
  
      /**
       * Gets a Map of all registred fonts.
       * @return a read-only Map with font key/FontMetrics pairs
       */
      public Map getFonts() {
          return java.util.Collections.unmodifiableMap(this.fonts);
      }
  
      /**
       * This is used by the renderers to retrieve all the
       * fonts used in the document.
       * This is for embedded font or creating a list of used fonts.
       * @return a read-only Map with font key/FontMetrics pairs
       */
      public Map getUsedFonts() {
          return this.usedFonts;
      }
  
      /**
       * Returns the FontMetrics for a particular font
       * @param fontName internal key
       * @return font metrics
       */
      public FontMetrics getMetricsFor(String fontName) {
          usedFonts.put(fontName, fonts.get(fontName));
          return (FontMetrics)fonts.get(fontName);
      }
  
      /**
       * Set the LayoutStrategy to be used to process this Document
       * @param ls the LayoutStrategy object to be used to process this Document
       */
      public void setLayoutStrategy(LayoutStrategy ls) {
          this.layoutStrategy = ls;
      }
  
      /**
       * @return this Document's LayoutStrategy object
       */
      public LayoutStrategy getLayoutStrategy () {
          return layoutStrategy;
      }
  
      /**
       * Public accessor for the parent Driver of this Document
       * @return the parent Driver for this Document
       */
      public Driver getDriver() {
          return driver;
      }
  
      /**
       * Required by the FOTreeListener interface. It handles an
       * FOTreeEvent that is fired when a PageSequence object has been completed.
       * @param event the FOTreeEvent that was fired
       * @throws FOPException for errors in building the PageSequence
       */
      public void foPageSequenceComplete (FOTreeEvent event) throws FOPException {
          PageSequence pageSeq = event.getPageSequence();
          layoutStrategy.format(pageSeq, areaTree);
      }
  
      /**
       * Required by the FOTreeListener interface. It handles an FOTreeEvent that
       * is fired when the Document has been completely parsed.
       * @param event the FOTreeEvent that was fired
       * @throws SAXException for parsing errors
       */
      public void foDocumentComplete (FOTreeEvent event) throws SAXException {
          //processAreaTree(atModel);
          try {
              areaTree.endDocument();
              driver.getRenderer().stopRenderer();
          } catch (IOException ex) {
              throw new SAXException(ex);
          }
      }
  
      /**
       * Get the area tree for this layout handler.
       *
       * @return the area tree for this document
       */
      public AreaTree getAreaTree() {
          return areaTree;
      }
  
  }
  
  
  
  
  1.10      +1 -1      xml-fop/src/java/org/apache/fop/extensions/Bookmarks.java
  
  Index: Bookmarks.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/extensions/Bookmarks.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Bookmarks.java    20 Aug 2003 16:35:27 -0000      1.9
  +++ Bookmarks.java    20 Aug 2003 18:09:45 -0000      1.10
  @@ -54,7 +54,7 @@
   import org.apache.fop.fo.FONode;
   import org.apache.fop.fo.FOTreeVisitor;
   import org.apache.fop.area.AreaTree;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   import java.util.ArrayList;
   
  
  
  
  1.11      +1 -1      xml-fop/src/java/org/apache/fop/mif/MIFHandler.java
  
  Index: MIFHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/mif/MIFHandler.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- MIFHandler.java   15 Aug 2003 15:52:10 -0000      1.10
  +++ MIFHandler.java   20 Aug 2003 18:09:45 -0000      1.11
  @@ -65,7 +65,7 @@
   import org.apache.fop.fo.pagination.PageSequence;
   import org.apache.fop.fo.pagination.PageSequenceMaster;
   import org.apache.fop.fo.pagination.SimplePageMaster;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.fo.flow.ExternalGraphic;
   import org.apache.fop.fo.flow.InstreamForeignObject;
  
  
  
  1.5       +1 -1      xml-fop/src/java/org/apache/fop/render/PrintRenderer.java
  
  Index: PrintRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/PrintRenderer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PrintRenderer.java        19 Aug 2003 06:54:31 -0000      1.4
  +++ PrintRenderer.java        20 Aug 2003 18:09:45 -0000      1.5
  @@ -52,7 +52,7 @@
   
   // FOP
   import org.apache.fop.render.pdf.FontSetup;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fo.FOTreeControl;
   
   // Java
  
  
  
  1.7       +1 -1      xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
  
  Index: AWTRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- AWTRenderer.java  19 Aug 2003 06:54:31 -0000      1.6
  +++ AWTRenderer.java  20 Aug 2003 18:09:45 -0000      1.7
  @@ -77,7 +77,7 @@
   
   // FOP
   import org.apache.fop.apps.InputHandler;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fo.FOTreeControl;
   import org.apache.fop.render.AbstractRenderer;
   import org.apache.fop.viewer.PreviewDialog;
  
  
  
  1.4       +1 -1      xml-fop/src/java/org/apache/fop/render/awt/FontSetup.java
  
  Index: FontSetup.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/FontSetup.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- FontSetup.java    14 Aug 2003 19:16:41 -0000      1.3
  +++ FontSetup.java    20 Aug 2003 18:09:45 -0000      1.4
  @@ -51,7 +51,7 @@
   package org.apache.fop.render.awt;
   
   // FOP
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fonts.Font;
   
   // Java
  
  
  
  1.9       +1 -1      xml-fop/src/java/org/apache/fop/render/pdf/FontSetup.java
  
  Index: FontSetup.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/FontSetup.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- FontSetup.java    19 Aug 2003 06:54:31 -0000      1.8
  +++ FontSetup.java    20 Aug 2003 18:09:45 -0000      1.9
  @@ -58,7 +58,7 @@
   import org.apache.fop.fonts.FontDescriptor;
   import org.apache.fop.fonts.FontUtil;
   import org.apache.fop.fonts.LazyFont;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.pdf.PDFDocument;
   import org.apache.fop.pdf.PDFResources;
   // FOP (base 14 fonts)
  
  
  
  1.10      +2 -1      xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java
  
  Index: PDFRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFRenderer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PDFRenderer.java  19 Aug 2003 06:54:31 -0000      1.9
  +++ PDFRenderer.java  20 Aug 2003 18:09:45 -0000      1.10
  @@ -117,6 +117,7 @@
   import org.apache.fop.fonts.Font;
   import org.apache.fop.traits.BorderProps;
   import org.apache.fop.datatypes.ColorType;
  +import org.apache.fop.apps.*;
   
   /*
   todo:
  @@ -283,7 +284,7 @@
        */
       public void stopRenderer() throws IOException {
           FontSetup.addToResources(pdfDoc, pdfDoc.getResources(),
  -                                 (org.apache.fop.control.Document)fontInfo);
  +                                 (org.apache.fop.apps.Document)fontInfo);
           pdfDoc.outputTrailer(ostream);
   
           this.pdfDoc = null;
  
  
  
  1.3       +1 -1      xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java
  
  Index: PDFXMLHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/PDFXMLHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PDFXMLHandler.java        14 Aug 2003 07:42:58 -0000      1.2
  +++ PDFXMLHandler.java        20 Aug 2003 18:09:45 -0000      1.3
  @@ -62,7 +62,7 @@
   import org.apache.fop.svg.PDFAElementBridge;
   import org.apache.fop.svg.PDFGraphics2D;
   import org.apache.fop.svg.SVGUserAgent;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   /* org.w3c.dom.Document is not imported to avoid conflict with
      org.apache.fop.control.Document */
  
  
  
  1.7       +1 -1      
xml-fop/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java
  
  Index: PSDocumentGraphics2D.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSDocumentGraphics2D.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PSDocumentGraphics2D.java 15 Aug 2003 15:52:10 -0000      1.6
  +++ PSDocumentGraphics2D.java 20 Aug 2003 18:09:45 -0000      1.7
  @@ -62,7 +62,7 @@
   
   //FOP
   import org.apache.fop.render.pdf.FontSetup;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   /**
    * This class is a wrapper for the <tt>PSGraphics2D</tt> that
  
  
  
  1.5       +1 -1      xml-fop/src/java/org/apache/fop/render/ps/PSGraphics2D.java
  
  Index: PSGraphics2D.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSGraphics2D.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PSGraphics2D.java 14 Aug 2003 15:31:10 -0000      1.4
  +++ PSGraphics2D.java 20 Aug 2003 18:09:45 -0000      1.5
  @@ -84,7 +84,7 @@
   import java.io.IOException;
   
   // FOP
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fonts.Font;
   
   // Batik
  
  
  
  1.6       +1 -1      xml-fop/src/java/org/apache/fop/render/ps/PSProcSets.java
  
  Index: PSProcSets.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSProcSets.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PSProcSets.java   14 Aug 2003 14:59:56 -0000      1.5
  +++ PSProcSets.java   20 Aug 2003 18:09:45 -0000      1.6
  @@ -56,7 +56,7 @@
   
   import org.apache.fop.fonts.Typeface;
   import org.apache.fop.fonts.Glyphs;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   /**
    * This class defines the basic resources (procsets) used by FOP's PostScript
  
  
  
  1.10      +1 -1      xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java
  
  Index: PSRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSRenderer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PSRenderer.java   19 Aug 2003 06:54:31 -0000      1.9
  +++ PSRenderer.java   20 Aug 2003 18:09:45 -0000      1.10
  @@ -73,7 +73,7 @@
   import org.apache.fop.datatypes.ColorType;
   import org.apache.fop.fo.FOUserAgent;
   import org.apache.fop.fonts.Typeface;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.render.AbstractRenderer;
   import org.apache.fop.render.RendererContext;
   import org.apache.fop.fo.FOTreeControl;
  
  
  
  1.3       +1 -1      
xml-fop/src/java/org/apache/fop/render/ps/PSTextElementBridge.java
  
  Index: PSTextElementBridge.java
  ===================================================================
  RCS file: 
/home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSTextElementBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PSTextElementBridge.java  14 Aug 2003 07:42:58 -0000      1.2
  +++ PSTextElementBridge.java  20 Aug 2003 18:09:45 -0000      1.3
  @@ -56,7 +56,7 @@
   //import org.apache.batik.bridge.TextUtilities;
   import org.apache.batik.gvt.GraphicsNode;
   
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   import org.w3c.dom.Element;
   import org.w3c.dom.Node;
  
  
  
  1.6       +1 -1      xml-fop/src/java/org/apache/fop/render/ps/PSTextPainter.java
  
  Index: PSTextPainter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSTextPainter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PSTextPainter.java        14 Aug 2003 19:16:41 -0000      1.5
  +++ PSTextPainter.java        20 Aug 2003 18:09:45 -0000      1.6
  @@ -75,7 +75,7 @@
   
   import org.apache.fop.fonts.FontMetrics;
   import org.apache.fop.fonts.Font;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   /**
    * Renders the attributed character iterator of a <tt>TextNode</tt>.
  
  
  
  1.4       +1 -0      xml-fop/src/java/org/apache/fop/render/ps/PSTranscoder.java
  
  Index: PSTranscoder.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSTranscoder.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PSTranscoder.java 14 Aug 2003 07:42:58 -0000      1.3
  +++ PSTranscoder.java 20 Aug 2003 18:09:45 -0000      1.4
  @@ -85,6 +85,7 @@
   import org.w3c.dom.Document;
   import org.w3c.dom.svg.SVGDocument;
   import org.w3c.dom.svg.SVGSVGElement;
  +import org.apache.fop.apps.*;
   
   /**
    * This class enables to transcode an input to a PostScript document.
  
  
  
  1.3       +5 -5      xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java
  
  Index: PSXMLHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/ps/PSXMLHandler.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PSXMLHandler.java 14 Aug 2003 07:42:58 -0000      1.2
  +++ PSXMLHandler.java 20 Aug 2003 18:09:45 -0000      1.3
  @@ -68,7 +68,7 @@
   import org.apache.batik.gvt.TextPainter;
   
   // FOP
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.render.XMLHandler;
   import org.apache.fop.render.RendererContext;
   import org.apache.fop.svg.SVGUserAgent;
  @@ -150,7 +150,7 @@
       public static PSInfo getPSInfo(RendererContext context) {
           PSInfo psi = new PSInfo();
           psi.psGenerator = (PSGenerator)context.getProperty(PS_GENERATOR);
  -        psi.fontInfo = 
(org.apache.fop.control.Document)context.getProperty(PS_FONT_INFO);
  +        psi.fontInfo = 
(org.apache.fop.apps.Document)context.getProperty(PS_FONT_INFO);
           psi.width = ((Integer)context.getProperty(PS_WIDTH)).intValue();
           psi.height = ((Integer)context.getProperty(PS_HEIGHT)).intValue();
           psi.currentXPosition = ((Integer)context.getProperty(PS_XPOS)).intValue();
  @@ -166,7 +166,7 @@
           /** see PS_GENERATOR */
           private PSGenerator psGenerator;
           /** see PS_FONT_INFO */
  -        private org.apache.fop.control.Document fontInfo;
  +        private org.apache.fop.apps.Document fontInfo;
           /** see PS_PAGE_WIDTH */
           private int width;
           /** see PS_PAGE_HEIGHT */
  @@ -195,7 +195,7 @@
            * Returns the fontInfo.
            * @return FontInfo
            */
  -        public org.apache.fop.control.Document getFontInfo() {
  +        public org.apache.fop.apps.Document getFontInfo() {
               return fontInfo;
           }
   
  @@ -203,7 +203,7 @@
            * Sets the fontInfo.
            * @param fontInfo The fontInfo to set
            */
  -        public void setFontInfo(org.apache.fop.control.Document fontInfo) {
  +        public void setFontInfo(org.apache.fop.apps.Document fontInfo) {
               this.fontInfo = fontInfo;
           }
   
  
  
  
  1.5       +1 -1      xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java
  
  Index: SVGRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/svg/SVGRenderer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SVGRenderer.java  19 Aug 2003 06:54:31 -0000      1.4
  +++ SVGRenderer.java  20 Aug 2003 18:09:45 -0000      1.5
  @@ -57,7 +57,7 @@
   import org.apache.fop.area.inline.Leader;
   import org.apache.fop.area.inline.Word;
   import org.apache.fop.svg.SVGUtilities;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fo.FOUserAgent;
   import org.apache.fop.fo.properties.RuleStyle;
   import org.apache.fop.fo.FOTreeControl;
  
  
  
  1.5       +1 -1      xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java
  
  Index: XMLRenderer.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/xml/XMLRenderer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- XMLRenderer.java  19 Aug 2003 06:54:31 -0000      1.4
  +++ XMLRenderer.java  20 Aug 2003 18:09:45 -0000      1.5
  @@ -68,7 +68,7 @@
   import org.apache.fop.render.RendererContext;
   import org.apache.fop.render.XMLHandler;
   import org.apache.fop.fo.FOUserAgent;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.apps.FOPException;
   import org.apache.fop.area.BeforeFloat;
   import org.apache.fop.area.Block;
  
  
  
  1.15      +1 -1      xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java
  
  Index: RTFHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/rtf/renderer/RTFHandler.java,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- RTFHandler.java   15 Aug 2003 15:52:10 -0000      1.14
  +++ RTFHandler.java   20 Aug 2003 18:09:46 -0000      1.15
  @@ -72,7 +72,7 @@
   import org.apache.fop.fo.pagination.Flow;
   import org.apache.fop.fo.pagination.PageSequence;
   import org.apache.fop.fo.properties.Constants;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.rtf.rtflib.rtfdoc.RtfAttributes;
   import org.apache.fop.rtf.rtflib.rtfdoc.RtfColorTable;
   import org.apache.fop.rtf.rtflib.rtfdoc.RtfDocumentArea;
  
  
  
  1.6       +1 -1      xml-fop/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
  
  Index: PDFDocumentGraphics2D.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PDFDocumentGraphics2D.java        15 Aug 2003 15:52:10 -0000      1.5
  +++ PDFDocumentGraphics2D.java        20 Aug 2003 18:09:46 -0000      1.6
  @@ -69,7 +69,7 @@
   import org.apache.avalon.framework.logger.ConsoleLogger;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   import java.awt.Graphics;
   import java.awt.Font;
  
  
  
  1.10      +1 -1      xml-fop/src/java/org/apache/fop/svg/PDFGraphics2D.java
  
  Index: PDFGraphics2D.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFGraphics2D.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- PDFGraphics2D.java        15 Aug 2003 15:52:10 -0000      1.9
  +++ PDFGraphics2D.java        20 Aug 2003 18:09:46 -0000      1.10
  @@ -64,7 +64,7 @@
   import org.apache.fop.pdf.PDFLink;
   import org.apache.fop.pdf.PDFAnnotList;
   import org.apache.fop.pdf.BitmapImage;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fonts.Font;
   import org.apache.fop.render.pdf.FontSetup;
   import org.apache.fop.fonts.FontMetrics;
  
  
  
  1.3       +1 -1      xml-fop/src/java/org/apache/fop/svg/PDFTextElementBridge.java
  
  Index: PDFTextElementBridge.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFTextElementBridge.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PDFTextElementBridge.java 14 Aug 2003 07:42:58 -0000      1.2
  +++ PDFTextElementBridge.java 20 Aug 2003 18:09:46 -0000      1.3
  @@ -56,7 +56,7 @@
   import org.apache.batik.bridge.TextUtilities;
   import org.apache.batik.gvt.GraphicsNode;
   
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   import org.w3c.dom.Element;
   import org.w3c.dom.Node;
  
  
  
  1.6       +1 -1      xml-fop/src/java/org/apache/fop/svg/PDFTextPainter.java
  
  Index: PDFTextPainter.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFTextPainter.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- PDFTextPainter.java       14 Aug 2003 19:16:41 -0000      1.5
  +++ PDFTextPainter.java       20 Aug 2003 18:09:46 -0000      1.6
  @@ -74,7 +74,7 @@
   
   import org.apache.fop.fonts.FontMetrics;
   import org.apache.fop.fonts.Font;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   
   /**
    * Renders the attributed character iterator of a <tt>TextNode</tt>.
  
  
  
  1.5       +1 -0      xml-fop/src/java/org/apache/fop/svg/PDFTranscoder.java
  
  Index: PDFTranscoder.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/svg/PDFTranscoder.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- PDFTranscoder.java        14 Aug 2003 07:42:58 -0000      1.4
  +++ PDFTranscoder.java        20 Aug 2003 18:09:46 -0000      1.5
  @@ -76,6 +76,7 @@
   import org.w3c.dom.Document;
   import org.w3c.dom.svg.SVGDocument;
   import org.w3c.dom.svg.SVGSVGElement;
  +import org.apache.fop.apps.*;
   
   /**
    * This class enables to transcode an input to a pdf document.
  
  
  
  1.6       +1 -1      xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java
  
  Index: AreaTreeBuilder.java
  ===================================================================
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/tools/AreaTreeBuilder.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- AreaTreeBuilder.java      15 Aug 2003 15:52:10 -0000      1.5
  +++ AreaTreeBuilder.java      20 Aug 2003 18:09:46 -0000      1.6
  @@ -100,7 +100,7 @@
   import org.apache.fop.area.inline.Space;
   import org.apache.fop.area.inline.Viewport;
   import org.apache.fop.area.inline.Word;
  -import org.apache.fop.control.Document;
  +import org.apache.fop.apps.Document;
   import org.apache.fop.fonts.Font;
   import org.apache.fop.render.Renderer;
   import org.apache.fop.render.pdf.PDFRenderer;
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to