Only in Fop-0.20.2: LICENSE Only in Fop-0.20.2: README Only in Fop-0.20.2: STATUS diff -rc Fop-0.20.2/build.bat ../Fop-0.20.2/build.bat *** Fop-0.20.2/build.bat Mon Feb 18 23:00:55 2002 --- ../Fop-0.20.2/build.bat Mon Feb 18 22:38:14 2002 *************** *** 1,31 **** ! @echo off ! ! echo Fop Build System ! echo ---------------- ! ! if "%JAVA_HOME%" == "" goto error ! ! set LIBDIR=lib ! set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\iText.jar ! ! set ANT_HOME=%LIBDIR% ! ! echo Building with classpath %LOCALCLASSPATH% ! ! echo Starting Ant... ! "%JAVA_HOME%\bin\java.exe" -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 ! ! goto end ! ! :error ! ! echo ERROR: JAVA_HOME not found in your environment. ! echo Please, set the JAVA_HOME variable in your environment to match the ! echo location of the Java Virtual Machine you want to use. ! ! :end ! ! rem set LOCALCLASSPATH= ! --- 1,31 ---- ! @echo off ! ! echo Fop Build System ! echo ---------------- ! ! if "%JAVA_HOME%" == "" goto error ! ! set LIBDIR=lib ! set LOCALCLASSPATH=%JAVA_HOME%\lib\tools.jar;%JAVA_HOME%\lib\classes.zip;%LIBDIR%\ant.jar;%LIBDIR%\batik.jar;%LIBDIR%\buildtools.jar;%LIBDIR%\xerces-1.2.3.jar;%LIBDIR%\xalan-2.0.0.jar;%LIBDIR%\xalanj1compat.jar;%LIBDIR%\bsf.jar set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\jimi-1.0.jar;%LIBDIR%\logkit-1.0b4.jar;%LIBDIR%\avalon-framework-4.0.jar;%LIBDIR%\iText.jar ! ! set ANT_HOME=%LIBDIR% ! ! echo Building with classpath %LOCALCLASSPATH% ! ! echo Starting Ant... ! "%JAVA_HOME%\bin\java.exe" -Dant.home=%ANT_HOME% -classpath "%LOCALCLASSPATH%" org.apache.tools.ant.Main %1 %2 %3 %4 %5 ! ! goto end ! ! :error ! ! echo ERROR: JAVA_HOME not found in your environment. ! echo Please, set the JAVA_HOME variable in your environment to match the ! echo location of the Java Virtual Machine you want to use. ! ! :end ! ! rem set LOCALCLASSPATH= ! Only in Fop-0.20.2: build.bat.rej Only in Fop-0.20.2: build.bat~ Only in Fop-0.20.2: build.xml.rej Only in Fop-0.20.2: build.xml~ Only in Fop-0.20.2: fop.bat.rej Only in Fop-0.20.2: fop.bat~ Common subdirectories: Fop-0.20.2/src and ../Fop-0.20.2/src Only in ../Fop-0.20.2/src: META-INF Common subdirectories: Fop-0.20.2/src/codegen and ../Fop-0.20.2/src/codegen Common subdirectories: Fop-0.20.2/src/org and ../Fop-0.20.2/src/org Common subdirectories: Fop-0.20.2/src/org/apache and ../Fop-0.20.2/src/org/apache Common subdirectories: Fop-0.20.2/src/org/apache/fop and ../Fop-0.20.2/src/org/apache/fop Common subdirectories: Fop-0.20.2/src/org/apache/fop/apps and ../Fop-0.20.2/src/org/apache/fop/apps Common subdirectories: Fop-0.20.2/src/org/apache/fop/configuration and ../Fop-0.20.2/src/org/apache/fop/configuration Common subdirectories: Fop-0.20.2/src/org/apache/fop/datatypes and ../Fop-0.20.2/src/org/apache/fop/datatypes Common subdirectories: Fop-0.20.2/src/org/apache/fop/extensions and ../Fop-0.20.2/src/org/apache/fop/extensions Common subdirectories: Fop-0.20.2/src/org/apache/fop/fo and ../Fop-0.20.2/src/org/apache/fop/fo Common subdirectories: Fop-0.20.2/src/org/apache/fop/fonts and ../Fop-0.20.2/src/org/apache/fop/fonts Only in ../Fop-0.20.2/src/org/apache/fop: fop_iText_connect Common subdirectories: Fop-0.20.2/src/org/apache/fop/image and ../Fop-0.20.2/src/org/apache/fop/image Common subdirectories: Fop-0.20.2/src/org/apache/fop/layout and ../Fop-0.20.2/src/org/apache/fop/layout Common subdirectories: Fop-0.20.2/src/org/apache/fop/messaging and ../Fop-0.20.2/src/org/apache/fop/messaging Common subdirectories: Fop-0.20.2/src/org/apache/fop/mif and ../Fop-0.20.2/src/org/apache/fop/mif Common subdirectories: Fop-0.20.2/src/org/apache/fop/pdf and ../Fop-0.20.2/src/org/apache/fop/pdf Common subdirectories: Fop-0.20.2/src/org/apache/fop/render and ../Fop-0.20.2/src/org/apache/fop/render Common subdirectories: Fop-0.20.2/src/org/apache/fop/svg and ../Fop-0.20.2/src/org/apache/fop/svg Common subdirectories: Fop-0.20.2/src/org/apache/fop/system and ../Fop-0.20.2/src/org/apache/fop/system Common subdirectories: Fop-0.20.2/src/org/apache/fop/tools and ../Fop-0.20.2/src/org/apache/fop/tools Common subdirectories: Fop-0.20.2/src/org/apache/fop/viewer and ../Fop-0.20.2/src/org/apache/fop/viewer Only in Fop-0.20.2/src/org/apache/fop/apps: CommandLineOptions.java.rej Only in Fop-0.20.2/src/org/apache/fop/apps: CommandLineOptions.java~ diff -rc Fop-0.20.2/src/org/apache/fop/apps/Driver.java ../Fop-0.20.2/src/org/apache/fop/apps/Driver.java *** Fop-0.20.2/src/org/apache/fop/apps/Driver.java Mon Feb 18 22:59:58 2002 --- ../Fop-0.20.2/src/org/apache/fop/apps/Driver.java Mon Feb 18 22:47:55 2002 *************** *** 98,104 **** * Render to PDF. OutputStream must be set */ public static final int RENDER_PDF = 1; ! /** * Render to bufferedd PDF. */ --- 98,104 ---- * Render to PDF. OutputStream must be set */ public static final int RENDER_PDF = 1; ! /** * Render to bufferedd PDF. */ Only in Fop-0.20.2/src/org/apache/fop/apps: Driver.java.rej Only in Fop-0.20.2/src/org/apache/fop/apps: Driver.java~ diff -rc Fop-0.20.2/src/org/apache/fop/apps/StreamRenderer.java ../Fop-0.20.2/src/org/apache/fop/apps/StreamRenderer.java *** Fop-0.20.2/src/org/apache/fop/apps/StreamRenderer.java Mon Feb 18 23:09:54 2002 --- ../Fop-0.20.2/src/org/apache/fop/apps/StreamRenderer.java Mon Feb 18 23:09:09 2002 *************** *** 108,116 **** private Vector extensions = new Vector(); private Logger log; ! public StreamRenderer(OutputStream outputStream, Renderer renderer) { ! this.outputStream = outputStream; this.renderer = renderer; } --- 108,121 ---- private Vector extensions = new Vector(); private Logger log; ! public StreamRenderer(OutputStream outputStream, Renderer renderer) { ! if(renderer instanceof BufferedPDFRenderer) { ! this.outputStream = new ByteArrayOutputStream(); ! this.old_stream = outputStream; ! } else { ! this.outputStream = outputStream; ! } this.renderer = renderer; } *************** *** 159,164 **** --- 164,178 ---- catch (IOException e) { throw new SAXException(e); } + + if(renderer instanceof BufferedPDFRenderer) { + Connection con = new Connection(connectFunctions); + con.setLogger(log); + con.read(((ByteArrayOutputStream)outputStream).toByteArray()); + try { + old_stream.write(con.write()); + } catch(IOException ex) { throw new SAXException(ex); } + } if (MEM_PROFILE_WITH_GC) System.gc(); // This takes time but gives better results Only in Fop-0.20.2/src/org/apache/fop/apps: StreamRenderer.java.rej Only in Fop-0.20.2/src/org/apache/fop/apps: StreamRenderer.java~ diff -rc Fop-0.20.2/src/org/apache/fop/fo/FOTreeBuilder.java ../Fop-0.20.2/src/org/apache/fop/fo/FOTreeBuilder.java *** Fop-0.20.2/src/org/apache/fop/fo/FOTreeBuilder.java Mon Feb 18 23:09:54 2002 --- ../Fop-0.20.2/src/org/apache/fop/fo/FOTreeBuilder.java Mon Feb 18 22:48:45 2002 *************** *** 284,290 **** } else if(!(fobj instanceof org.apache.fop.fo.pagination.PageSequence)) { currentFObj.addChild(fobj); } ! currentFObj = fobj; } --- 284,295 ---- } else if(!(fobj instanceof org.apache.fop.fo.pagination.PageSequence)) { currentFObj.addChild(fobj); } ! // fop_iText_connect ! try { ! if(fobj instanceof ConnectObj) ((ConnectObj)fobj).connect(); ! } catch(FOPException ex) { throw new SAXException(ex); } ! if(fobj instanceof CallFunction) connectFunctions.add(fobj); ! currentFObj = fobj; } Only in Fop-0.20.2/src/org/apache/fop/fo: FOTreeBuilder.java.rej Only in Fop-0.20.2/src/org/apache/fop/fo: FOTreeBuilder.java~ Only in Fop-0.20.2/src/org/apache/fop/fo: Unknown.java~ diff -rc Fop-0.20.2/src/org/apache/fop/fo/XMLObj.java ../Fop-0.20.2/src/org/apache/fop/fo/XMLObj.java *** Fop-0.20.2/src/org/apache/fop/fo/XMLObj.java Mon Feb 18 22:59:07 2002 --- ../Fop-0.20.2/src/org/apache/fop/fo/XMLObj.java Mon Feb 18 22:49:02 2002 *************** *** 86,92 **** element.setAttribute(qname, rf); } else { String pref = ! qname.substring(0, qname.indexOf(":")); if (pref.equals("xmlns")) { ns.put(qname.substring(qname.indexOf(":") + 1), rf); --- 86,92 ---- element.setAttribute(qname, rf); } else { String pref = ! qname.substring(0, qname.indexOf(":")); if (pref.equals("xmlns")) { ns.put(qname.substring(qname.indexOf(":") + 1), rf); Common subdirectories: Fop-0.20.2/src/org/apache/fop/fo/expr and ../Fop-0.20.2/src/org/apache/fop/fo/expr Common subdirectories: Fop-0.20.2/src/org/apache/fop/fo/flow and ../Fop-0.20.2/src/org/apache/fop/fo/flow Common subdirectories: Fop-0.20.2/src/org/apache/fop/fo/pagination and ../Fop-0.20.2/src/org/apache/fop/fo/pagination Common subdirectories: Fop-0.20.2/src/org/apache/fop/fonts/apps and ../Fop-0.20.2/src/org/apache/fop/fonts/apps Common subdirectories: Fop-0.20.2/src/org/apache/fop/image/analyser and ../Fop-0.20.2/src/org/apache/fop/image/analyser Common subdirectories: Fop-0.20.2/src/org/apache/fop/layout/hyphenation and ../Fop-0.20.2/src/org/apache/fop/layout/hyphenation Common subdirectories: Fop-0.20.2/src/org/apache/fop/layout/inline and ../Fop-0.20.2/src/org/apache/fop/layout/inline Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/awt and ../Fop-0.20.2/src/org/apache/fop/render/awt Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/mif and ../Fop-0.20.2/src/org/apache/fop/render/mif Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/pcl and ../Fop-0.20.2/src/org/apache/fop/render/pcl Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/pdf and ../Fop-0.20.2/src/org/apache/fop/render/pdf Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/ps and ../Fop-0.20.2/src/org/apache/fop/render/ps Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/txt and ../Fop-0.20.2/src/org/apache/fop/render/txt Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/xml and ../Fop-0.20.2/src/org/apache/fop/render/xml Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/mif/fonts and ../Fop-0.20.2/src/org/apache/fop/render/mif/fonts Only in ../Fop-0.20.2/src/org/apache/fop/render/pdf: BufferedPDFRenderer.java Only in Fop-0.20.2/src/org/apache/fop/render/pdf: FontReader.java~ Common subdirectories: Fop-0.20.2/src/org/apache/fop/render/pdf/fonts and ../Fop-0.20.2/src/org/apache/fop/render/pdf/fonts Common subdirectories: Fop-0.20.2/src/org/apache/fop/tools/anttasks and ../Fop-0.20.2/src/org/apache/fop/tools/anttasks Common subdirectories: Fop-0.20.2/src/org/apache/fop/tools/xslt and ../Fop-0.20.2/src/org/apache/fop/tools/xslt Common subdirectories: Fop-0.20.2/src/org/apache/fop/viewer/Images and ../Fop-0.20.2/src/org/apache/fop/viewer/Images Common subdirectories: Fop-0.20.2/src/org/apache/fop/viewer/resources and ../Fop-0.20.2/src/org/apache/fop/viewer/resources