You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by sp...@apache.org on 2007/11/08 22:27:35 UTC
svn commit: r593328 [1/7] - in
/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking: ./
src/codegen/fonts/ src/documentation/ src/documentation/content/xdocs/
src/documentation/content/xdocs/dev/ src/documentation/content/xdocs/trunk/
src/java...
Author: spepping
Date: Thu Nov 8 13:27:19 2007
New Revision: 593328
URL: http://svn.apache.org/viewvc?rev=593328&view=rev
Log:
Merged revisions 582377-593296 via svnmerge from
https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk
........
r584699 | jeremias | 2007-10-15 09:23:37 +0200 (Mon, 15 Oct 2007) | 1 line
Bugfix for NPE with empty table-row (regression from 0.93).
........
r584790 | jeremias | 2007-10-15 15:54:08 +0200 (Mon, 15 Oct 2007) | 1 line
Add OSSummit in Asia
........
r585141 | vhennebert | 2007-10-16 15:44:19 +0200 (Tue, 16 Oct 2007) | 2 lines
Bugzilla #43616: bug in the computation of remaining height that caused extra space to appear in tables
........
r585167 | jeremias | 2007-10-16 17:12:45 +0200 (Tue, 16 Oct 2007) | 1 line
Bugfix: If auto-detection is enabled, auto-detection didn't get done starting with the second rendering run in the same JVM. Static variables are dangerous!
........
r586354 | vhennebert | 2007-10-19 11:50:03 +0200 (Fri, 19 Oct 2007) | 2 lines
Added a news item about Adrian Cumiskey becoming a committer
........
r586480 | vhennebert | 2007-10-19 16:32:39 +0200 (Fri, 19 Oct 2007) | 2 lines
Corrected typo: explicitely -> explicitly
........
r587052 | jeremias | 2007-10-22 12:12:40 +0200 (Mon, 22 Oct 2007) | 3 lines
Bugzilla #43597:
Added support for SVGZ.
Submitted by: Max Berger <max.at.berger.name>
........
r587053 | jeremias | 2007-10-22 12:13:34 +0200 (Mon, 22 Oct 2007) | 2 lines
Bugzilla #43597:
Added a test file for the SVGZ case.
........
r587204 | spepping | 2007-10-22 21:10:23 +0200 (Mon, 22 Oct 2007) | 4 lines
Removed the export statement, because it must be on a separate line in
plain-vanilla Bourne shells, and it is not needed. Restricted the
special setting of IFS to the section that requires it.
........
r588275 | vhennebert | 2007-10-25 18:26:41 +0200 (Thu, 25 Oct 2007) | 2 lines
Removed the check for borders specified on table-column/body/row in separate border model, since this is perfectly legal: they may be retrieved by specifying "inherit" on table-cells
........
r588545 | jeremias | 2007-10-26 09:32:50 +0200 (Fri, 26 Oct 2007) | 1 line
Fix for ClassCastException if non-PS extension attachments are encountered.
........
r588546 | jeremias | 2007-10-26 09:34:09 +0200 (Fri, 26 Oct 2007) | 1 line
Some log fine-tuning.
........
r588547 | jeremias | 2007-10-26 09:48:14 +0200 (Fri, 26 Oct 2007) | 6 lines
Merged https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_PDF_in_PDF (563130:HEAD) into Trunk.
Adds generic structures in PDF so it is possible to embed external PDF documents, for example to support PDF files in fo:external-graphic for PDF output. See also: http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/200708.mbox/%3c20070806165027.5C59.DEV@jeremias-maerki.ch%3e
I tried to keep the changes on the API of the PDF library minimal but there could still be some incompatibilities for anyone who uses it separately.
This also adds support for dynamically registering an image handler. That's just a temporary solution until the image package redesign is done. But it works.
........
r588586 | vhennebert | 2007-10-26 11:43:01 +0200 (Fri, 26 Oct 2007) | 3 lines
Created an abstract TableCellContainer class meant to contain the logic in TableRowIterator.
Factored some code common to TableBody and TableRow in it.
........
r588592 | vhennebert | 2007-10-26 11:58:54 +0200 (Fri, 26 Oct 2007) | 2 lines
Removed useless addChildNode method since it only transfered the call to the parent method
........
r588597 | vhennebert | 2007-10-26 12:25:07 +0200 (Fri, 26 Oct 2007) | 2 lines
Moved the creation of the columns list to the declaration of the columns field. Even if there are no explicit columns the list will have to be created anyway.
........
r588603 | acumiskey | 2007-10-26 13:19:50 +0200 (Fri, 26 Oct 2007) | 1 line
My first commit :)
........
r588604 | vhennebert | 2007-10-26 13:20:59 +0200 (Fri, 26 Oct 2007) | 2 lines
Made the columns field in Table private, and created suitable accessors to it
........
r588635 | acumiskey | 2007-10-26 15:18:44 +0200 (Fri, 26 Oct 2007) | 1 line
Whoops.. lets maintain the alphabetical ordering! :)
........
r588733 | acumiskey | 2007-10-26 20:17:00 +0200 (Fri, 26 Oct 2007) | 2 lines
Applying [PATCH] 43587 - Multiple ps:comment-? within fo:declarations causes ClassCastException
........
r588749 | acumiskey | 2007-10-26 20:58:15 +0200 (Fri, 26 Oct 2007) | 6 lines
Bugzilla #43042:
Applied [PATCH] 43042 - PS extension implementation code cleanup.
Partially modified the patch due to code changes. Many thanks to Andrejus Chaliapinas for this patch :)
Submitted by: Andrejus Chaliapinas <a.chaliapinas.at.infosana.com>
........
r588755 | acumiskey | 2007-10-26 21:20:02 +0200 (Fri, 26 Oct 2007) | 5 lines
Applied [PATCH] 43143 - ExpertEncoding and ExpertSubsetEncoding not detected for Type 1 fonts
Many thanks to William (wliem AT allette DOT com DOT au) for reporting the problem.
NOTE: More work needs to be done to provide support for ExpertEncoding
(this is documented in src/codegen/fonts/encodings.xml within this patch).
........
r588858 | acumiskey | 2007-10-27 03:07:49 +0200 (Sat, 27 Oct 2007) | 5 lines
Bugzilla #42982:
Applied [PATCH] 42982 - Support Fonts in JAR files
Nice work Max, I look forward to you joining us soon :)
Submitted by: Max Berger <max.at.berger.name>
........
r589119 | acumiskey | 2007-10-27 16:45:30 +0200 (Sat, 27 Oct 2007) | 2 lines
Fixes 42982, 43042, 43587, 43143 and 43439 applied to trunk
........
r590136 | vhennebert | 2007-10-30 17:21:39 +0100 (Tue, 30 Oct 2007) | 9 lines
- factored the management of column numbers into a separate helper class
- moved the PendingSpan inner class from TableFObj into TableCellContainer, where it's a bit more appropriate
- simplified the getTable method in TableFObj by overriding it in Table
- simplified the propertyMaker for column-number: now it's the table-cell which notifies the parent table-body that it starts a new row. As an additional benefit the propertyMaker for starts-row is now called only once, instead of twice before
- reworked, factored and simplified the handling of column indices in TableCellContainer
- bugfix: repeated fo:table-column were not added at the right place in the column lists
- bugfix: width set on cell on second row was applied to the column's width, whereas it shouldn't
- checkstyle cleanup
........
r590159 | vhennebert | 2007-10-30 18:14:31 +0100 (Tue, 30 Oct 2007) | 2 lines
Updated testcase to reflect new code behaviour: gaps between columns are now ignored
........
r590177 | vhennebert | 2007-10-30 18:42:10 +0100 (Tue, 30 Oct 2007) | 2 lines
Removed no longer useful setCurrentColumnIndex method on ColumnNumberManager. The column number is now automatically updated in signalUsedColumnNumbers
........
r590514 | acumiskey | 2007-10-31 00:44:39 +0100 (Wed, 31 Oct 2007) | 3 lines
Simple renaming of method following patch that was recently applied
http://issues.apache.org/bugzilla/show_bug.cgi?id=42982
........
r590616 | acumiskey | 2007-10-31 11:29:02 +0100 (Wed, 31 Oct 2007) | 1 line
Url is actually a Uri
........
r590705 | vhennebert | 2007-10-31 16:06:35 +0100 (Wed, 31 Oct 2007) | 3 lines
- Enforced check for proper number of columns in a table. Now if a table has explicit table-columns, those fix the total number of columns and any row having more columns will lead to an error.
- Set up a framework for unit-testing classes from the FO tree, and added some first testcases for the number of columns in tables.
........
r590714 | vhennebert | 2007-10-31 16:20:43 +0100 (Wed, 31 Oct 2007) | 2 lines
Replaced svn:eol property with svn:eol-style or set that latter to native
........
r590736 | jeremias | 2007-10-31 17:39:04 +0100 (Wed, 31 Oct 2007) | 1 line
Some fonts have spaces in their names (ex. "Arial Unicode MS"). This change modifies font auto-detection so both "ArialUnicodeMS" (as before) and "Arial Unicode MS" (new) are registered for a font.
........
r590747 | vhennebert | 2007-10-31 17:53:27 +0100 (Wed, 31 Oct 2007) | 2 lines
Additional testcases for too many columns, this time in header or footer.
........
r591063 | vhennebert | 2007-11-01 16:57:50 +0100 (Thu, 01 Nov 2007) | 2 lines
Testcases for fo:table-column
........
r591299 | vhennebert | 2007-11-02 12:01:41 +0100 (Fri, 02 Nov 2007) | 2 lines
Reworked the creation of implicit columns to match new behaviour: the number of columns of a table without explicit fo:table-column is set by the row that has the most columns.
........
r591437 | adelmelle | 2007-11-02 20:57:25 +0100 (Fri, 02 Nov 2007) | 3 lines
Bugzilla 42748: Added support for ids on empty fo:inlines
........
r591461 | adelmelle | 2007-11-02 22:05:22 +0100 (Fri, 02 Nov 2007) | 1 line
Add missing file from previous commit (r591437)
........
r591575 | adelmelle | 2007-11-03 11:35:56 +0100 (Sat, 03 Nov 2007) | 1 line
Added override for FObj.toString() for convenience during debugging.
........
r591577 | adelmelle | 2007-11-03 11:42:05 +0100 (Sat, 03 Nov 2007) | 1 line
Correction: use super.toString() to still have the internal instance id
........
r591579 | jeremias | 2007-11-03 11:47:22 +0100 (Sat, 03 Nov 2007) | 1 line
Mapping "SansSerif" and "Monospaced" (widely used in SVG land) to our Base 14 fonts.
........
r591581 | jeremias | 2007-11-03 11:48:17 +0100 (Sat, 03 Nov 2007) | 1 line
Method for dumping all font triplets to System.out for diagnostic purposes.
........
r591583 | jeremias | 2007-11-03 11:51:31 +0100 (Sat, 03 Nov 2007) | 1 line
More fine-grained mechanism to detect if a font has been used or not. If a font list is given for a text run and each character should be painted in the right font, it might be accessed but never really used. Needed for PDF text painting improvements.
........
r591584 | jeremias | 2007-11-03 11:52:29 +0100 (Sat, 03 Nov 2007) | 1 line
Zero Word Joiner was missing in the constants.
........
r591585 | jeremias | 2007-11-03 11:53:04 +0100 (Sat, 03 Nov 2007) | 1 line
Added method to convert from inches to points.
........
r591587 | jeremias | 2007-11-03 11:59:09 +0100 (Sat, 03 Nov 2007) | 2 lines
Completely reimplemented the PDFTextPainter. All SVG text (including flow text, but excluding special cases with filters) is now painted in PDF text primitives.
The whole thing compiles against and runs with Batik 1.6 but was developed against Batik Trunk (1.7). The TextBridge for SVG 1.2 text is omitted because we're still on Batik 1.6 and FOP wouldn't compile with it. The full feature set is only available with Batik 1.7, of course. With Batik 1.6, font selection may not work as expected.
........
r591756 | adelmelle | 2007-11-04 11:48:30 +0100 (Sun, 04 Nov 2007) | 4 lines
Added support for fo:markers on fo:inline and fo:basic-link.
........
r591978 | jeremias | 2007-11-05 13:45:16 +0100 (Mon, 05 Nov 2007) | 1 line
Make Vincent happy.
........
r592016 | vhennebert | 2007-11-05 15:34:18 +0100 (Mon, 05 Nov 2007) | 2 lines
Disabled debug outputs
........
r592058 | vhennebert | 2007-11-05 17:07:45 +0100 (Mon, 05 Nov 2007) | 4 lines
First step towards building row groups at the FO tree stage. The built row groups are currently not used and the TableRowIterator stuff remains unchanged; this allows for more atomic commits.
- introduced RowGroupBuilder hierarchy;
- moved TableRowIterator test cases into fotree, and integrated them in the test suite.
........
r592060 | vhennebert | 2007-11-05 17:10:43 +0100 (Mon, 05 Nov 2007) | 2 lines
Renamed TableRowIterator* test cases into RowGroupBuilder*
........
r592067 | vhennebert | 2007-11-05 17:27:54 +0100 (Mon, 05 Nov 2007) | 2 lines
Updated the warning messages
........
r592103 | vhennebert | 2007-11-05 18:42:37 +0100 (Mon, 05 Nov 2007) | 2 lines
Moved table-related FObj into new o.a.fop.fo.flow.table package
........
r592105 | vhennebert | 2007-11-05 18:45:23 +0100 (Mon, 05 Nov 2007) | 2 lines
Upgraded javac.source and javac.target to 1.4 (to enable asserts, among others)
........
r592110 | vhennebert | 2007-11-05 19:00:34 +0100 (Mon, 05 Nov 2007) | 2 lines
Renamed TableRowIteratorTestCase into RowGroupBuilderTestCase
........
r592113 | vhennebert | 2007-11-05 19:27:43 +0100 (Mon, 05 Nov 2007) | 2 lines
Renamed signalNewRow method into more accurate signalRowEnd
........
r592341 | jeremias | 2007-11-06 10:05:13 +0100 (Tue, 06 Nov 2007) | 1 line
Bugfix: FOPFonts proc is not used/needed anymore.
........
r592361 | jeremias | 2007-11-06 11:24:52 +0100 (Tue, 06 Nov 2007) | 3 lines
Mailing List Archive link updates.
Added ASF Sponsorship program and thanks links as required by the PRC.
Added ApacheCon EU 2008 logo and link.
........
r592384 | vhennebert | 2007-11-06 12:32:45 +0100 (Tue, 06 Nov 2007) | 2 lines
Finalised testcase for RowGroupBuilder and added it to the testsuite
........
r592386 | vhennebert | 2007-11-06 12:33:49 +0100 (Tue, 06 Nov 2007) | 2 lines
Forgot to add TableColumnColumnNumber testcase to the testsuite
........
r592387 | vhennebert | 2007-11-06 12:36:42 +0100 (Tue, 06 Nov 2007) | 2 lines
Slightly reworked too-many-columns_body_3 testcase, added testcase for a cell that spans too many columns (too-many-columns_body_4)
........
r592392 | vhennebert | 2007-11-06 12:53:38 +0100 (Tue, 06 Nov 2007) | 2 lines
Added check for table-cells which span more rows than available in their parent element
........
r592394 | vhennebert | 2007-11-06 12:54:46 +0100 (Tue, 06 Nov 2007) | 2 lines
Forgot to add IllegalRowSpanTestCase to the test suite...
........
r592395 | vhennebert | 2007-11-06 12:59:16 +0100 (Tue, 06 Nov 2007) | 2 lines
Now that there is a dedicated package for tables, the PendingSpan class can be extracted into a top-level class.
........
r592399 | vhennebert | 2007-11-06 13:11:10 +0100 (Tue, 06 Nov 2007) | 2 lines
Removed no-longer applicable test cases, for cells spanning more rows than available in the table part
........
r592554 | jeremias | 2007-11-06 22:10:44 +0100 (Tue, 06 Nov 2007) | 1 line
Fixed regression: transparent-page-background was not recognized for PNG output.
........
r593051 | jeremias | 2007-11-08 09:01:02 +0100 (Thu, 08 Nov 2007) | 1 line
Some notes about FOP's default font and font substitution for Base 14 fonts in document viewers.
........
r593076 | jeremias | 2007-11-08 09:53:35 +0100 (Thu, 08 Nov 2007) | 1 line
Bugfix: filters were not applied but still produced into the dictionary even if the filters are disabled. Fixes a bug with PDF-in-PDF embedding.
........
r593116 | vhennebert | 2007-11-08 11:25:28 +0100 (Thu, 08 Nov 2007) | 2 lines
Nitpick regarding the Nimbus font names
........
r593172 | cbowditch | 2007-11-08 15:40:25 +0100 (Thu, 08 Nov 2007) | 1 line
bugfix: instead of throwing an exception use default PS Level if not set in fop.xconf file
........
r593189 | jeremias | 2007-11-08 16:13:24 +0100 (Thu, 08 Nov 2007) | 9 lines
Improved font auto-detection and handling of AWT-supplied fonts in order to achieve better results when using multiple output formats. Whenever possible, the font names appearing in the operating system can also be used in XSL-FO.
Better distinction between Font Family Name ("Arial"), Full Font Name ("Arial Bold") and PostScript Name ("Arial-BoldMT"). This allows a better generation of FontTriplets. The same is done for AWT fonts where I have switch from font-family detection to enumerating all java.awt.Font instances so I can extract Family Name, Full Name and PostScript Name. FontInfoFinder and AWT's FontSetup are synchronized as well as possible at this time.
Register "extra-bold" (weight 800) and "light" (weight 200) in triplets when detected.
Tweaked FontInfo.fontLookup() for better fallback behaviour. This approach is rapidly nearing its flexibility limits. We should rethink the FontTriplet structure.
Fixed font-autodetection so fonts with uppercase extensions are detected, too.
Made the way TrueType fonts are embedded in PDF compliant to the specification so viewers correctly identify subset fonts. The name prefix in MultiByteFont was incorrect.
Support the detection of the special Type 1 Symbol font. Symbol used to be detected with "ExpertSubsetEncoding" instead of "SymbolEncoding".
Type1FontLoader tries to construct a "full name" from the PostScript name. This is a temporary hack until we have a PFB or PFA parser.
........
r593245 | jeremias | 2007-11-08 19:36:01 +0100 (Thu, 08 Nov 2007) | 3 lines
Another improvement for font auto-detection:
Some TrueType fonts have multiple font family names which we haven't extracted so far. All these names are now exposed as a Set of Strings.
An example: Futura Book BT has two font families: Futura (Mac platform) and Futura Bk BT (Windows platform).
........
Added:
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/
- copied from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/ColumnNumberManagerHolder.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PendingSpan.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/RowGroupBuilder.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/Table.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/Table.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableAndCaption.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableBody.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableBody.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableCaption.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCaption.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableCell.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCell.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableCellContainer.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableColumn.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableColumn.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableFObj.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFObj.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableFooter.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableFooter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableHeader.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableHeader.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/TableRow.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/TableRow.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/VariableColRowGroupBuilder.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/RegisterableImageProvider.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/image/RegisterableImageProvider.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/image/analyser/SVGZReader.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/image/analyser/SVGZReader.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFImageXObject.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFImageXObject.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFName.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFName.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFNull.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/pdf/PDFNull.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pdf/PDFImageHandler.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandler.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/pdf/PDFImageHandlerRegistry.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/PDFImageHandlerRegistry.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFBatikFlowTextElementBridge.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowExtTextPainter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFFlowTextPainter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFSVGFlowRootElementBridge.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFTextUtil.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/src/java/org/apache/fop/svg/PDFTextUtil.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/
- copied from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/
- copied from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_no-col_no-row_simple.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_no-col_no-row_simple.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_no-col_no-row_spans.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_no-col_no-row_spans.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_no-col_simple.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_no-col_simple.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_no-col_spans.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_no-col_spans.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_no-row_spans.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_no-row_spans.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_simple.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_simple.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/RowGroupBuilder_spans.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/RowGroupBuilder_spans.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/illegal-row-span_body_1.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/illegal-row-span_body_1.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/illegal-row-span_body_2.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/illegal-row-span_body_2.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/illegal-row-span_footer.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/illegal-row-span_footer.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/illegal-row-span_header.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/illegal-row-span_header.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/implicit_columns_column-number.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/implicit_columns_column-number.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/table-column_column-number.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/table-column_column-number.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/too-many-columns_body_1.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/too-many-columns_body_1.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/too-many-columns_body_2.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/too-many-columns_body_2.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/too-many-columns_body_3.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/too-many-columns_body_3.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/too-many-columns_body_4.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/too-many-columns_body_4.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/too-many-columns_footer.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/too-many-columns_footer.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/unittests/table/too-many-columns_header.fo
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/fotree/unittests/table/too-many-columns_header.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/
- copied from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/
- copied from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/
- copied from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/AbstractTableTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/ErrorCheckTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/IllegalRowSpanTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/RowGroupBuilderTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableColumnColumnNumberTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/TableHandler.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TableHandler.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fo/flow/table/TooManyColumnsTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/java/org/apache/fop/fotreetest/FOTreeUnitTester.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/external-graphic_svgz.xml
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/external-graphic_svgz.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/markers_inline-level.xml
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/markers_inline-level.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/page-number-citation_empty-inline.xml
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/page-number-citation_empty-inline.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table_stepper_bug43616.xml
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_stepper_bug43616.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table_table-row_empty.xml
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/layoutengine/standard-testcases/table_table-row_empty.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/resources/images/img-w-size.svgz
- copied unchanged from r593245, xmlgraphics/fop/trunk/test/resources/images/img-w-size.svgz
Removed:
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/Table.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableAndCaption.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableBody.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCaption.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableCell.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableColumn.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFObj.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableFooter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableHeader.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/TableRow.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutmgr/table/TableRowIteratorTestCase.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/markers_9.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table-cell_number-rows-spanned.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table-column_missing.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutmgr/table/TableRowIterator_no-row_simple.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutmgr/table/TableRowIterator_no-row_spans.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutmgr/table/TableRowIterator_simple.fo
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutmgr/table/TableRowIterator_spans.fo
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/fop
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Courier.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBold.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBoldOblique.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierOblique.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Helvetica.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBold.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBoldOblique.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaOblique.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBold.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBoldItalic.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesItalic.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesRoman.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/ZapfDingbats.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/font-file.xsl
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/dev/index.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/maillist.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/news.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/site.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/fonts.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/skinconf.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/FOElementMapping.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/FOEventHandler.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/FOPropertyMapping.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/FObj.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fo/flow/RetrieveMarker.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/CIDFont.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/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/FontMetrics.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/FontReader.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/MutableFont.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/SingleByteFont.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/fonts/Typeface.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/autodetect/FontFileFinder.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/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
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/ImageFactory.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/layoutmgr/AbstractLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/ActiveCell.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EffRow.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/GridUnit.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCII85Filter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/ASCIIHexFilter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/AbstractPDFStream.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/BitmapImage.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/CCFFilter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/DCTFilter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/FlateFilter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/NullFilter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFArray.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDictionary.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFDocument.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFactory.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFFilter.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/PDFFormXObject.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFICCStream.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFImage.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/pdf/PDFNumber.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFObject.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFReference.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFResources.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFStream.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFT1Stream.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFTTFStream.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/pdf/PDFXObject.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/PrintRendererConfigurator.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/afp/fonts/AFPFont.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/afp/fonts/RasterFont.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/java2d/FontMetricsMapper.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/pdf/FopPDFImage.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/ps/AbstractPSTranscoder.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/PSRendererConfigurator.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/extensions/PSCommentAfterElement.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/extensions/PSCommentBeforeElement.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/extensions/PSSetPageDeviceElement.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/rtf/RTFHandler.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFBridgeContext.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/java/org/apache/fop/svg/PDFDocumentGraphics2DConfigurator.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/java/org/apache/fop/util/UnitConv.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/sandbox/org/apache/fop/render/mif/MIFHandler.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/status.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_body2.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_out-of-order.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_cells_rows.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_columns_special.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/column-number_negative-or-zero.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-failure.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/demo-test-success.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/font-shorthand-test.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/from-table-column_marker.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/page-break_shorthand-expansion.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/page-dimension_auto_fallback.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/page-dimension_both_indefinite.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/fotree/testcases/white-space_shorthand-expansion.fo (contents, props changed)
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/layoutmgr/table/TableHandler.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/java/org/apache/fop/visual/BatchDiffer.java
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/ps-extension_2.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table-cell_starts-row_ends-row.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table-stepper_colspan_border-before.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table_border-collapse_collapse_1r2c.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table_border-collapse_collapse_nrnc.xml
xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/test/layoutengine/standard-testcases/table_border-collapse_collapse_spans_1.xml
Propchange: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Nov 8 13:27:19 2007
@@ -1 +1 @@
-/xmlgraphics/fop/trunk:1-582376
+/xmlgraphics/fop/trunk:1-593296
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=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/build.xml Thu Nov 8 13:27:19 2007
@@ -153,8 +153,8 @@
<property name="javac.debug" value="on"/>
<property name="javac.optimize" value="off"/>
<property name="javac.deprecation" value="on"/>
- <property name="javac.source" value="1.3"/>
- <property name="javac.target" value="1.3"/>
+ <property name="javac.source" value="1.4"/>
+ <property name="javac.target" value="1.4"/>
<property name="javac.fork" value="no"/>
<property name="junit.fork" value="on"/>
@@ -614,12 +614,14 @@
<include name="org/apache/fop/util/*OutputStream.class"/>
<include name="org/apache/fop/util/SubInputStream.class"/>
<include name="org/apache/fop/util/Finalizable.class"/>
+ <include name="org/apache/fop/util/CharUtilities.class"/>
</patternset>
<!-- PDF transcoder -->
<patternset>
<include name="org/apache/fop/render/pdf/**"/>
<exclude name="org/apache/fop/render/pdf/PDFRenderer.class"/>
<exclude name="org/apache/fop/render/pdf/PDFXMLHandler*"/>
+ <include name="org/apache/fop/render/*RendererConfigurator**"/>
<include name="org/apache/fop/pdf/**"/>
</patternset>
<!-- PS transcoder -->
@@ -679,11 +681,9 @@
<include name="org/apache/avalon/framework/configuration/*"/>
<include name="org/apache/avalon/framework/container/*"/>
<include name="org/apache/commons/logging/**"/>
- <include name="org/apache/commons/io/CopyUtils.class"/>
- <include name="org/apache/commons/io/IOUtils.class"/>
- <include name="org/apache/commons/io/output/ProxyOutputStream.class"/>
- <include name="org/apache/commons/io/output/ByteArrayOutputStream.class"/>
- <include name="org/apache/commons/io/output/CountingOutputStream.class"/>
+ <include name="org/apache/commons/io/*.class"/>
+ <include name="org/apache/commons/io/filefilter/*.class"/>
+ <include name="org/apache/commons/io/output/*.class"/>
<!-- TODO Remove the following lines once Batik switches over to using XML Graphics Commons -->
<include name="org/apache/xmlgraphics/java2d/**"/>
<include name="org/apache/xmlgraphics/ps/**"/>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/fop Thu Nov 8 13:27:19 2007
@@ -22,8 +22,6 @@
no_config=false
fop_exec_debug=false
show_help=false
-export IFS="
-"
for arg in "$@" ; do
if [ "$arg" = "--noconfig" ] ; then
no_config=true
@@ -153,6 +151,9 @@
LOCALCLASSPATH=${FOP_HOME}/build/fop.jar${pathSepChar}${FOP_HOME}/build/fop-sandbox.jar${pathSepChar}${FOP_HOME}/build/fop-hyph.jar${pathSepChar}$LOCALCLASSPATH
# add in the dependency .jar files, which reside in $FOP_HOME/lib
+OLD_IFS=$IFS
+IFS="
+"
DIRLIBS=${FOP_HOME}/lib/*.jar
for i in ${DIRLIBS}
do
@@ -166,6 +167,7 @@
fi
fi
done
+IFS=$OLD_IFS
# add in user-defined hyphenation JARs
if [ -n "$FOP_HYPHENATION_PATH" ] ; then
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Courier.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Courier.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Courier.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Courier.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Courier</font-name>
+ <full-name>Courier</full-name>
+ <family-name>Courier</family-name>
<class-name>Courier</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>562</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBold.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBold.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBold.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBold.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Courier-Bold</font-name>
+ <full-name>Courier Bold</full-name>
+ <family-name>Courier</family-name>
<class-name>CourierBold</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>562</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBoldOblique.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBoldOblique.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBoldOblique.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierBoldOblique.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Courier-BoldOblique</font-name>
+ <full-name>Courier Bold Oblique</full-name>
+ <family-name>Courier</family-name>
<class-name>CourierBoldOblique</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>562</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierOblique.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierOblique.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierOblique.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/CourierOblique.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Courier-Oblique</font-name>
+ <full-name>Courier Oblique</full-name>
+ <family-name>Courier</family-name>
<class-name>CourierOblique</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>562</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Helvetica.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Helvetica.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Helvetica.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Helvetica.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Helvetica</font-name>
+ <full-name>Helvetica</full-name>
+ <family-name>Helvetica</family-name>
<class-name>Helvetica</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>718</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBold.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBold.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBold.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBold.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Helvetica-Bold</font-name>
+ <full-name>Helvetica Bold</full-name>
+ <family-name>Helvetica</family-name>
<class-name>HelveticaBold</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>718</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBoldOblique.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBoldOblique.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBoldOblique.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaBoldOblique.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Helvetica-BoldOblique</font-name>
+ <full-name>Helvetica Bold Oblique</full-name>
+ <family-name>Helvetica</family-name>
<class-name>HelveticaBoldOblique</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>718</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaOblique.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaOblique.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaOblique.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/HelveticaOblique.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Helvetica-Oblique</font-name>
+ <full-name>Helvetica Oblique</full-name>
+ <family-name>Helvetica</family-name>
<class-name>HelveticaOblique</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>718</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/Symbol.xml Thu Nov 8 13:27:19 2007
@@ -17,6 +17,8 @@
<!-- $Id$ -->
<font-metrics>
<font-name>Symbol</font-name>
+ <full-name>Symbol</full-name>
+ <family-name>Symbol</family-name>
<class-name>Symbol</class-name>
<encoding>SymbolEncoding</encoding>
<cap-height>1010</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBold.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBold.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBold.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBold.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Times-Bold</font-name>
+ <full-name>Times Bold</full-name>
+ <family-name>Times</family-name>
<class-name>TimesBold</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>676</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBoldItalic.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBoldItalic.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBoldItalic.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesBoldItalic.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Times-BoldItalic</font-name>
+ <full-name>Times Bold Italic</full-name>
+ <family-name>Times</family-name>
<class-name>TimesBoldItalic</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>669</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesItalic.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesItalic.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesItalic.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesItalic.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Times-Italic</font-name>
+ <full-name>Times Italic</full-name>
+ <family-name>Times</family-name>
<class-name>TimesItalic</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>653</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesRoman.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesRoman.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesRoman.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/TimesRoman.xml Thu Nov 8 13:27:19 2007
@@ -18,6 +18,8 @@
<!-- JKT: these metrics in XML were kindly produced by Fotis Jannidis -->
<font-metrics>
<font-name>Times-Roman</font-name>
+ <full-name>Times Roman</full-name>
+ <family-name>Times</family-name>
<class-name>TimesRoman</class-name>
<encoding>StandardEncoding</encoding>
<cap-height>662</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/ZapfDingbats.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/ZapfDingbats.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/ZapfDingbats.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/ZapfDingbats.xml Thu Nov 8 13:27:19 2007
@@ -17,6 +17,8 @@
<!-- $Id$ -->
<font-metrics>
<font-name>ZapfDingbats</font-name>
+ <full-name>ITC Zapf Dingbats</full-name>
+ <family-name>ZapfDingbats</family-name>
<class-name>ZapfDingbats</class-name>
<encoding>ZapfDingbatsEncoding</encoding>
<cap-height>820</cap-height>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/code-point-mapping.xsl Thu Nov 8 13:27:19 2007
@@ -21,7 +21,23 @@
<xsl:variable name='glyphlists'
select="document('glyphlist.xml')/glyphlist-set"/>
- <xsl:template match="encoding-set">
+ <xsl:template match="encoding-set"> /*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.fop.fonts;
import java.util.Map;
@@ -31,26 +47,28 @@
private char[] latin1Map;
private char[] characters;
private char[] codepoints;
+
private CodePointMapping(int [] table) {
int nonLatin1 = 0;
latin1Map = new char[256];
- for(int i = 0; i < table.length; i += 2) {
- if(table[i+1] < 256)
- latin1Map[table[i+1]] = (char) table[i];
- else
+ for (int i = 0; i < table.length; i += 2) {
+ if (table[i + 1] < 256) {
+ latin1Map[table[i + 1]] = (char) table[i];
+ } else {
++nonLatin1;
+ }
}
characters = new char[nonLatin1];
codepoints = new char[nonLatin1];
int top = 0;
- for(int i = 0; i < table.length; i += 2) {
- char c = (char) table[i+1];
- if(c >= 256) {
+ for (int i = 0; i < table.length; i += 2) {
+ char c = (char) table[i + 1];
+ if (c >= 256) {
++top;
- for(int j = top - 1; j >= 0; --j) {
- if(j > 0 && characters[j-1] >= c) {
- characters[j] = characters[j-1];
- codepoints[j] = codepoints[j-1];
+ for (int j = top - 1; j >= 0; --j) {
+ if (j > 0 && characters[j - 1] >= c) {
+ characters[j] = characters[j - 1];
+ codepoints[j] = codepoints[j - 1];
} else {
characters[j] = c;
codepoints[j] = (char) table[i];
@@ -60,21 +78,23 @@
}
}
}
+
public final char mapChar(char c) {
- if(c < 256) {
+ if (c < 256) {
return latin1Map[c];
} else {
int bot = 0, top = characters.length - 1;
- while(top >= bot) {
+ while (top >= bot) {
int mid = (bot + top) / 2;
char mc = characters[mid];
- if(c == mc)
+ if (c == mc) {
return codepoints[mid];
- else if(c < mc)
+ } else if (c < mc) {
top = mid - 1;
- else
+ } else {
bot = mid + 1;
+ }
}
return 0;
}
@@ -86,19 +106,21 @@
}
public static CodePointMapping getMapping(String encoding) {
CodePointMapping mapping = (CodePointMapping) mappings.get(encoding);
- if(mapping != null) {
+ if (mapping != null) {
return mapping;
} <xsl:apply-templates mode="get"/>
- else {
- return null;
+ //TODO: Implement support for Expert and ExpertSubset encoding
+ else if (encoding.startsWith("Expert")) {
+ throw new UnsupportedOperationException(encoding + " not implemented yet");
}
+ throw new UnsupportedOperationException("Unknown encoding: " + encoding);
}
<xsl:apply-templates mode="table"/>
}
</xsl:template>
<xsl:template match="encoding" mode="get">
- else if(encoding.equals("<xsl:value-of select="@id"/>")) {
+ else if (encoding.equals("<xsl:value-of select="@id"/>")) {
mapping = new CodePointMapping(enc<xsl:value-of select="@id"/>);
mappings.put("<xsl:value-of select="@id"/>", mapping);
return mapping;
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/encodings.xml Thu Nov 8 13:27:19 2007
@@ -1647,4 +1647,8 @@
<glyph codepoint='FD' name='a190'/>
<glyph codepoint='FE' name='a191'/>
</encoding>
+ <!--
+ TODO: Provide data for ExpertEncoding and ExpertSubsetEncoding
+ see http://www.adobe.com/devnet/font/pdfs/5176.CFF.pdf for details.
+ -->
</encoding-set>
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/font-file.xsl
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/font-file.xsl?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/font-file.xsl (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/codegen/fonts/font-file.xsl Thu Nov 8 13:27:19 2007
@@ -39,12 +39,15 @@
<xsl:if test="count(kerning) > 0">
import java.util.Map;
</xsl:if>
+import java.util.Set;
import org.apache.fop.fonts.FontType;
import org.apache.fop.fonts.Typeface;
import org.apache.fop.fonts.CodePointMapping;
public class <xsl:value-of select="class-name"/> extends Typeface {
private final static String fontName = "<xsl:value-of select="font-name"/>";
+ private final static String fullName = "<xsl:value-of select="full-name"/>";
+ private final static Set familyNames;
private final static String encoding = <xsl:choose><xsl:when test="$encoding != $native-encoding">"<xsl:value-of select="$encoding"/>"</xsl:when><xsl:otherwise>null</xsl:otherwise></xsl:choose>;
private final static int capHeight = <xsl:value-of select="cap-height"/>;
private final static int xHeight = <xsl:value-of select="x-height"/>;
@@ -70,6 +73,8 @@
Map pairs;
<xsl:apply-templates select="kerning"/>
</xsl:if>
+ familyNames = new java.util.HashSet();
+ familyNames.add("<xsl:value-of select="family-name"/>");
}
public <xsl:value-of select="class-name"/>() {
@@ -88,6 +93,18 @@
return fontName;
}
+ public String getEmbedFontName() {
+ return getFontName();
+ }
+
+ public String getFullName() {
+ return fullName;
+ }
+
+ public Set getFamilyNames() {
+ return familyNames;
+ }
+
public FontType getFontType() {
return FontType.TYPE1;
}
@@ -148,8 +165,9 @@
</xsl:choose>
public char mapChar(char c) {
+ notifyMapOperation();
char d = mapping.mapChar(c);
- if(d != 0) {
+ if (d != 0) {
return d;
} else {
return '#';
Modified: xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/dev/index.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/dev/index.xml?rev=593328&r1=593327&r2=593328&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/dev/index.xml (original)
+++ xmlgraphics/fop/branches/Temp_Interleaved_Page_Line_Breaking/src/documentation/content/xdocs/dev/index.xml Thu Nov 8 13:27:19 2007
@@ -31,31 +31,13 @@
</section>
<section id="lines">
<title>Development</title>
- <p>There are currently two branches of FOP :</p>
- <ul>
- <li>
- The "maintenance branch" is the one that the last release was generated
- from. Because of limitations in its design, the FOP committers decided
- to freeze new development on this branch, and are providing only bug fixes.
- Please note that patches for enhancements to the maintenance branch will
- generally not be considered. Bug fixes are welcome there, but new developers
- are strongly encouraged to apply their efforts to the trunk development line.
- <note>
- The SVN repository URL for the maintenance branch is:<br/>
- <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_20_2-maintain/</code>
- </note>
- </li>
- <li>
- The main development line is the future of FOP. It is currently not as
- mature as the "maintenance branch", but has far greater long-term prospects.
- It is also known as the "root" or "trunk" or "redesign".
- <note>
- The SVN repository URL for the trunk is:<br/>
- <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
- </note>
- </li>
- </ul>
- <p>Because there is a fair amount of common information between the maintenance and trunk development lines, we attempt to document them together, highlighting differences only where needed.</p>
+ <p>
+ The main development happens on "FOP Trunk".
+ </p>
+ <note>
+ The SVN repository URL for the trunk is:<br/>
+ <code>http://svn.apache.org/repos/asf/xmlgraphics/fop/trunk/</code>
+ </note>
</section>
<section id="involved">
<title>Getting Involved</title>
@@ -64,7 +46,7 @@
<p>Review the <link href="http://xml.apache.org/roles.html">Apache Project Roles and Responsibilities</link> document for an understanding of the various roles of contributors within the community.</p>
</section>
<section id="fop-tasks">
- <title>Understand FOP Development Tasks</title>
+ <title>How you can help</title>
<p>There are many different ways that you can help with FOP development. The following is a non-exhaustive list of ways that <em>non-programmers</em> can help. Remember that an hour spent on the tasks below is an hour that a programmer can devote to fixing bugs or adding features instead:</p>
<ul>
<li>Answer questions on the fop-user mailing list.</li>
@@ -93,7 +75,13 @@
<title>Understand FOP's Design</title>
<p>The design for FOP is specified under the <link href="design/index.html">Design</link> section. This is where the information on how FOP is developed and designed
internally will be kept.
- </p>
+ </p>
+ <p>
+ Another place where we write design documentation is the <link href="http://wiki.apache.org/xmlgraphics-fop/DeveloperPages">FOP Wiki</link>.
+ </p>
+ <note>
+ Our design documentation may not always be up to date!
+ </note>
</section>
<section id="mail-fop-dev">
<title>Subscribe to the fop-dev Mailing List</title>
@@ -104,18 +92,13 @@
<li>
To review the archives, you have several options:
<ul>
- <li>
- The <link href="http://mail-archives.eu.apache.org/mod_mbox/xmlgraphics-fop-dev/">Apache Mailing List archive (mod_mbox)</link>.
- </li>
- <li>
- The <link href="http://xmlgraphics.apache.org/mail/fop-dev/">Apache Mailing List archive (gzipped mbox files)</link>.
- </li>
- <li>
- The <link href="http://marc.theaimsgroup.com/?l=fop-dev&r=1&w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).
- </li>
- <li>
- The <link href="http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=fop-dev@xml.apache.org">Apache Eyebrowse</link> archive (search, list by date, author, subject, or thread).
- </li>
+ <li>The <link href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-dev/">Apache Mailing List archive (mod_mbox)</link>.</li>
+ <li>The <link href="http://xmlgraphics.apache.org/mail/fop-dev/">Apache Mailing List archive (gzipped mbox files)</link>.</li>
+ <li>The <link href="http://marc.theaimsgroup.com/?l=fop-dev&r=1&w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).</li>
+ <li><link href="http://www.mail-archive.com/fop-dev%40xmlgraphics.apache.org/">The Mail Archive</link>.</li>
+ <li>The <link href="http://dir.gmane.org/gmane.text.xml.fop.devel">GMANE</link> archive.</li>
+ <li>The <link href="http://www.nabble.com/FOP---Dev-f352.html">Nabble</link> archive.</li>
+ <li>The <link href="http://fop-dev.markmail.org">MarkMail</link> archive.</li>
</ul>
</li>
<li>Before posting questions to any list, see "<link href="../maillist.html#general">General Information</link>".</li>
@@ -136,15 +119,23 @@
To unsubscribe: Send email to <link href="mailto:fop-dev-unsubscribe@xmlgraphics.apache.org">fop-dev-unsubscribe@xmlgraphics.apache.org</link>.
</li>
</ul>
- <note>The Eyebrowse archives are currently broken!</note>
</section>
<section id="mail-fop-cvs">
<title>Subscribe to the fop-commits Mailing List</title>
<p>When changes are committed to the code repository, a record of the diffs is emailed to the fop-cvs mailing list. FOP developers are encouraged to subscribe to this list because it helps in following the progress of the project.
</p>
<ul>
- <li>Review the archives at <link href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/">http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/</link> (mod_mbox).</li>
- <li>Review the archives at <link href="http://marc.theaimsgroup.com/?l=fop-cvs&r=1&w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).</li>
+ <li>
+ To review the archives, you have several options:
+ <ul>
+ <li>The <link href="http://mail-archives.apache.org/mod_mbox/xmlgraphics-fop-commits/">Apache Mailing List archive (mod_mbox)</link>.</li>
+ <li>The <link href="http://xmlgraphics.apache.org/mail/fop-commits/">Apache Mailing List archive (gzipped mbox files)</link>.</li>
+ <li>The <link href="http://marc.theaimsgroup.com/?l=fop-cvs&r=1&w=2">Mailing list ARChives</link> (MARC) at the AIMS group (search).</li>
+ <li><link href="http://www.mail-archive.com/fop-commits%40xmlgraphics.apache.org/">The Mail Archive</link>.</li>
+ <li>The <link href="http://dir.gmane.org/gmane.text.xml.fop.cvs">GMANE</link> archive.</li>
+ <li>The <link href="http://fop-commits.markmail.org">MarkMail</link> archive.</li>
+ </ul>
+ </li>
<li>Subscribe by sending an email to <link href="mailto:fop-commits-subscribe@xmlgraphics.apache.org">fop-commits-subscribe@xmlgraphics.apache.org</link>.</li>
</ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org