xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spepp...@apache.org
Subject svn commit: r627882 [2/41] - in /xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./ examples/embedding/ examples/embedding/java/embedding/ examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/ examples/fo/ examples/f...
Date Thu, 14 Feb 2008 21:57:53 GMT

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-610888
+/xmlgraphics/fop/trunk:1-627830

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml Thu Feb 14 13:55:44 2008
@@ -609,7 +609,7 @@
       <include name="org/apache/fop/image/Abstract*"/>
       <include name="org/apache/fop/image/analyser/*.class"/>
       <include name="org/apache/fop/util/CMYKColorSpace*.class"/>
-      <include name="org/apache/fop/util/ColorExt*.class"/>
+      <include name="org/apache/fop/util/Color*.class"/>
       <include name="org/apache/fop/util/ASCII*.class"/>
       <include name="org/apache/fop/util/*OutputStream.class"/>
       <include name="org/apache/fop/util/SubInputStream.class"/>
@@ -1018,6 +1018,7 @@
         overview="${src.dir}/java/org/apache/fop/overview.html"
         use="true"
         failonerror="true"
+        source="${javac.source}"
         public="${javadoc.public}"
         package="${javadoc.package}"
         private="${javadoc.private}">

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/checkstyle-3.5-fop-head.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/checkstyle-4.0.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/checkstyle-4.0.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/build.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleAWTViewer.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleAWTViewer.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleAWTViewer.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleAWTViewer.java Thu Feb 14 13:55:44 2008
@@ -1,113 +1,113 @@
-/*
- * 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$ */
- 
-package embedding;
-
-//Java
-import java.io.File;
-import java.io.IOException;
-
-//JAXP
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.sax.SAXResult;
-
-//Avalon
-import org.apache.avalon.framework.ExceptionUtil;
-
-//FOP
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FopFactory;
-import org.apache.fop.apps.MimeConstants;
-
-/**
- * This class demonstrates the use of the AWT Viewer.
- */
-public class ExampleAWTViewer {
-
-    // configure fopFactory as desired
-    private FopFactory fopFactory = FopFactory.newInstance();
-
-    /**
-     * Display an FO file in the AWT Preview.
-     * @param fo the FO file
-     * @throws IOException In case of an I/O problem
-     * @throws FOPException In case of a problem during layout
-     * @throws TransformerException In case of a problem during XML processing
-     */
-    public void viewFO(File fo)
-                throws IOException, FOPException, TransformerException {
-
-        //Setup FOP
-        Fop fop = fopFactory.newFop(MimeConstants.MIME_FOP_AWT_PREVIEW);
-
-        try {
-
-            //Load XSL-FO file (you can also do an XSL transformation here)
-            TransformerFactory factory = TransformerFactory.newInstance();
-            Transformer transformer = factory.newTransformer();
-            Source src = new StreamSource(fo);
-            Result res = new SAXResult(fop.getDefaultHandler());
-            transformer.transform(src, res);
-
-        } catch (Exception e) {
-            if (e instanceof FOPException) {
-                throw (FOPException)e;
-            }
-            throw new FOPException(e);
-        }
-    }
-
-    /**
-     * Main method.
-     * @param args the command-line arguments
-     */
-    public static void main(String[] args) {
-        try {
-            System.out.println("FOP ExampleAWTViewer\n");
-            System.out.println("Preparing...");
-
-            //Setup directories
-            File baseDir = new File(".");
-            File outDir = new File(baseDir, "out");
-            outDir.mkdirs();
-
-            //Setup input and output files
-            File fofile = new File(baseDir, "xml/fo/helloworld.fo");
-
-            System.out.println("Input: XSL-FO (" + fofile + ")");
-            System.out.println("Output: AWT Viewer");
-            System.out.println();
-            System.out.println("Starting AWT Viewer...");
-
-            ExampleAWTViewer app = new ExampleAWTViewer();
-            app.viewFO(fofile);
-
-            System.out.println("Success!");
-        } catch (Exception e) {
-            System.err.println(ExceptionUtil.printStackTrace(e));
-            System.exit(-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$ */
+ 
+package embedding;
+
+//Java
+import java.io.File;
+import java.io.IOException;
+
+//JAXP
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.Source;
+import javax.xml.transform.Result;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.sax.SAXResult;
+
+//Avalon
+import org.apache.avalon.framework.ExceptionUtil;
+
+//FOP
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.apps.MimeConstants;
+
+/**
+ * This class demonstrates the use of the AWT Viewer.
+ */
+public class ExampleAWTViewer {
+
+    // configure fopFactory as desired
+    private FopFactory fopFactory = FopFactory.newInstance();
+
+    /**
+     * Display an FO file in the AWT Preview.
+     * @param fo the FO file
+     * @throws IOException In case of an I/O problem
+     * @throws FOPException In case of a problem during layout
+     * @throws TransformerException In case of a problem during XML processing
+     */
+    public void viewFO(File fo)
+                throws IOException, FOPException, TransformerException {
+
+        //Setup FOP
+        Fop fop = fopFactory.newFop(MimeConstants.MIME_FOP_AWT_PREVIEW);
+
+        try {
+
+            //Load XSL-FO file (you can also do an XSL transformation here)
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Transformer transformer = factory.newTransformer();
+            Source src = new StreamSource(fo);
+            Result res = new SAXResult(fop.getDefaultHandler());
+            transformer.transform(src, res);
+
+        } catch (Exception e) {
+            if (e instanceof FOPException) {
+                throw (FOPException)e;
+            }
+            throw new FOPException(e);
+        }
+    }
+
+    /**
+     * Main method.
+     * @param args the command-line arguments
+     */
+    public static void main(String[] args) {
+        try {
+            System.out.println("FOP ExampleAWTViewer\n");
+            System.out.println("Preparing...");
+
+            //Setup directories
+            File baseDir = new File(".");
+            File outDir = new File(baseDir, "out");
+            outDir.mkdirs();
+
+            //Setup input and output files
+            File fofile = new File(baseDir, "xml/fo/helloworld.fo");
+
+            System.out.println("Input: XSL-FO (" + fofile + ")");
+            System.out.println("Output: AWT Viewer");
+            System.out.println();
+            System.out.println("Starting AWT Viewer...");
+
+            ExampleAWTViewer app = new ExampleAWTViewer();
+            app.viewFO(fofile);
+
+            System.out.println("Success!");
+        } catch (Exception e) {
+            System.err.println(ExceptionUtil.printStackTrace(e));
+            System.exit(-1);
+        }
+    }
+}

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleAWTViewer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleDOM2PDF.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id LastChangedBy LastChangedDate
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java Thu Feb 14 13:55:44 2008
@@ -1,127 +1,127 @@
-/*
- * 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$ */
- 
-package embedding;
-
-// Java
-import java.awt.print.PrinterJob;
-import java.io.File;
-import java.io.IOException;
-
-//JAXP
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.Result;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.transform.sax.SAXResult;
-
-
-// FOP
-import org.apache.fop.apps.FOUserAgent;
-import org.apache.fop.apps.Fop;
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.apps.FopFactory;
-import org.apache.fop.render.print.PrintRenderer;
-
-/**
- * This class demonstrates printing an FO file to a PrinterJob instance.
- */
-public class ExampleFO2OldStylePrint {
-
-    // configure fopFactory as desired
-    private FopFactory fopFactory = FopFactory.newInstance();
-    
-    /**
-     * Prints an FO file using an old-style PrinterJob.
-     * @param fo the FO file
-     * @throws IOException In case of an I/O problem
-     * @throws FOPException In case of a FOP problem
-     */
-    public void printFO(File fo) throws IOException, FOPException {
-        
-        //Set up PrinterJob instance
-        PrinterJob printerJob = PrinterJob.getPrinterJob();
-        printerJob.setJobName("FOP Printing Example");
-
-        try {
-            //Set up a custom user agent so we can supply our own renderer instance
-            FOUserAgent userAgent = fopFactory.newFOUserAgent();
-
-            //Set up our own PrintRenderer instance so we can supply a special PrinterJob instance.
-            PrintRenderer renderer = new PrintRenderer(printerJob);
-            renderer.setUserAgent(userAgent);
-            
-            userAgent.setRendererOverride(renderer);
-            
-            // Construct fop with desired output format (here, it is set through the user agent)
-            Fop fop = fopFactory.newFop(userAgent);
-
-            // Setup JAXP using identity transformer
-            TransformerFactory factory = TransformerFactory.newInstance();
-            Transformer transformer = factory.newTransformer(); // identity transformer
-            
-            // Setup input stream
-            Source src = new StreamSource(fo);
-
-            // Resulting SAX events (the generated FO) must be piped through to FOP
-            Result res = new SAXResult(fop.getDefaultHandler());
-            
-            // Start XSLT transformation and FOP processing
-            transformer.transform(src, res);
-
-        } catch (Exception e) {
-            e.printStackTrace(System.err);
-            System.exit(-1);
-        }
-    }
-
-
-    /**
-     * Main method.
-     * @param args command-line arguments
-     */
-    public static void main(String[] args) {
-        try {
-            System.out.println("FOP ExampleFO2OldStylePrint\n");
-            System.out.println("Preparing...");
-            
-            //Setup directories
-            File baseDir = new File(".");
-            File outDir = new File(baseDir, "out");
-            outDir.mkdirs();
-
-            //Setup input and output files            
-            File fofile = new File(baseDir, "xml/fo/helloworld.fo");
-
-            System.out.println("Input: XSL-FO (" + fofile + ")");
-            System.out.println("Output: old-style printing using PrinterJob");
-            System.out.println();
-            System.out.println("Transforming...");
-            
-            ExampleFO2OldStylePrint app = new ExampleFO2OldStylePrint();
-            app.printFO(fofile);
-            
-            System.out.println("Success!");
-        } catch (Exception e) {
-            e.printStackTrace(System.err);
-            System.exit(-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$ */
+ 
+package embedding;
+
+// Java
+import java.awt.print.PrinterJob;
+import java.io.File;
+import java.io.IOException;
+
+//JAXP
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.Source;
+import javax.xml.transform.Result;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.sax.SAXResult;
+
+
+// FOP
+import org.apache.fop.apps.FOUserAgent;
+import org.apache.fop.apps.Fop;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.apps.FopFactory;
+import org.apache.fop.render.print.PrintRenderer;
+
+/**
+ * This class demonstrates printing an FO file to a PrinterJob instance.
+ */
+public class ExampleFO2OldStylePrint {
+
+    // configure fopFactory as desired
+    private FopFactory fopFactory = FopFactory.newInstance();
+    
+    /**
+     * Prints an FO file using an old-style PrinterJob.
+     * @param fo the FO file
+     * @throws IOException In case of an I/O problem
+     * @throws FOPException In case of a FOP problem
+     */
+    public void printFO(File fo) throws IOException, FOPException {
+        
+        //Set up PrinterJob instance
+        PrinterJob printerJob = PrinterJob.getPrinterJob();
+        printerJob.setJobName("FOP Printing Example");
+
+        try {
+            //Set up a custom user agent so we can supply our own renderer instance
+            FOUserAgent userAgent = fopFactory.newFOUserAgent();
+
+            //Set up our own PrintRenderer instance so we can supply a special PrinterJob instance.
+            PrintRenderer renderer = new PrintRenderer(printerJob);
+            renderer.setUserAgent(userAgent);
+            
+            userAgent.setRendererOverride(renderer);
+            
+            // Construct fop with desired output format (here, it is set through the user agent)
+            Fop fop = fopFactory.newFop(userAgent);
+
+            // Setup JAXP using identity transformer
+            TransformerFactory factory = TransformerFactory.newInstance();
+            Transformer transformer = factory.newTransformer(); // identity transformer
+            
+            // Setup input stream
+            Source src = new StreamSource(fo);
+
+            // Resulting SAX events (the generated FO) must be piped through to FOP
+            Result res = new SAXResult(fop.getDefaultHandler());
+            
+            // Start XSLT transformation and FOP processing
+            transformer.transform(src, res);
+
+        } catch (Exception e) {
+            e.printStackTrace(System.err);
+            System.exit(-1);
+        }
+    }
+
+
+    /**
+     * Main method.
+     * @param args command-line arguments
+     */
+    public static void main(String[] args) {
+        try {
+            System.out.println("FOP ExampleFO2OldStylePrint\n");
+            System.out.println("Preparing...");
+            
+            //Setup directories
+            File baseDir = new File(".");
+            File outDir = new File(baseDir, "out");
+            outDir.mkdirs();
+
+            //Setup input and output files            
+            File fofile = new File(baseDir, "xml/fo/helloworld.fo");
+
+            System.out.println("Input: XSL-FO (" + fofile + ")");
+            System.out.println("Output: old-style printing using PrinterJob");
+            System.out.println();
+            System.out.println("Transforming...");
+            
+            ExampleFO2OldStylePrint app = new ExampleFO2OldStylePrint();
+            app.printFO(fofile);
+            
+            System.out.println("Success!");
+        } catch (Exception e) {
+            e.printStackTrace(System.err);
+            System.exit(-1);
+        }
+    }
+}

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id LastChangedBy LastChangedDate
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleConcat.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleConcat.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleConcat.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleConcat.java Thu Feb 14 13:55:44 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-/* $Id: ExampleDOM2PDF.java 332791 2005-11-12 15:58:07Z jeremias $ */
+/* $Id$ */
  
 package embedding.intermediate;
 

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleConcat.java
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleStamp.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleStamp.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleStamp.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleStamp.java Thu Feb 14 13:55:44 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-/* $Id: ExampleDOM2PDF.java 332791 2005-11-12 15:58:07Z jeremias $ */
+/* $Id$ */
  
 package embedding.intermediate;
 

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/java/embedding/intermediate/ExampleStamp.java
------------------------------------------------------------------------------
    svn:keywords = Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/embedding/xml/xml/projectteam.xml
------------------------------------------------------------------------------
    svn:keywords = Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/advanced/K3.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/advanced/bar.conf.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/build.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/fo-reference/xslfoRef.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/markers/glossary.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/hyphenation/build.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/build.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java Thu Feb 14 13:55:44 2008
@@ -23,9 +23,9 @@
 import java.awt.Dimension;
 import java.awt.geom.Point2D;
 
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropertyList;
+import net.sourceforge.jeuclid.DOMMathBuilder;
+import net.sourceforge.jeuclid.MathBase;
+
 import org.w3c.dom.DOMImplementation;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -34,11 +34,12 @@
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
-import org.apache.batik.svggen.SVGGraphics2D;
 import org.apache.batik.dom.svg.SVGDOMImplementation;
+import org.apache.batik.svggen.SVGGraphics2D;
 
-import net.sourceforge.jeuclid.MathBase;
-import net.sourceforge.jeuclid.DOMMathBuilder;
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropertyList;
 
 /**
  * Defines the top-level element for MathML.
@@ -57,9 +58,7 @@
         super(parent);
     }
 
-    /**
-     * @see org.apache.fop.fo.FONode#processNode
-     */
+    /** {@inheritDoc} */
     public void processNode(String elementName, 
                             Locator locator, 
                             Attributes attlist, 
@@ -141,15 +140,13 @@
 
     }
 
-    /** @see org.apache.fop.fo.XMLObj#getDOMDocument() */
+    /** {@inheritDoc} */
     public Document getDOMDocument() {
         convertToSVG();
         return doc;
     }
 
-    /**
-     * @see org.apache.fop.fo.FONode#getNamespaceURI()
-     */
+    /** {@inheritDoc} */
     public String getNamespaceURI() {
         if (svgDoc == null) {
             return MathMLElementMapping.NAMESPACE;
@@ -157,9 +154,7 @@
         return "http://www.w3.org/2000/svg";
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getDimension(Point2D)
-     */
+    /** {@inheritDoc} */
     public Point2D getDimension(Point2D view) {
         convertToSVG();
         return new Point2D.Float(width, height);

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java Thu Feb 14 13:55:44 2008
@@ -19,17 +19,12 @@
  
 package org.apache.fop.mathml;
 
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ElementMapping;
-import org.apache.fop.image.analyser.XMLReader;
-import org.apache.fop.image.FopImage;
-import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
-
 import java.util.HashMap;
 
-import net.sourceforge.jeuclid.MathBase;
-import net.sourceforge.jeuclid.DOMMathBuilder;
+import org.w3c.dom.DOMImplementation;
+
+import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.fo.FONode;
 
 /**
  * This class provides the element mapping for FOP.
@@ -44,19 +39,17 @@
         this.namespaceURI = NAMESPACE;
     }
 
-    /** @see org.apache.fop.fo.ElementMapping#getDOMImplementation() */
+    /** {@inheritDoc} */
     public DOMImplementation getDOMImplementation() {
         return getDefaultDOMImplementation();
     }
 
-    /** @see org.apache.fop.fo.ElementMapping#initialize() */
+    /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
             foObjs = new HashMap();
             foObjs.put("math", new ME());
             foObjs.put(DEFAULT, new MathMLMaker());
-
-            XMLReader.setConverter(this.namespaceURI, new MathMLConverter());
         }
     }
 
@@ -69,40 +62,6 @@
     static class ME extends ElementMapping.Maker {
         public FONode make(FONode parent) {
             return new MathMLElement(parent);
-        }
-    }
-
-    static class MathMLConverter implements XMLReader.Converter {
-        public FopImage.ImageInfo convert(Document doc) {
-            try {
-                FopImage.ImageInfo info = new FopImage.ImageInfo();
-                String fontname = "Helvetica";
-                int fontstyle = 0;
-                int inlinefontstyle = 0;
-                int inlinefontsize = 12;
-                int displayfontsize = 12;
-
-                MathBase base = new MathBase(
-                                  (new DOMMathBuilder(doc)).getMathRootElement(),
-                                  fontname, fontstyle, inlinefontsize,
-                                  displayfontsize);
-
-                base.setDebug(false);
-
-                info.data = MathMLElement.createSVG(base);
-
-                info.width = base.getWidth();
-                info.height = base.getHeight();
-
-                info.mimeType = "image/svg+xml";
-                info.str = "http://www.w3.org/2000/svg";
-
-                return info;
-            } catch (Throwable t) {
-                /**@todo log that properly */
-            }
-            return null;
-
         }
     }
 

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java Thu Feb 14 13:55:44 2008
@@ -35,12 +35,12 @@
         super(parent);
     }
 
-    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    /** {@inheritDoc} */
     public String getNamespaceURI() {
         return MathMLElementMapping.NAMESPACE;
     }
 
-    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    /** {@inheritDoc} */
     public String getNormalNamespacePrefix() {
         return "mathml";
     }

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/build.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/docs/june.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/ActionInfo.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/EventList.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/GroupInfo.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/Main.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanDrawer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElement.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElement.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElement.java Thu Feb 14 13:55:44 2008
@@ -21,14 +21,15 @@
 
 import java.awt.geom.Point2D;
 
-import org.apache.fop.apps.FOPException;
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.PropertyList;
-
 import org.w3c.dom.Document;
+
 import org.xml.sax.Attributes;
 import org.xml.sax.Locator;
 
+import org.apache.fop.apps.FOPException;
+import org.apache.fop.fo.FONode;
+import org.apache.fop.fo.PropertyList;
+
 /**
  * This class defines the plan element.
  */
@@ -46,9 +47,7 @@
         super(parent);
     }
 
-    /**
-     * @see org.apache.fop.fo.FONode#processNode
-     */
+    /** {@inheritDoc} */
     public void processNode(String elementName, Locator locator, 
                             Attributes attlist, PropertyList propertyList)
         throws FOPException {
@@ -79,15 +78,13 @@
 
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getDOMDocument()
-     */
+    /** {@inheritDoc} */
     public Document getDOMDocument() {
         convertToSVG();
         return doc;
     }
 
-    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    /** {@inheritDoc} */
     public String getNamespaceURI() {
         if (svgDoc == null) {
             return PlanElementMapping.NAMESPACE;
@@ -95,9 +92,7 @@
         return "http://www.w3.org/2000/svg";
     }
 
-    /**
-     * @see org.apache.fop.fo.XMLObj#getDimension(Point2D)
-     */
+    /** {@inheritDoc} */
     public Point2D getDimension(Point2D view) {
         convertToSVG();
         return new Point2D.Float(width, height);

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElement.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java Thu Feb 14 13:55:44 2008
@@ -19,12 +19,10 @@
  
 package org.apache.fop.plan;
 
-import org.apache.fop.fo.FONode;
-import org.apache.fop.fo.ElementMapping;
-import org.apache.fop.image.analyser.XMLReader;
-import org.apache.fop.image.FopImage;
 import org.w3c.dom.DOMImplementation;
-import org.w3c.dom.Document;
+
+import org.apache.fop.fo.ElementMapping;
+import org.apache.fop.fo.FONode;
 
 /**
  * This class provides the element mapping for FOP.
@@ -39,19 +37,17 @@
         this.namespaceURI = NAMESPACE;
     }
 
-    /** @see org.apache.fop.fo.ElementMapping#getDOMImplementation() */
+    /** {@inheritDoc} */
     public DOMImplementation getDOMImplementation() {
         return getDefaultDOMImplementation();
     }
 
-    /** @see org.apache.fop.fo.ElementMapping#initialize() */
+    /** {@inheritDoc} */
     protected void initialize() {
         if (foObjs == null) {
             foObjs = new java.util.HashMap();
             foObjs.put("plan", new PE());
             foObjs.put(DEFAULT, new PlanMaker());
-
-            XMLReader.setConverter(this.namespaceURI, new PlanConverter());
         }
     }
 
@@ -64,26 +60,6 @@
     static class PE extends ElementMapping.Maker {
         public FONode make(FONode parent) {
             return new PlanElement(parent);
-        }
-    }
-
-    static class PlanConverter implements XMLReader.Converter {
-        public FopImage.ImageInfo convert(Document doc) {
-            try {
-                PlanRenderer pr = new PlanRenderer();
-                pr.setFontInfo("Helvetica", 12);
-                FopImage.ImageInfo info = new FopImage.ImageInfo();
-                info.data = pr.createSVGDocument(doc);
-                info.width = (int)pr.getWidth();
-                info.height = (int)pr.getHeight();
-                info.mimeType = "image/svg+xml";
-                info.str = "http://www.w3.org/2000/svg";
-    
-                return info;
-            } catch (Throwable t) {
-                /**@todo Log this properly! */
-            }
-            return null;
         }
     }
 

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanHints.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanObj.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanObj.java?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanObj.java (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanObj.java Thu Feb 14 13:55:44 2008
@@ -38,12 +38,12 @@
         super(parent);
     }
 
-    /** @see org.apache.fop.fo.FONode#getNamespaceURI() */
+    /** {@inheritDoc} */
     public String getNamespaceURI() {
         return PlanElementMapping.NAMESPACE;
     }
 
-    /** @see org.apache.fop.fo.FONode#getNormalNamespacePrefix() */
+    /** {@inheritDoc} */
     public String getNormalNamespacePrefix() {
         return "plan";
     }

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanObj.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/PlanRenderer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat Thu Feb 14 13:55:44 2008
@@ -56,17 +56,16 @@
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LOCAL_FOP_HOME%build\fop-sandbox.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LOCAL_FOP_HOME%build\fop-hyph.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis-1.3.02.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xml-apis-ext.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xercesImpl-2.7.1.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xalan-2.7.0.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\serializer-2.7.0.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.6.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.7.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.3svn.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.3.1.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-logging-1.0.4.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_core.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_codec.jar
+set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jai_imageio.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\fop-hyph.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%FOP_HYPHENATION_PATH%
 

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/hyph/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Feb 14 13:55:44 2008
@@ -0,0 +1 @@
+*.xml

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/known-issues.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/README.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/README.txt?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/README.txt (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/README.txt Thu Feb 14 13:55:44 2008
@@ -51,22 +51,7 @@
     
     Apache License v2.0
 
-
-
-Special Dependencies
------------------------
-
-The special dependencies are the whole JAXP set which required for users
-on JDK 1.3.x which doesn't include JAXP. But it is also interesting for
-users on JDKs >= 1.4 if they want to replace the default JAXP 
-implementation delivered by the JDK.
-
-Replacing the default implementations involves understanding the 
-"Endorsed Standards Override Mechanism".
-More information can be found here:
-http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html
-
-- JAXP API
+- Apache XML Commons Externals (JAXP API)
 
     xml-apis.jar
     http://xml.apache.org/commons/components/external/
@@ -82,13 +67,16 @@
         http://www.w3.org/Consortium/Legal/copyright-documents
         http://www.w3.org/Consortium/Legal/
 
-- Apache Xerces-J
-
-    xercesImpl-*.jar
-    http://xerces.apache.org
-    (JAXP-compliant XML parser and DOM Level 3 implementation)
+    xml-apis-ext-*.jar
+    http://xml.apache.org/commons/components/external/
+    (additional DOM APIs from W3C, like SVG, SMIL and Simple API for CSS)
     
-    Apache License v2.0
+    Apache License v2.0 (applies to the distribution)
+    W3C Software Notice and License (applies to the various DOM Java bindings)
+    W3C Document License (applies to the DOM documentation)
+        http://www.w3.org/Consortium/Legal/copyright-software
+        http://www.w3.org/Consortium/Legal/copyright-documents
+        http://www.w3.org/Consortium/Legal/
 
 - Apache Xalan-J
 
@@ -103,6 +91,45 @@
         (see xalan.runtime.LICENSE.txt)
 
 
+Special Dependencies
+-----------------------
+
+- Apache Xerces-J
+
+    xercesImpl-*.jar
+    http://xerces.apache.org
+    (JAXP-compliant XML parser and DOM Level 3 implementation)
+    
+    Apache License v2.0
+    
+    Xerces-J is not directly referenced by FOP or any of its dependencies.
+    
+
+A note on JAXP
+-----------------------
+
+Since Java 1.4, JAXP (Java API for XML Processing) is part of the 
+JRE/JDK. Every JVM includes the APIs and an implementation. However, 
+older JREs often contain implementations with bugs that are triggered 
+by code in Apache FOP and therefore need to be overridden. Now, since 
+JAXP is part of the class library, special precautions are necessary 
+to replace the original implementations. This is not done by simply 
+adding new JARs to the classpath as these classes would never be 
+loaded (due to Java's class loader hierarchy). 
+
+Replacing the default implementations involves understanding the 
+"Endorsed Standards Override Mechanism".
+More information can be found here:
+http://java.sun.com/j2se/1.4.2/docs/guide/standards/index.html
+
+See also:
+http://xml.apache.org/xalan-j/faq.html#faq-N100EF
+
+Essentially, you have two different possibilities:
+- add the replacement JARs in the jre/lib/endorsed directory of your JRE.
+- Use the -Xbootclasspath/p: option when starting the JVM (may not be
+  available for every JVM).
+
 
 Optional Dependencies
 ------------------------
@@ -110,15 +137,13 @@
 The following libraries are not bundled with FOP and must be installed manually.
 Please make sure you've read the license of each package.
 
-- JIMI Image library
-
-    http://java.sun.com/products/jimi
-    Sun Binary Code License
-
-- JAI (Java Advanced Imaging API)
+- JAI Image I/O Tools
 
-    http://java.sun.com/products/java-media/jai
-    Java Research License and Java Distribution License (Check which one applies to you!)
+    https://jai-imageio.dev.java.net/
+    BSD license
+    
+    Note: Not the whole JAI is needed, only the ImageIO-compatible codecs
+    packaged as "Image I/O Tools". The name may be misleading.
 
 - JEuclid (MathML implementation, for the MathML extension)
 
@@ -151,4 +176,10 @@
 
     (not bundled, provided by Apache Ant or your IDE)
     http://www.junit.org
-    Common Public License V1.0
\ No newline at end of file
+    Common Public License V1.0
+
+- XMLUnit (optional)
+
+    (not bundled, to be added to your Apache Ant installation)
+    http://xmlunit.sourceforge.net/
+    BSD style license
\ No newline at end of file

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/batik.NOTICE.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/batik.NOTICE.txt?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/batik.NOTICE.txt (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/batik.NOTICE.txt Thu Feb 14 13:55:44 2008
@@ -1,8 +1,18 @@
-This product includes software developed by
+Apache Batik
+Copyright 1999-2007 The Apache Software Foundation
+
+This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
 
 This software contains code from the World Wide Web Consortium (W3C) for the 
 Document Object Model API (DOM API) and SVG Document Type Definition (DTD).
 
-This software contains code from the International Organisation for Standardization
-for the definition of character entities used in the software's documentation.
+This software contains code from the International Organisation for
+Standardization for the definition of character entities used in the software's
+documentation.
+
+This product includes images from the Tango Desktop Project
+(http://tango.freedesktop.org/).
+
+This product includes images from the Pasodoble Icon Theme
+(http://www.jesusda.com/projects/pasodoble).

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/xmlgraphics-commons-1.3svn.jar
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/xmlgraphics-commons-1.3svn.jar?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
Binary files - no diff available.

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/publish.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fo/colorkw.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fo/constants.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fo/foelements.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fo/foproperties.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Courier.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBold.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBoldOblique.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierOblique.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Helvetica.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBold.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBoldOblique.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaOblique.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml Thu Feb 14 13:55:44 2008
@@ -124,6 +124,7 @@
     <char name="bar" width="200"/>
     <char name="braceright" width="480"/>
     <char name="similar" width="549"/>
+    <char name="Euro" width="750"/>
     <char name="Upsilon1" width="620"/>
     <char name="minute" width="247"/>
     <char name="lessequal" width="549"/>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBold.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBoldItalic.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesItalic.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesRoman.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/ZapfDingbats.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/charlist.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl Thu Feb 14 13:55:44 2008
@@ -40,23 +40,40 @@
 
 package org.apache.fop.fonts;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Collections;
 
+import org.apache.fop.util.CharUtilities;
+
 public class CodePointMapping {
+
+<xsl:apply-templates mode="constant"/>
+
+    private String name;
     private char[] latin1Map;
     private char[] characters;
     private char[] codepoints;
+    private char[] unicodeMap; //code point to Unicode char
 
-    private CodePointMapping(int [] table) {
+    public CodePointMapping(String name, int[] table) {
+        this.name = name;
         int nonLatin1 = 0;
         latin1Map = new char[256];
+        unicodeMap = new char[256];
+        Arrays.fill(unicodeMap, CharUtilities.NOT_A_CHARACTER);
         for (int i = 0; i &lt; table.length; i += 2) {
-           if (table[i + 1] &lt; 256) {
-               latin1Map[table[i + 1]] = (char) table[i];
-           } else {
-               ++nonLatin1;
-           }
+            char unicode = (char)table[i + 1];
+            if (unicode &lt; 256) {
+                if (latin1Map[unicode] == 0) {
+                    latin1Map[unicode] = (char) table[i];
+                }
+            } else {
+                ++nonLatin1;
+            }
+            if (unicodeMap[table[i]] == CharUtilities.NOT_A_CHARACTER) {
+                unicodeMap[table[i]] = unicode;
+            }
         }
         characters = new char[nonLatin1];
         codepoints = new char[nonLatin1];
@@ -79,6 +96,10 @@
         }
     }
 
+    public String getName() {
+        return this.name;
+    }
+
     public final char mapChar(char c) {
         if (c &lt; 256) {
             return latin1Map[c];
@@ -100,10 +121,26 @@
         }
     }
 
+    public final char getUnicodeForIndex(int idx) {
+        return this.unicodeMap[idx];
+    }
+
+    public final char[] getUnicodeCharMap() {
+        char[] copy = new char[this.unicodeMap.length];
+        System.arraycopy(this.unicodeMap, 0, copy, 0, this.unicodeMap.length);
+        return copy;
+    }
+
+    /** {@inheritDoc} */
+    public String toString() {
+        return getName();
+    }
+
     private static Map mappings;
     static {
         mappings = Collections.synchronizedMap(new java.util.HashMap());
     }
+
     public static CodePointMapping getMapping(String encoding) {
         CodePointMapping mapping = (CodePointMapping) mappings.get(encoding);
         if (mapping != null) {
@@ -119,10 +156,12 @@
 }
   </xsl:template>
 
+  <xsl:template match="encoding" mode="constant">    public static final String <xsl:value-of select="@constant"/> = "<xsl:value-of select="@id"/>";</xsl:template>
+  
   <xsl:template match="encoding" mode="get">
-        else if (encoding.equals("<xsl:value-of select="@id"/>")) {
-            mapping = new CodePointMapping(enc<xsl:value-of select="@id"/>);
-            mappings.put("<xsl:value-of select="@id"/>", mapping);
+        else if (encoding.equals(<xsl:value-of select="@constant"/>)) {
+            mapping = new CodePointMapping(<xsl:value-of select="@constant"/>, enc<xsl:value-of select="@id"/>);
+            mappings.put(<xsl:value-of select="@constant"/>, mapping);
             return mapping;
         }
   </xsl:template>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml Thu Feb 14 13:55:44 2008
@@ -19,12 +19,12 @@
 <!DOCTYPE encoding-set [
   <!ELEMENT encoding-set (encoding+)>
   <!ELEMENT encoding (glyph+)>
-  <!ATTLIST encoding id ID #REQUIRED glyphlist CDATA "AGL">
+  <!ATTLIST encoding id ID #REQUIRED constant CDATA #REQUIRED glyphlist CDATA "AGL">
   <!ELEMENT glyph EMPTY>
   <!ATTLIST glyph codepoint CDATA #REQUIRED name CDATA #REQUIRED>
 ]>
 <encoding-set>
-  <encoding id='StandardEncoding' glyphlist='AGL'>
+  <encoding id='StandardEncoding' constant="STANDARD_ENCODING" glyphlist='AGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='exclam'/>
     <glyph codepoint='22' name='quotedbl'/>
@@ -175,7 +175,7 @@
     <glyph codepoint='fa' name='oe'/>
     <glyph codepoint='fb' name='germandbls'/>
   </encoding>
-  <encoding id='ISOLatin1Encoding' glyphlist='AGL'>
+  <encoding id='ISOLatin1Encoding' constant="ISOLATIN1_ENCODING" glyphlist='AGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='exclam'/>
     <glyph codepoint='22' name='quotedbl'/>
@@ -377,7 +377,7 @@
     <glyph codepoint='fe' name='thorn'/>
     <glyph codepoint='ff' name='ydieresis'/>
   </encoding>
-  <encoding id='CEEncoding' glyphlist='AGL'>
+  <encoding id='CEEncoding' constant="CE_ENCODING" glyphlist='AGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='exclam'/>
     <glyph codepoint='22' name='quotedbl'/>
@@ -594,7 +594,7 @@
     <glyph codepoint='fe' name='tcommaaccent'/>
     <glyph codepoint='ff' name='dotaccent'/>
   </encoding>
-  <encoding id='MacRomanEncoding' glyphlist='AGL'>
+  <encoding id='MacRomanEncoding' constant="MAC_ROMAN_ENCODING" glyphlist='AGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='exclam'/>
     <glyph codepoint='22' name='quotedbl'/>
@@ -803,7 +803,7 @@
     <glyph codepoint='b4' name='yen'/>
     <glyph codepoint='7a' name='z'/>
   </encoding>
-  <encoding id='WinAnsiEncoding' glyphlist='AGL'>
+  <encoding id='WinAnsiEncoding' constant="WIN_ANSI_ENCODING" glyphlist='AGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='exclam'/>
     <glyph codepoint='22' name='quotedbl'/>
@@ -1021,7 +1021,7 @@
     <glyph codepoint='fe' name='thorn'/>
     <glyph codepoint='ff' name='ydieresis'/>
   </encoding>
-  <encoding id='PDFDocEncoding' glyphlist='AGL'>
+  <encoding id='PDFDocEncoding' constant="PDF_DOC_ENCODING" glyphlist='AGL'>
     <glyph codepoint='18' name='breve'/>
     <glyph codepoint='19' name='caron'/>
     <glyph codepoint='1a' name='circumflex'/>
@@ -1252,7 +1252,7 @@
     <glyph codepoint='fe' name='thorn'/>
     <glyph codepoint='ff' name='ydieresis'/>
   </encoding>
-  <encoding id='SymbolEncoding' glyphlist='AGL'>
+  <encoding id='SymbolEncoding' constant="SYMBOL_ENCODING" glyphlist='AGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='exclam'/>
     <glyph codepoint='22' name='universal'/>
@@ -1443,7 +1443,7 @@
     <glyph codepoint='fd' name='bracerightmid'/>
     <glyph codepoint='fe' name='bracerightbt'/>
   </encoding>
-  <encoding id='ZapfDingbatsEncoding' glyphlist='ZGL'>
+  <encoding id='ZapfDingbatsEncoding' constant="ZAPF_DINGBATS_ENCODING" glyphlist='ZGL'>
     <glyph codepoint='20' name='space'/>
     <glyph codepoint='21' name='a1'/>
     <glyph codepoint='22' name='a2'/>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/glyphlist.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/conf/web.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/anttask.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/compiling.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/configuration.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/embedding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/extensions.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/fonts.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/fonts.xml Thu Feb 14 13:55:44 2008
@@ -201,17 +201,6 @@
             <td>Limited only by the characters in the font itself.</td>
           </tr>
           <tr>
-            <td>Character Encoding in the Output Document.</td>
-            <td>Correct.</td>
-            <td>Never correct. Search, index, and cut-and-paste operations in the output document
-will produce incorrect results.</td>
-          </tr>
-          <tr>
-            <td>Character Display</td>
-            <td>Correct.</td>
-            <td>Correct, but copy/paste won't work in Acrobat Reader. (FOP currently doesn't emit the /ToUnicode table which is necessary for copy/paste to work.)</td>
-          </tr>
-          <tr>
             <td>Embedding the Font</td>
             <td>Optional.</td>
             <td>Mandatory. Not embedding the font produces invalid PDF documents.</td>
@@ -219,7 +208,7 @@
         </table>
         <warning>
           You may experience failures with certain TrueType fonts, especially if they don't contain 
-          the so-called "cmap" table. TTFReader can currently not deal with font like this.
+          the so-called Unicode "cmap" table. TTFReader can currently not deal with font like this.
         </warning>
       </section>
       <section id="truetype-collections-metrics">

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/fonts.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/fotree/disabled-testcases.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/graphics.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/hyphenation.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/index.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/index.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/index.xml Thu Feb 14 13:55:44 2008
@@ -20,7 +20,7 @@
 <document>
   <header>
     <title>Apache FOP Version 0.93</title>
-    <version>$Revision: 201586 $</version>
+    <version>$Revision$</version>
   </header>
   <body>
     <section id="intro">

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/index.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/intermediate.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/known-issues.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/knownissues_overview.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/layoutengine/disabled-testcases.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/output.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfa.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfa.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfa.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfa.xml Thu Feb 14 13:55:44 2008
@@ -20,7 +20,7 @@
 <document>
   <header>
     <title>PDF/A (ISO 19005)</title>
-    <version>$Revision: 389563 $</version>
+    <version>$Revision$</version>
     <authors>
       <person name="Jeremias Märki" email="jeremias@apache.org"/>
     </authors>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfa.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfencryption.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/pdfx.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/running.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/servlets.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/upgrading.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/anttask.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/compiling.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/configuration.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/embedding.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/extensions.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/fonts.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/fonts.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/fonts.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/fonts.xml Thu Feb 14 13:55:44 2008
@@ -201,17 +201,6 @@
             <td>Limited only by the characters in the font itself.</td>
           </tr>
           <tr>
-            <td>Character Encoding in the Output Document.</td>
-            <td>Correct.</td>
-            <td>Never correct. Search, index, and cut-and-paste operations in the output document
-will produce incorrect results.</td>
-          </tr>
-          <tr>
-            <td>Character Display</td>
-            <td>Correct.</td>
-            <td>Correct, but copy/paste won't work in Acrobat Reader. (FOP currently doesn't emit the /ToUnicode table which is necessary for copy/paste to work.)</td>
-          </tr>
-          <tr>
             <td>Embedding the Font</td>
             <td>Optional.</td>
             <td>Mandatory. Not embedding the font produces invalid PDF documents.</td>
@@ -219,7 +208,7 @@
         </table>
         <warning>
           You may experience failures with certain TrueType fonts, especially if they don't contain 
-          the so-called "cmap" table. TTFReader can currently not deal with font like this.
+          the so-called Unicode "cmap" table. TTFReader can currently not deal with font like this.
         </warning>
       </section>
       <section id="truetype-collections-metrics">

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/fonts.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/fotree/disabled-testcases.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/graphics.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/hyphenation.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/index.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/index.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/index.xml Thu Feb 14 13:55:44 2008
@@ -20,7 +20,7 @@
 <document>
   <header>
     <title>Apache FOP Version 0.94</title>
-    <version>$Revision: 201586 $</version>
+    <version>$Revision$</version>
   </header>
   <body>
     <section id="intro">

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/index.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/intermediate.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/known-issues.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/knownissues_overview.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/layoutengine/disabled-testcases.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/output.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfa.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfa.xml?rev=627882&r1=627881&r2=627882&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfa.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfa.xml Thu Feb 14 13:55:44 2008
@@ -20,7 +20,7 @@
 <document>
   <header>
     <title>PDF/A (ISO 19005)</title>
-    <version>$Revision: 389563 $</version>
+    <version>$Revision$</version>
     <authors>
       <person name="Jeremias Märki" email="jeremias@apache.org"/>
     </authors>

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfa.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfencryption.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/pdfx.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Id
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/running.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.94/servlets.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Feb 14 13:55:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id



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


Mime
View raw message