cvs commit: xml-fop/src/java/org/apache/fop/render/pdf FontReader.java

2003-08-14 Thread vmote
vmote   2003/08/12 11:27:35

  Modified:src/java/org/apache/fop/fonts LazyFont.java
  Added:   src/java/org/apache/fop/fonts FontReader.java
  Removed: src/java/org/apache/fop/render/pdf FontReader.java
  Log:
  move render.pdf.FontReader to fonts.FontReader
  
  Revision  ChangesPath
  1.3   +1 -1  xml-fop/src/java/org/apache/fop/fonts/LazyFont.java
  
  Index: LazyFont.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fonts/LazyFont.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LazyFont.java 15 Mar 2003 16:50:56 -  1.2
  +++ LazyFont.java 12 Aug 2003 18:27:35 -  1.3
  @@ -54,7 +54,7 @@
   import java.util.Map;
   
   //FOP
  -import org.apache.fop.render.pdf.FontReader;
  +
   
   /**
* This class is used to defer the loading of a font until it is really used.
  
  
  
  1.1  xml-fop/src/java/org/apache/fop/fonts/FontReader.java
  
  Index: FontReader.java
  ===
  /*
   * $Id: FontReader.java,v 1.1 2003/08/12 18:27:35 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.fonts;
  
  //Java
  import java.util.List;
  import java.util.Map;
  import java.io.IOException;
  
  import javax.xml.parsers.SAXParserFactory;
  
  //SAX
  import org.xml.sax.XMLReader;
  import org.xml.sax.SAXException;
  import org.xml.sax.Locator;
  import org.xml.sax.Attributes;
  import org.xml.sax.helpers.DefaultHandler;
  
  //FOP
  import org.apache.fop.apps.FOPException;
  
  /**
   * Class for reading a metric.xml file and creating a font object.
   * Typical usage:
   * pre
   * FontReader reader = new FontReader(path til metrics.xml);
   * reader.setFontEmbedPath(path to a .ttf or .pfb file or null to diable 
embedding);
   * reader.useKerning(true);
   * Font f = reader.getFont();
   * /pre
   */
  public class FontReader extends DefaultHandler {
  
  private Locator locator = null;
  private boolean isCID = false;
  private CustomFont returnFont = null;
  

cvs commit: xml-fop/src/java/org/apache/fop/render/pdf FontReader.java

2003-03-15 Thread jeremias
jeremias2003/03/15 08:58:59

  Modified:src/java/org/apache/fop/render/pdf FontReader.java
  Log:
  Fix parser construction.
  
  Revision  ChangesPath
  1.2   +5 -1  xml-fop/src/java/org/apache/fop/render/pdf/FontReader.java
  
  Index: FontReader.java
  ===
  RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/pdf/FontReader.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- FontReader.java   11 Mar 2003 13:05:13 -  1.1
  +++ FontReader.java   15 Mar 2003 16:58:59 -  1.2
  @@ -55,6 +55,8 @@
   import java.util.Map;
   import java.io.IOException;
   
  +import javax.xml.parsers.SAXParserFactory;
  +
   //SAX
   import org.xml.sax.XMLReader;
   import org.xml.sax.SAXException;
  @@ -102,7 +104,9 @@
   XMLReader parser = null;
   
   try {
  -parser = 
javax.xml.parsers.SAXParserFactory.newInstance().newSAXParser().getXMLReader();
  +final SAXParserFactory factory = 
javax.xml.parsers.SAXParserFactory.newInstance();
  +factory.setNamespaceAware(true);
  +parser = factory.newSAXParser().getXMLReader();
   } catch (Exception e) {
   throw new FOPException(e);
   }
  
  
  

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