xmlgraphics-fop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spepp...@apache.org
Subject svn commit: r579136 [1/4] - in /xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./ examples/fo/basic/ lib/ src/documentation/content/xdocs/ src/documentation/content/xdocs/0.20.5/ src/documentation/content/xdocs/0.93/ src/documentation/co...
Date Tue, 25 Sep 2007 09:00:31 GMT
Author: spepping
Date: Tue Sep 25 02:00:20 2007
New Revision: 579136

URL: http://svn.apache.org/viewvc?rev=579136&view=rev
Log:
Merged revisions 540001-550000 via svnmerge from 
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk

........
  r540036 | jeremias | 2007-05-21 08:17:48 +0200 (Mon, 21 May 2007) | 3 lines
  
  Bugzilla #42067:
  Fixed a possible StringIndexOutOfBoundsException.
  Submitted by: Paul Vinkenoog <paul.at.vinkenoog.nl>
........
  r540042 | jeremias | 2007-05-21 08:57:03 +0200 (Mon, 21 May 2007) | 1 line
  
  PFMFile is now also used inside FOP's normal operations, so don't log too much in "info" level.
........
  r540049 | jeremias | 2007-05-21 09:32:46 +0200 (Mon, 21 May 2007) | 3 lines
  
  Bugzilla #42109:
  Fixed the rendering of zero-width spaces for certain fonts by not generating them into the area tree.
  Submitted by: Paul Vinkenoog <paul.at.vinkenoog.nl>
........
  r540052 | jeremias | 2007-05-21 09:59:05 +0200 (Mon, 21 May 2007) | 3 lines
  
  Bugzilla #42406:
  Use source resolution setting for bitmap images which don't provide their own resolution.
  Submitted by: Hussein Shafie <hussein.at.xmlmind.com>
........
  r541628 | jeremias | 2007-05-25 14:52:22 +0200 (Fri, 25 May 2007) | 1 line
  
  Checkstyle only.
........
  r542036 | jeremias | 2007-05-27 23:03:22 +0200 (Sun, 27 May 2007) | 1 line
  
  One Factory per VM is enough here.
........
  r542237 | jeremias | 2007-05-28 16:31:24 +0200 (Mon, 28 May 2007) | 16 lines
  
  Bugzilla #41831:
  - Add support font auto-detection (easier font configuration) including a font cache to speed up the auto-detection process.
  - Refactoring of the configuration code: All Avalon configuration stuff is extracted into separate "Configurator" classes.
  - Refactoring of the FOURIResolver.
  Submitted by: Adrian Cumiskey <fop-dev.at.cumiskey.com>
  
  Changes to the patch by jeremias during the review:
  - Font cache simplified (Java object serialization instead of XML), functionality fixed and moved to the fonts.package.
  - Relocated default cache file location to user directory.
  - Fixed the font configuration for PDFDocumentGraphics2D/PDFTranscoder that got lost with the patch.
  - Fixed a problem with having a non-file URL as font base URL.
  - Simplified RendererContextInfo stuff to make it easier to understand.
  - Fixed handling of Type 1 fonts in auto-detection.
  - Reduced verbosity of font-related log output.
  - Updated Jakarta Commons IO to version 1.3.1 (the patch depends on it)
  - Various javadocs improvements
........
  r542242 | jeremias | 2007-05-28 16:48:09 +0200 (Mon, 28 May 2007) | 1 line
  
  Discover the .otf font extension (OpenType fonts), too.
........
  r542447 | vhennebert | 2007-05-29 09:51:52 +0200 (Tue, 29 May 2007) | 7 lines
  
  Bug #42476:
  - fix NPE in XMLReader when no handler is found for the image
  - prevent SVGReader from closing the input stream if the image actually isn't SVG
  - reduce log level in SVGReader and XMLReader to avoid "false positive" (read error reported whereas the image format actually isn't recognized). This may hide regular I/O errors to the end-user, but I assume this will be rare enough compared to the annoyance of such messages when third-party plugins are used.
  
  Patch submitted by Max Berger (max.at.berger.name)
........
  r544748 | vhennebert | 2007-06-06 09:22:04 +0200 (Wed, 06 Jun 2007) | 2 lines
  
  Add Max Berger to the list of FOP's active contributors. Many thanks to Max for his contributions so far!
........
  r544758 | vhennebert | 2007-06-06 09:37:52 +0200 (Wed, 06 Jun 2007) | 3 lines
  
  Add Adrian Cumiskey to the list of FOP's active contributors. Many thanks to Adrian for his contributions so far!
  Patch provided by Adrian himself ;-)
........
  r545224 | clay | 2007-06-07 17:57:47 +0200 (Thu, 07 Jun 2007) | 1 line
  
  Updates to promote FOP 0.93 over 0.20.5
........
  r545589 | spepping | 2007-06-08 20:47:44 +0200 (Fri, 08 Jun 2007) | 2 lines
  
  Apply a similar change to the page of the trunk as to that of the 0.93 release
........
  r547550 | jeremias | 2007-06-15 08:49:40 +0200 (Fri, 15 Jun 2007) | 2 lines
  
  Add JEuclid as it now provides its own FOP extension.
  Correct Barcode4J's URL.
........
  r547553 | jeremias | 2007-06-15 08:55:02 +0200 (Fri, 15 Jun 2007) | 1 line
  
  Add Assentis:DocDesign (an FO editor)
........
  r547971 | pietsch | 2007-06-16 21:59:30 +0200 (Sat, 16 Jun 2007) | 1 line
  
  remove deprecated style task
........
  r547979 | pietsch | 2007-06-16 22:48:24 +0200 (Sat, 16 Jun 2007) | 1 line
  
  removed hyphenation advice from basic example
........
  r548105 | pietsch | 2007-06-17 22:39:55 +0200 (Sun, 17 Jun 2007) | 1 line
  
  corrected some misspellings and other potential annoyances in example
........
  r548619 | vhennebert | 2007-06-19 09:08:33 +0200 (Tue, 19 Jun 2007) | 2 lines
  
  Move Glen Mazza to the list of inactive committers, as per his own request. While I'm at it, replace his column with mine in "Areas of Expertise".
........
  r549767 | cbowditch | 2007-06-22 12:26:39 +0200 (Fri, 22 Jun 2007) | 3 lines
  
  Bugzilla #42576
  Fix bug in force-page-count
  Submitted by Adrian Cumiskey <dev.at.cumiskey.com>
........
  r549816 | jeremias | 2007-06-22 15:34:37 +0200 (Fri, 22 Jun 2007) | 4 lines
  
  Updated PDF/A-1b support according to ISO-19005-1:2005/Cor.1:2007.
  Changed test.xconf to match the triplet generated by auto-font-detection (Gladiator is bold) and adjusted PDF/A test files accordingly.
  Updated XML Graphics Commons to latest snapshot to include the PDF/A fixes.
  Added a unit test for the synchronization of PDF Info and XMP metadata as described in PDF/A-1.
........
  r549827 | jeremias | 2007-06-22 16:23:30 +0200 (Fri, 22 Jun 2007) | 1 line
  
  A note on the PDF/A namespace confusion.
........

Added:
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io-1.3.1.jar
      - copied unchanged from r549827, xmlgraphics/fop/trunk/lib/commons-io-1.3.1.jar
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/apps/FopFactoryConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/CachedFontInfo.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/CachedFontInfo.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/FontCache.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/FontCache.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/
      - copied from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFileFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/FontInfoFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/MacFontDirFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/NativeFontDirFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/UnixFontDirFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/WindowsFontDirFinder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/autodetect/package.html
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/fonts/autodetect/package.html
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/AbstractRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/AbstractRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/PrintRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/PrintRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/RendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/RendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/XMLHandlerConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/afp/AFPRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/bitmap/TIFFRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pcl/PCLRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/ps/PSRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/txt/TXTRendererConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/util/LogUtil.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/util/LogUtil.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/util/UnclosableInputStream.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/src/java/org/apache/fop/util/UnclosableInputStream.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_font_attributes_missing.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_font_attributes_missing.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_font_embedurl_bad.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_font_embedurl_bad.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_font_embedurl_malformed.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_font_embedurl_malformed.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_font_metricsurl_bad.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_font_metricsurl_bad.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_font_metricsurl_malformed.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_font_metricsurl_malformed.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_font_tripletattribute_missing.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_font_tripletattribute_missing.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_fonts_autodetect.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_fonts_autodetect.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_fonts_directory_bad.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_fonts_directory_bad.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_fonts_directory_recursive.xconf
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/config/test_fonts_directory_recursive.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-sequence-force-page-count_bug42576.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/xml/bugtests/font-dir.fo
      - copied unchanged from r549827, xmlgraphics/fop/trunk/test/xml/bugtests/font-dir.fo
Removed:
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io-1.1.jar
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_embedurl_bad.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_embedurl_malformed.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_fontattributes_missing.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_fonttripletattribute_missing.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_metricsurl_bad.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_metricsurl_malformed.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/EmbedUrlBadTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/EmbedUrlMalformedTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/MetricsUrlBadTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/MetricsUrlMalformedTestCase.java
Modified:
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/   (props changed)
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/images.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/inhprop.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/link.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/list.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/pdfoutline.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/readme.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/tableunits.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/textdeko.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.cmd
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io.NOTICE.txt
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/xmlgraphics-commons-1.2svn.jar
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.20.5/index.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.93/index.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/resources.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/team.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/configuration.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/fonts.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/index.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/pdfa.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/apps/FOURIResolver.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/apps/FOUserAgent.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/apps/FopFactory.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/area/AreaTreeParser.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/area/Trait.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/cli/CommandLineOptions.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequence.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/CustomFont.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/EmbedFontInfo.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/Font.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/FontInfo.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/FontLoader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/FontSetup.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/FontUtil.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/LazyFont.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/MultiByteFont.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/apps/TTFReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFile.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/truetype/TTFFontLoader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/PFMFile.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/type1/Type1FontLoader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/BMPReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/GIFReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/JPEGReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/PNGReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/SVGReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/TIFFReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/XMLReader.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFilterList.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFMetadata.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/AbstractRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/AbstractRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/PrintRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/RendererContext.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/RendererFactory.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/afp/AFPRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/afp/AFPRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/awt/AWTRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/java2d/FontSetup.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pcl/PCLRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pcl/PCLRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pdf/PDFRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pdf/PDFRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/print/PrintRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/NativeTextHandler.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/PSRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/PSRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/PSTextPainter.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/txt/TXTRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/txt/TXTRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/xml/XMLRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/xml/XMLRendererMaker.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFContext.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFGraphics2D.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFTextElementBridge.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFTextPainter.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFTranscoder.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/util/CharUtilities.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/config/test_fontbase_bad.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontBaseBadTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/config/UserConfigTestSuite.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/block_white-space_4.xml
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/test.xconf
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/xml/pdf-a/minimal-pdf-a.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/xml/pdf-a/with-cmyk-images.fo
    xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/xml/pdf-encoding/pdf-encoding-test.xconf

Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Sep 25 02:00:20 2007
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-540000
+/xmlgraphics/fop/trunk:1-550000

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=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml Tue Sep 25 02:00:20 2007
@@ -1188,7 +1188,7 @@
   </target>
 
   <target name="checkstyle-html" depends="checkstyle-avail, checkstyle-check" if="checkstyle.noframes.xslt.available">
-    <style in="${build.dir}/checkstyle_report.xml" out="${build.dir}/checkstyle_report.html" style="${checkstyle.noframes.xslt}"/>
+    <xslt in="${build.dir}/checkstyle_report.xml" out="${build.dir}/checkstyle_report.html" style="${checkstyle.noframes.xslt}"/>
   </target>
 
   <target name="checkstyle" depends="checkstyle-avail, checkstyle-check, checkstyle-html" description="Runs Checkstyle for a code quality report"/>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/images.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/images.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/images.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/images.fo Tue Sep 25 02:00:20 2007
@@ -48,49 +48,43 @@
 <fo:flow flow-name="xsl-region-body">
 <fo:block font-size="18pt" font-weight="bold">1. FOP test for images</fo:block>
 <fo:block id="N2531">
-  <!--fox:destination internal-destination="N2531"/-->
+
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A GIF image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/xml_feather.gif"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2535">
-  <!--fox:destination internal-destination="N2535"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A transparent GIF image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/xml_feather_transparent.gif"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2545">
-  <!--fox:destination internal-destination="N2545"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A JPEG image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/fop.jpg"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2550">
-  <!--fox:destination internal-destination="N2550"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A BMP image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/linux.bmp"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2555">
-  <!--fox:destination internal-destination="N2555"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A PNG image in FOP</fo:block>
   <fo:block>
-    <fo:external-graphic src="file:../graphics/asf-logo.png"/>
+    <fo:external-graphic src="../graphics/asf-logo.png"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2556">
-  <!--fox:destination internal-destination="N2556"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em">A TIFF image in FOP</fo:block>
   <fo:block>
     <fo:external-graphic src="../graphics/asf-logo.tif"/>
   </fo:block>
 </fo:block>
 <fo:block id="N2559">
-  <!--fox:destination internal-destination="N2559"/-->
   <fo:block font-size="16pt" font-weight="bold" space-before.minimum="1em" space-before.optimum="1.5em" space-before.maximum="2em"/>
   This section is only required to show that the layout still works.
 </fo:block>
@@ -121,37 +115,37 @@
     </fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: [none]</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" height="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: inline-progression-dimension="60mm" block-progression-dimension="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" inline-progression-dimension="60mm" block-progression-dimension="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" inline-progression-dimension="60mm" block-progression-dimension="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="30mm" height="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="30mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="30mm" height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="30mm" height="20mm" overflow="hidden"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="30mm" height="20mm" overflow="hidden" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="30mm" height="20mm" overflow="hidden" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" height="20mm" text-align="center" display-align="center"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" height="20mm" text-align="center" display-align="center" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" height="20mm" text-align="center" display-align="center" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: content-height="20mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" content-height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" content-height="20mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
     
     <fo:block keep-with-next.within-column="always">Properties: content-width="60mm" content-height="40mm"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" border="solid 0.1pt" background-color="yellow"/></fo:block>
 
     <fo:block keep-with-next.within-column="always">Properties: content-width="60mm" content-height="40mm" scaling="non-uniform"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" scaling="non-uniform" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" content-width="60mm" content-height="40mm" scaling="non-uniform" border="solid 0.1pt" background-color="yellow"/></fo:block>
 
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" height="20mm" content-width="scale-to-fit"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" height="20mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" height="20mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
 
     <fo:block keep-with-next.within-column="always">Properties: width="60mm" content-width="scale-to-fit"</fo:block>
-    <fo:block><fo:external-graphic src="file:../graphics/asf-logo-nt.png" width="60mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
+    <fo:block><fo:external-graphic src="../graphics/asf-logo-nt.png" width="60mm" content-width="scale-to-fit" border="solid 0.1pt" background-color="yellow"/></fo:block>
   </fo:block>
 </fo:flow>
 

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/inhprop.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/inhprop.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/inhprop.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/inhprop.fo Tue Sep 25 02:00:20 2007
@@ -141,7 +141,7 @@
 font-style='oblique'>inherited-property-value</fo:inline>
 function. Here's an <fo:inline color='black' background-color='white'>inline
 object</fo:inline> with fixed colors (black on white). That doesn't
-work either. Guess it's not my problem... So let's try it with font
+work either. Guess it's not my problem ... So let's try it with font
 sizes. In this block, we'll put an
 <fo:inline font-size='inherited-property-value(font-size)+2pt'>inline
 object whose font-size is 2 pt bigger than its parent's font-size.</fo:inline></fo:block>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/link.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/link.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/link.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/link.fo Tue Sep 25 02:00:20 2007
@@ -46,7 +46,7 @@
       <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="start" hyphenate="true" language="en">
+      <fo:block text-align="start">
         3. A multiline text (text-align='start'). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
         enable generic SGML to be served, received, and processed on the Web in the way that is now possible with HTML. XML
         has been designed for ease of implementation and for interoperability with both SGML and HTML. For further information
@@ -79,7 +79,7 @@
       <fo:block text-align="center">---</fo:block>
 
       <!-- Normal text -->
-      <fo:block text-align="justify" hyphenate="true" language="en">
+      <fo:block text-align="justify">
         6. A multiline text (text-align='justify'). The Extensible Markup Language (XML) is a subset of SGML that is completely described in this document. Its goal is to
         enable generic SGML to be served, received, and processed on the Web in the way that is now possible with HTML. XML
         has been designed for ease of implementation and for interoperability with both SGML and HTML. For further information

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/list.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/list.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/list.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/list.fo Tue Sep 25 02:00:20 2007
@@ -226,7 +226,7 @@
            url: http://www.w3.org/TR/xsl/ -->
       <fo:block text-align="center"
                 space-before.optimum="0.5cm">
-        <fo:external-graphic src="file:../graphics/listgeometry.gif"/>
+        <fo:external-graphic src="../graphics/listgeometry.gif"/>
       </fo:block>
       <fo:block font-size="10pt"
             font-family="sans-serif"

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/pdfoutline.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/pdfoutline.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/pdfoutline.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/pdfoutline.fo Tue Sep 25 02:00:20 2007
@@ -1198,9 +1198,9 @@
 
   <fo:block  id="sec11" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >K)
       Licence</fo:block>
-  <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block>
+  <fo:block space-after.optimum="3pt" font-family="serif"> ===================================================================</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif">                   The Apache Software License, Version 1.1</fo:block>
-  <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block>
+  <fo:block space-after.optimum="3pt" font-family="serif"> ===================================================================</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif">    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif"> Redistribution and use in source and binary forms, with or without modification,
       are permitted provided that the following conditions are met:</fo:block>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/readme.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/readme.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/readme.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/readme.fo Tue Sep 25 02:00:20 2007
@@ -1137,9 +1137,9 @@
 
   <fo:block  id="sec11" font-size="18pt" font-family="serif" line-height="20pt" space-before.optimum="20pt" space-after.optimum="14pt" >K)
       Licence</fo:block>
-  <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block>
+  <fo:block space-after.optimum="3pt" font-family="serif"> ===================================================================</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif">                   The Apache Software License, Version 1.1</fo:block>
-  <fo:block space-after.optimum="3pt" font-family="serif"> ============================================================================</fo:block>
+  <fo:block space-after.optimum="3pt" font-family="serif"> ===================================================================</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif">    Copyright (C) 1999 The Apache Software Foundation. All rights reserved.</fo:block>
   <fo:block space-after.optimum="3pt" font-family="serif"> Redistribution and use in source and binary forms, with or without modification,
       are permitted provided that the following conditions are met:</fo:block>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/tableunits.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/tableunits.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/tableunits.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/tableunits.fo Tue Sep 25 02:00:20 2007
@@ -21,205 +21,199 @@
   <!-- starts actual layout -->
   <fo:page-sequence master-reference="first">
 
-  <fo:flow flow-name="xsl-region-body">
+    <fo:flow flow-name="xsl-region-body">
 
-    <!-- normal text -->
-    <fo:block space-after="1cm" text-align="start" padding="0.4in"
-  border="thick solid red">Table unit tests</fo:block>
-    <fo:table border-collapse="separate" table-layout="fixed" width="6in">
-      <fo:table-column column-width="(4.5in - 2cm) div 3 +1in" background-color="yellow"/>
-      <fo:table-column column-width="(4.5in - 2cm) div 3 + 0.5in" background-color="blue"/>
-      <fo:table-column column-width="(4.5in - 2cm) div 3 + 2.0cm" background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>fixed width columns</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed" width="6in">
-      <fo:table-column column-width="1in + proportional-column-width(1)" background-color="yellow"/>
-      <fo:table-column column-width="2 * (proportional-column-width(1) + .5in) div 2" background-color="blue"/>
-      <fo:table-column column-width="proportional-column-width(1) + 2.0cm" background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-        <fo:table-row>
-          <fo:table-cell  background-color="blue"><fo:block>default alignment
-</fo:block></fo:table-cell>
-          <fo:table-cell height="3cm" background-color="green" display-align="center"><fo:block>Centered with height=3cm</fo:block></fo:table-cell>
-          <fo:table-cell  background-color="yellow" display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-        <fo:table-row height="3cm">
-          <fo:table-cell><fo:block>default alignment but with a height
-of 3cm on the row </fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-<fo:block space-before="12pt" space-after="6pt">
-The next table has width=100% on the table no column widths specified on the table-column element.
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed" width="100%">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-
-<fo:block space-before="12pt" space-after="6pt">
-The next table has fixed column widths=13cm, ipd.optimum=12cm and ipd.max = 100%.
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" 
-       table-layout="fixed"
-       inline-progression-dimension="12cm"
-       inline-progression-dimension.maximum="100%"
-    >
-      <fo:table-column column-width="8cm" background-color="yellow"/>
-      <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
-      <fo:table-column column-width="5cm" background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table><fo:block space-before="12pt" space-after="6pt">
-The next table has fixed column widths=16.5cm, ipd.optimum=14cm and ipd.max = 100% (16cm).
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed"
-        inline-progression-dimension="14cm"
-        inline-progression-dimension.maximum="100%">
-      <fo:table-column column-width="8.5cm" background-color="yellow"/>
-      <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
-      <fo:table-column column-width="8cm" background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-<fo:block space-before="12pt" space-after="6pt">
-The next table has width="70% + 1cm" and fixed lengths and the first table-column
-has column-width="from-parent('width') div 3".
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate" table-layout="fixed" width="70% + 1cm">
-      <fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/>
-      <fo:table-column background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-
-<fo:block space-before="12pt" space-after="6pt">
-The next table specifies inline-progression-dimension="15cm" instead of width. The
-middle column has a fixed width; the other two have default width.
-</fo:block>
-    <!-- table start -->
-    <fo:table border-collapse="separate"
-        table-layout="fixed"
-        inline-progression-dimension="15cm">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="3cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-
-<fo:block space-before="12pt" space-after="6pt">
-The next table specifies neither width nor inline-progression-dimenion.
-</fo:block>
-    <!-- table start -->
-    <fo:table table-layout="fixed" border-collapse="separate">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="3cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-
-<fo:block space-before="12pt" space-after="6pt">
-The next table specifies inline-progression-dimenion.minimum="10cm" and
-specifies a column width of 5cm on the middle column only..
-</fo:block>
-    <!-- table start -->
-    <fo:table table-layout="fixed" border-collapse="separate"
-        inline-progression-dimension.minimum="10cm">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="5cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
-<fo:block space-before="12pt" space-after="6pt">
-The next table specifies inline-progression-dimenion.minimum="10cm",
-inline-progression-dimension.maximum="17cm and
-specifies a column width of 5cm on the middle column only..
-</fo:block>
-    <!-- table start -->
-    <fo:table table-layout="fixed" border-collapse="separate"
-        inline-progression-dimension.minimum="10cm"
-        inline-progression-dimension.maximum="17cm">
-      <fo:table-column background-color="yellow"/>
-      <fo:table-column column-width="5cm" background-color="blue"/>
-      <fo:table-column background-color="green"/>
-      <fo:table-body>
-        <fo:table-row>
-          <fo:table-cell display-align="before"><fo:block>Some text to make this cell
-deeper than the others to check out the aliignment properties.</fo:block></fo:table-cell>
-          <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
-          <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
-        </fo:table-row>
-      </fo:table-body>
-    </fo:table>
+      <fo:block space-after="1cm" text-align="start" padding="0.4in" border="thick solid red">Table unit tests</fo:block>
 
+      <fo:table border-collapse="separate" table-layout="fixed" width="6in">
+        <fo:table-column column-width="(4.5in - 2cm) div 3 +1in" background-color="yellow"/>
+        <fo:table-column column-width="(4.5in - 2cm) div 3 + 0.5in" background-color="blue"/>
+        <fo:table-column column-width="(4.5in - 2cm) div 3 + 2.0cm" background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>fixed width columns</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:table border-collapse="separate" table-layout="fixed" width="6in">
+        <fo:table-column column-width="1in + proportional-column-width(1)" background-color="yellow"/>
+        <fo:table-column column-width="2 * (proportional-column-width(1) + .5in) div 2" background-color="blue"/>
+        <fo:table-column column-width="proportional-column-width(1) + 2.0cm" background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+          <fo:table-row>
+            <fo:table-cell  background-color="blue"><fo:block>default alignment
+            </fo:block></fo:table-cell>
+            <fo:table-cell height="3cm" background-color="green" display-align="center"><fo:block>Centered with height=3cm</fo:block></fo:table-cell>
+            <fo:table-cell  background-color="yellow" display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+          <fo:table-row height="3cm">
+            <fo:table-cell><fo:block>default alignment but with a height
+            of 3cm on the row </fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">The next table has width=100% on the table no column widths specified on the table-column element.</fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" table-layout="fixed" width="100%">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">The next table has fixed column widths=13cm, ipd.optimum=12cm and ipd.max = 100%.</fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" 
+                table-layout="fixed"
+                inline-progression-dimension="12cm"
+                inline-progression-dimension.maximum="100%"
+                >
+        <fo:table-column column-width="8cm" background-color="yellow"/>
+        <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
+        <fo:table-column column-width="5cm" background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+        </fo:table>
+
+        <fo:block space-before="12pt" space-after="6pt">The next table has fixed column widths=16.5cm, ipd.optimum=14cm and ipd.max = 100% (16cm).</fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" table-layout="fixed"
+                inline-progression-dimension="14cm"
+                inline-progression-dimension.maximum="100%">
+        <fo:table-column column-width="8.5cm" background-color="yellow"/>
+        <fo:table-column column-width="proportional-column-width(2)" background-color="blue"/>
+        <fo:table-column column-width="8cm" background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">The next table has width="70% + 1cm" and fixed lengths and the first table-column has column-width="from-parent('width') div 3".</fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate" table-layout="fixed" width="70% + 1cm">
+        <fo:table-column column-width="from-parent('width') div 3" background-color="yellow"/>
+        <fo:table-column background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">
+        The next table specifies inline-progression-dimension="15cm" instead of width. The
+        middle column has a fixed width; the other two have default width.
+      </fo:block>
+      <!-- table start -->
+      <fo:table border-collapse="separate"
+                table-layout="fixed"
+                inline-progression-dimension="15cm">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="3cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">
+        The next table specifies neither width nor inline-progression-dimension.
+      </fo:block>
+      <!-- table start -->
+      <fo:table table-layout="fixed" border-collapse="separate">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="3cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">
+        The next table specifies inline-progression-dimension.minimum="10cm" and
+        specifies a column width of 5cm on the middle column only.
+      </fo:block>
+      <!-- table start -->
+      <fo:table table-layout="fixed" border-collapse="separate"
+                inline-progression-dimension.minimum="10cm">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="5cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
+
+      <fo:block space-before="12pt" space-after="6pt">
+        The next table specifies inline-progression-dimension.minimum="10cm",
+        inline-progression-dimension.maximum="17cm and
+        specifies a column width of 5cm on the middle column only.
+      </fo:block>
+      <!-- table start -->
+      <fo:table table-layout="fixed" border-collapse="separate"
+                inline-progression-dimension.minimum="10cm"
+                inline-progression-dimension.maximum="17cm">
+        <fo:table-column background-color="yellow"/>
+        <fo:table-column column-width="5cm" background-color="blue"/>
+        <fo:table-column background-color="green"/>
+        <fo:table-body>
+          <fo:table-row>
+            <fo:table-cell display-align="before"><fo:block>Some text to make this cell
+            deeper than the others to check out the alignment properties.</fo:block></fo:table-cell>
+            <fo:table-cell display-align="center"><fo:block>Centered</fo:block></fo:table-cell>
+            <fo:table-cell display-align="after"><fo:block>Bottom aligned</fo:block></fo:table-cell>
+          </fo:table-row>
+        </fo:table-body>
+      </fo:table>
 
     </fo:flow>
   </fo:page-sequence>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/textdeko.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/textdeko.fo?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/textdeko.fo (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/examples/fo/basic/textdeko.fo Tue Sep 25 02:00:20 2007
@@ -218,7 +218,7 @@
 
 
       <fo:block space-after.optimum="13pt">
-        And now <fo:inline text-decoration="underline">more than a word...</fo:inline>
+        And now <fo:inline text-decoration="underline">more than a word ...</fo:inline>
       </fo:block>
 
       <fo:block space-after.optimum="13pt" font-size="14pt" text-decoration="underline">

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=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.bat Tue Sep 25 02:00:20 2007
@@ -62,7 +62,7 @@
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\batik-all-1.6.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\xmlgraphics-commons-1.2svn.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\avalon-framework-4.2.0.jar
-set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\commons-io-1.1.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
@@ -70,6 +70,8 @@
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%LIBDIR%\fop-hyph.jar
 set LOCALCLASSPATH=%LOCALCLASSPATH%;%FOP_HYPHENATION_PATH%
 
+set JAVAOPTS=-Denv.windir=%WINDIR%
+
 if "%JAVA_HOME%" == "" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
@@ -80,5 +82,4 @@
 
 :runFop
 rem ECHO "%JAVACMD%"
-"%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.cmd
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.cmd?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.cmd (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop.cmd Tue Sep 25 02:00:20 2007
@@ -58,6 +58,8 @@
 set LOCALCLASSPATH=%FOP_HYPHENATION_PATH%
 for %%l in (%LOCAL_FOP_HOME%build\*.jar %LIBDIR%\*.jar) do set LOCALCLASSPATH=!LOCALCLASSPATH!;%%l
 
+set JAVAOPTS=-Denv.windir=%WINDIR%
+
 if "%JAVA_HOME%" == "" goto noJavaHome
 if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
 if "%JAVACMD%" == "" set JAVACMD=%JAVA_HOME%\bin\java
@@ -68,6 +70,6 @@
 
 :runFop
 rem echo "%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
-"%JAVACMD%" %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
+"%JAVACMD%" %JAVAOPTS% %LOGCHOICE% %LOGLEVEL% -cp "%LOCALCLASSPATH%" org.apache.fop.cli.Main %FOP_CMD_LINE_ARGS%
 
 ENDLOCAL

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io.NOTICE.txt
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io.NOTICE.txt?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io.NOTICE.txt (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/lib/commons-io.NOTICE.txt Tue Sep 25 02:00:20 2007
@@ -1,3 +1,6 @@
+Apache Jakarta Commons IO
+Copyright 2001-2007 The Apache Software Foundation
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 

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

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.20.5/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.20.5/index.xml?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.20.5/index.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/0.20.5/index.xml Tue Sep 25 02:00:20 2007
@@ -26,11 +26,8 @@
     <section id="intro">
       <title>Introduction</title>
       <p>
-        Version 0.20.5 represents Apache FOP's current stable release. Even though it's over two years old
-        this release will stay the first choice for those who want a stable product for use in production
-        environments, at least for another few months until the code from out redesign effort has stabilized
-        enough. This shouldn't keep you off trying out the <a href="../trunk/index.html">redesigned code</a>, 
-        though.
+        Version 0.20.5 represents Apache FOP's previous stable release.  It is now
+        recommended that you use <a href="../0.93/index.html">0.93</a> instead.
       </p>
       <p>
         Please notice that, although we still provide support for 0.20.5, we won't fix any bugs or add any 

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=579136&r1=579135&r2=579136&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 Tue Sep 25 02:00:20 2007
@@ -26,11 +26,10 @@
     <section id="intro">
       <title>Introduction</title>
       <p>
-        The Apache FOP team is proud to present to you the largely rewritten codebase which is 
-        finally in a state where you can use it. It has taken over three years to get this
-        far and over two years without a new release from the FOP project. We're still in the process of adding new
-        features. We welcome any feedback you might have and even more, any
-        other form of help to get the project forward.
+        The Apache FOP team is proud to present to you this production quality release. It has taken
+        over three years to get this far and over two years without a new release from the FOP
+        project. We're still in the process of adding new features. We welcome any feedback you
+        might have and even more, any other form of help to get the project forward.
       </p>
       <p>
         This fourth release contains many bug fix release and new features compared

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/resources.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/resources.xml?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/resources.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/resources.xml Tue Sep 25 02:00:20 2007
@@ -197,7 +197,8 @@
           <li>[software] TIFFRenderer is a renderer for outputting multi-page TIFF: <jump href="http://www.tkachenko.com/fop/tiffrenderer.html">http://www.tkachenko.com/fop/tiffrenderer.html</jump> (MPL)</li>
           <li>[software] AFP Renderer / Batch Assembler for FOP: <jump href="http://mypage.bluewin.ch/huanderegg/">http://mypage.bluewin.ch/huanderegg/</jump> (open source, license unclear)</li>
           <li>[software] The <jump href="http://mogwai.sourceforge.net">Mogwai Project</jump> includes a renderer for FOP that generates output for Okidata dot matrix printers (GPL).</li>
-          <li>[software] <jump href="http://barcode4j.krysalis.org">Barcode4J</jump> (formerly Krysalis Barcode) is a barcode generator which can be used with FOP (Apache license v2.0).</li>
+          <li>[software] <jump href="http://barcode4j.sourceforge.net">Barcode4J</jump> (formerly Krysalis Barcode) is a barcode generator which can be used with FOP (Apache license v2.0).</li>
+          <li>[software] <jump href="http://jeuclid.sourceforge.net">JEuclid</jump> is a MathML implementation which can be used with FOP (Apache license v2.0).</li>
           <li>[software] <jump href="http://afp-renderer.sourceforge.net/">AFP Renderer</jump> renders formatted objects to AFP or (MO:DCA).</li>
           <li>[software &amp; tools] <jump href="http://offo.sourceforge.net/">Objects For Formatting Objects</jump> hosts hyphenation patterns and (eventually) files other accessory data files &amp; scripts.</li>
         </ul>        
@@ -222,6 +223,7 @@
           <li>[software] <jump href="http://www.rubico.com/styler">XML Report Styler</jump> by Rubico (commercial)</li>
           <li>[software] <jump href="http://www.metafocus.no/en/xultation_designer.php">Xultation Designer</jump> by Metafocus (commercial)</li>
           <li>[software] <jump href="http://www.cambridgedocs.com/products/downloads/WordFODesigner.htm">Word FO Designer</jump> by CambridgeDocs (commercial)</li>
+          <li>[software] <jump href="http://web.assentis.com/products/products.php?navi=Products&amp;product_id=7">Assentis:DocDesign</jump> by Assentis Technologies (commercial)</li>
         </ul>
       </section>
       <section id="products-other">

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/team.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/team.xml?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/team.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/team.xml Tue Sep 25 02:00:20 2007
@@ -72,8 +72,6 @@
           See his <fork href="http://www.jeremias-maerki.ch">home page</fork> for more information
           about him.
         </li>
-        <li id="gm"><link href="mailto:gmazza@apache.org">Glen Mazza</link> (GM) is an information
-            systems analyst from Arlington, Virginia, USA.</li>
         <li id="sp"><link href="mailto:spepping@apache.org">Simon Pepping</link> (SP) came to FOP
             from the TeX/LaTeX world. See his <fork href="http://www.leverkruid.eu">home
             page</fork> for some of his private projects.</li>
@@ -84,6 +82,13 @@
     <section id="contribute-active">
       <title>Active Contributors</title>
       <ul>
+        <li id="mb"><link href="mailto:max AT berger DOT name">Max Berger</link> is currently a
+          PostDoc pursuing an academic career in computer science. His main interest in FOP is to
+          improve the DocBook to PDF tool-chain to produce high quality output, while still
+          conforming to given style-guides. See his <link href="http://max.berger.name">home
+            page</link> for more information.</li>
+        <li id="ac"><link href="mailto:adrian.cumiskey.at.gmail.com">Adrian Cumiskey</link> (AC),
+          is a Java and Perl Programmer from St Albans, United Kingdom.</li>
     <li id="lm">Louis Masters</li>
     <li id="mn">Manoj Nair, Currently consulting for Sony Pictures Entertainment in Los Angeles, CA USA. Previously he worked with Java &amp; related technologies specializing in developing n-tier Web applications.</li>
         <li id="rr"><link href="mailto:renaud.richardet AT gmail DOT com">Renaud Richardet</link> (RR)
@@ -112,6 +117,7 @@
         <li id="fj"><link href="mailto:fotis@apache.org">Fotis Jannidis</link></li>
         <li id="kl"><link href="mailto:klease@apache.org">Karen Lease</link></li>
         <li id="kll"><link href="mailto:keiron@apache.org">Keiron Liddle</link></li>
+        <li id="gm"><link href="mailto:gmazza@apache.org">Glen Mazza</link></li>
         <li id="wvm"><link href="mailto:vmote@apache.org">Victor Mote</link></li>
         <li id="jn"><link href="mailto:jordan@apache.org">Jordan Naftolin</link></li>
         <li id="as"><link href="mailto:arved@apache.org">Arved Sandstrom</link></li>
@@ -129,7 +135,7 @@
           <th>FB</th>
           <th>CL</th>
           <th>JM</th>
-          <th>GM</th>
+          <th>VH</th>
           <th>PH</th>
           <th>JP</th>
           <th>SP</th>
@@ -155,7 +161,7 @@
           <td>X</td>
           <td/>
           <td>X</td>
-          <td>X</td>
+          <td></td>
           <td/>
           <td/>
           <td>X</td>
@@ -181,7 +187,7 @@
           <td/>
           <td/>
           <td>X</td>
-          <td/>
+          <td>X</td>
           <td/>
           <td>X</td>
           <td>X</td>

Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/configuration.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/configuration.xml?rev=579136&r1=579135&r2=579136&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/configuration.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/trunk/configuration.xml Tue Sep 25 02:00:20 2007
@@ -152,6 +152,24 @@
         <td>"height" 11 inches, "width" 8.26 inches</td>
       </tr>
       <tr>
+        <td>use-cache</td>
+        <td>boolean (true, false)</td>
+        <td>All fonts information that has been gathered as a result of "directory"
+        or "auto-detect" font configurations will be cached for future rendering runs.
+        This setting should improve performance on systems where
+        fonts have been configured using the "directory" or "auto-detect" tag mechanisms.
+        By default this option is switched on.</td>
+        <td>true</td>
+      </tr>
+      <tr>
+        <td>cache-file</td>
+        <td>String</td>
+        <td>This options specifies the file/directory path of the fop cache file.
+        This option can also be specified on the command-line using the -cache option.
+        This file is currently only used to cache font triplet information for future reference.</td>
+        <td>${base}/conf/fop.cache</td>
+      </tr>
+      <tr>
         <td>renderers</td>
         <td>(see text below)</td>
         <td>Contains the configuration for each renderer. See below.</td>



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