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 je...@apache.org on 2008/03/06 14:34:59 UTC
svn commit: r634267 [18/39] - in
/xmlgraphics/fop/branches/Temp_ProcessingFeedback: ./ examples/embedding/
examples/embedding/java/embedding/
examples/embedding/java/embedding/intermediate/ examples/embedding/xml/xml/
examples/fo/ examples/fo/advanced/...
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/testcases/font-shorthand-test.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/testcases/font-shorthand-test.fo?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/testcases/font-shorthand-test.fo (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/testcases/font-shorthand-test.fo Thu Mar 6 05:33:44 2008
@@ -29,7 +29,7 @@
<test:assert property="font-size" expected="10000mpt"/>
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="NORMAL" />
- <test:assert property="line-height.optimum" expected="120.0%" />
+ <test:assert property="line-height.optimum" expected="12000mpt" />
<test:assert property="font-variant" expected="NORMAL" />
</fo:block>
<fo:block font="italic small-caps 14pt 'Times New Roman', serif">
@@ -37,7 +37,7 @@
<test:assert property="font-size" expected="14000mpt"/>
<test:assert property="font-weight" expected="400" />
<test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="120.0%" />
+ <test:assert property="line-height.optimum" expected="16800mpt" />
<test:assert property="font-variant" expected="SMALL_CAPS" />
Test font shorthand
</fo:block>
@@ -46,7 +46,7 @@
<test:assert property="font-size" expected="14000mpt"/>
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="80.0%" />
+ <test:assert property="line-height.optimum" expected="11200mpt" />
<test:assert property="font-variant" expected="NORMAL" />
Test font shorthand
</fo:block>
@@ -55,7 +55,7 @@
<test:assert property="font-size" expected="20736mpt"/>
<test:assert property="font-weight" expected="400" />
<test:assert property="font-style" expected="NORMAL" />
- <test:assert property="line-height.optimum" expected="140.0%" />
+ <test:assert property="line-height.optimum" expected="29030mpt" />
<test:assert property="font-variant" expected="NORMAL" />
Test font shorthand
</fo:block>
@@ -65,7 +65,7 @@
<test:assert property="font-size" expected="14000mpt"/>
<test:assert property="font-weight" expected="700" />
<test:assert property="font-style" expected="ITALIC" />
- <test:assert property="line-height.optimum" expected="80.0%" />
+ <test:assert property="line-height.optimum" expected="11200mpt" />
<test:assert property="font-variant" expected="NORMAL" />
Test font shorthand inheritance
</fo:block>
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/fotree/unittests/table/RowGroupBuilder_no-row_simple.fo Thu Mar 6 05:33:44 2008
@@ -32,7 +32,7 @@
<fo:flow flow-name="xsl-region-body">
<!-- Table 1: no header, no footer, one body (1 row) -->
<fo:table width="10cm" space-before="12pt" table-layout="fixed"
- border-collapse="separate" border="1pt solid black">
+ border-collapse="collapse" border="1pt solid black">
<fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
@@ -54,7 +54,7 @@
<!-- Table 3: no header, no footer, two bodies (1 row, 1 row) -->
<fo:table width="10cm" space-before="12pt" table-layout="fixed"
- border-collapse="separate" border="1pt solid black">
+ border-collapse="collapse" border="1pt solid black">
<fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:table-body>
<fo:table-cell starts-row="true"><fo:block>Cell 1</fo:block></fo:table-cell>
@@ -88,7 +88,7 @@
<!-- Table 5: one header (1 row), no footer, one body (1 row) -->
<fo:table width="10cm" space-before="12pt" table-layout="fixed"
- border-collapse="separate" border="1pt solid black">
+ border-collapse="collapse" border="1pt solid black">
<fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:table-header>
<fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
@@ -116,7 +116,7 @@
<!-- Table 7: one header (1 row), one footer (1 row), one body (1 row) -->
<fo:table width="10cm" space-before="12pt" table-layout="fixed"
- border-collapse="separate" border="1pt solid black">
+ border-collapse="collapse" border="1pt solid black">
<fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:table-header>
<fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
@@ -160,7 +160,7 @@
<!-- Table 9: one header (3 rows), one footer (2 rows), three bodies (2 rows, 1 row, 3 rows) -->
<fo:table width="10cm" space-before="12pt" table-layout="fixed"
- border-collapse="separate" border="1pt solid black">
+ border-collapse="collapse" border="1pt solid black">
<fo:table-column number-columns-repeated="2" column-width="proportional-column-width(1)"/>
<fo:table-header>
<fo:table-cell starts-row="true"><fo:block>Header 1</fo:block></fo:table-cell>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/AbstractFOPTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/BasicDriverTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/BasicDriverTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/BasicPSTranscoderTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/BasicTranscoderTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/DebugHelper.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/DigestFilterTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/GenericFOPTestCase.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/StandardTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/StandardTestSuite.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/StandardTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/StandardTestSuite.java Thu Mar 6 05:33:44 2008
@@ -15,18 +15,19 @@
* limitations under the License.
*/
-/* $Id: BasicDriverTestSuite.java 231325 2005-08-10 21:05:39Z jeremias $ */
+/* $Id$ */
package org.apache.fop;
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
import org.apache.fop.render.pdf.PDFAConformanceTestCase;
import org.apache.fop.render.pdf.PDFCMapTestCase;
import org.apache.fop.render.pdf.PDFEncodingTestCase;
+import org.apache.fop.render.pdf.PDFsRGBSettingsTestCase;
import org.apache.fop.render.rtf.RichTextFormatTestSuite;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
/**
* Test suite for basic functionality of FOP.
*/
@@ -45,6 +46,7 @@
suite.addTest(new TestSuite(PDFAConformanceTestCase.class));
suite.addTest(new TestSuite(PDFEncodingTestCase.class));
suite.addTest(new TestSuite(PDFCMapTestCase.class));
+ suite.addTest(new TestSuite(PDFsRGBSettingsTestCase.class));
suite.addTest(RichTextFormatTestSuite.suite());
//$JUnit-END$
return suite;
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/StandardTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/UtilityCodeTestSuite.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/UtilityCodeTestSuite.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/UtilityCodeTestSuite.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/UtilityCodeTestSuite.java Thu Mar 6 05:33:44 2008
@@ -22,12 +22,13 @@
import junit.framework.Test;
import junit.framework.TestSuite;
+import org.apache.fop.pdf.PDFObjectTestCase;
import org.apache.fop.events.BasicEventTestCase;
import org.apache.fop.traits.BorderPropsTestCase;
-import org.apache.fop.traits.TraitColorTestCase;
import org.apache.fop.util.DataURIResolverTestCase;
import org.apache.fop.util.ElementListUtilsTestCase;
import org.apache.fop.util.PDFNumberTestCase;
+import org.apache.fop.util.ColorUtilTestCase;
import org.apache.fop.util.UnitConvTestCase;
import org.apache.fop.util.XMLResourceBundleTestCase;
@@ -45,8 +46,9 @@
"Test suite for FOP's utility classes");
//$JUnit-BEGIN$
suite.addTest(new TestSuite(PDFNumberTestCase.class));
+ suite.addTest(new TestSuite(PDFObjectTestCase.class));
suite.addTest(new TestSuite(UnitConvTestCase.class));
- suite.addTest(new TestSuite(TraitColorTestCase.class));
+ suite.addTest(new TestSuite(ColorUtilTestCase.class));
suite.addTest(new TestSuite(BorderPropsTestCase.class));
suite.addTest(new TestSuite(ElementListUtilsTestCase.class));
suite.addTest(new TestSuite(DataURIResolverTestCase.class));
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/UtilityCodeTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseConstructiveUserConfigTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseDestructiveUserConfigTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseUserConfigTestCase.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseUserConfigTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseUserConfigTestCase.java Thu Mar 6 05:33:44 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-/* $Id: $ */
+/* $Id$ */
package org.apache.fop.config;
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/BaseUserConfigTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontAttributesMissingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontBaseBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontEmbedUrlBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontEmbedUrlMalformedTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontMetricsUrlBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontMetricsUrlMalformedTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontTripletAttributeMissingTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontsAutoDetectTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontsDirectoryBadTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/FontsDirectoryRecursiveTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/config/UserConfigTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/fotreetest/ext/AssertElement.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/fotreetest/ext/AssertElement.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/fotreetest/ext/AssertElement.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/fotreetest/ext/AssertElement.java Thu Mar 6 05:33:44 2008
@@ -27,6 +27,7 @@
import org.apache.fop.fo.properties.KeepProperty;
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
+import org.apache.fop.fo.properties.PercentLength;
import org.apache.fop.fo.properties.Property;
import org.apache.fop.fo.properties.SpaceProperty;
import org.apache.fop.fotreetest.ResultCollector;
@@ -91,7 +92,12 @@
prop = sp.getComponent(FOPropertyMapping.getSubPropertyId(component));
}
}
- String s = String.valueOf(prop);
+ String s;
+ if (prop instanceof PercentLength) {
+ s = ((PercentLength)prop).getString();
+ } else {
+ s = String.valueOf(prop);
+ }
String expected = attlist.getValue("expected");
if (!expected.equals(s)) {
collector.notifyException(
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/ElementListCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/ElementListCollector.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/EvalCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/LayoutResult.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/layoutengine/TrueCheck.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/logging/LoggingElementListObserver.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/memory/MemoryEater.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/BasePDFTestCase.java Thu Mar 6 05:33:44 2008
@@ -23,12 +23,16 @@
import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.stream.StreamSource;
+import org.xml.sax.SAXException;
+
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.output.ByteArrayOutputStream;
+
import org.apache.fop.AbstractFOPTestCase;
import org.apache.fop.apps.FOUserAgent;
import org.apache.fop.apps.Fop;
@@ -78,21 +82,37 @@
* @throws Exception if the conversion fails
*/
protected byte[] convertFO(File foFile, FOUserAgent ua, boolean dumpPdfFile)
- throws Exception {
+ throws Exception {
ByteArrayOutputStream baout = new ByteArrayOutputStream();
Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, ua, baout);
Transformer transformer = tFactory.newTransformer();
Source src = new StreamSource(foFile);
SAXResult res = new SAXResult(fop.getDefaultHandler());
- transformer.transform(src, res);
- final byte[] result = baout.toByteArray();
- if (dumpPdfFile) {
- final File outFile = new File(foFile.getParentFile(), foFile.getName() + ".pdf");
- FileUtils.writeByteArrayToFile(outFile, result);
+ try {
+ transformer.transform(src, res);
+ final byte[] result = baout.toByteArray();
+ if (dumpPdfFile) {
+ final File outFile = new File(foFile.getParentFile(), foFile.getName() + ".pdf");
+ FileUtils.writeByteArrayToFile(outFile, result);
+ }
+ return result;
+ } catch (TransformerException e) {
+ throw extractOriginalException(e);
}
- return result;
}
+ private static Exception extractOriginalException(Exception e) {
+ if (e.getCause() != null) {
+ return extractOriginalException((Exception)e.getCause());
+ } else if (e instanceof SAXException) {
+ SAXException se = (SAXException)e;
+ if (se.getException() != null) {
+ return extractOriginalException(se.getException());
+ }
+ }
+ return e;
+ }
+
/**
* get FOP config File
* @return user config file to be used for testing
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java Thu Mar 6 05:33:44 2008
@@ -94,7 +94,7 @@
cal2.set(Calendar.MILLISECOND, 0);
info.setModDate(cal2.getTime());
- Metadata meta = PDFMetadata.createXMPFromUserAgent(doc);
+ Metadata meta = PDFMetadata.createXMPFromPDFDocument(doc);
DublinCoreAdapter dc = DublinCoreSchema.getAdapter(meta);
assertEquals("MyTitle", dc.getTitle());
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFAMetadataTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java Thu Mar 6 05:33:44 2008
@@ -15,18 +15,20 @@
* limitations under the License.
*/
-/* $Id: PDFCMap.java 426576 2006-07-28 15:44:37Z jeremias $ */
+/* $Id$ */
package org.apache.fop.render.pdf;
-import org.apache.fop.pdf.PDFCMap;
+import java.io.StringWriter;
import junit.framework.TestCase;
+import org.apache.fop.pdf.CMapBuilder;
+
/** Simple sanity test of the PDFCmap class */
public class PDFCMapTestCase extends TestCase {
- public void testPDFCMapFillInPDF() {
+ public void testPDFCMapFillInPDF() throws Exception {
final String EOL = "\n";
final String expected =
"%!PS-Adobe-3.0 Resource-CMap" + EOL
@@ -59,10 +61,10 @@
+"%%EOF" + EOL
;
- final PDFCMap m = new PDFCMap("test", null);
- final StringBuffer b = new StringBuffer();
- m.fillInPDF(b);
- final String actual = b.toString();
+ final StringWriter w = new StringWriter();
+ final CMapBuilder builder = new CMapBuilder(w, "test");
+ builder.writeCMap();
+ final String actual = w.getBuffer().toString();
assertEquals("PDFCMap output matches expected PostScript code", expected, actual);
}
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/pdf/PDFCMapTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/threading/FOPTestbed.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/threading/FOProcessor.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/threading/FOProcessorImpl.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/threading/Main.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/threading/sample.cfg.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/traits/BorderPropsTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/util/DataURIResolverTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/util/DigestFilter.java
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Author Date Id Revision
+Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/util/ElementListUtilsTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/java/org/apache/fop/util/UnitConvTestCase.java
------------------------------------------------------------------------------
svn:keywords = Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/disabled-testcases.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/disabled-testcases.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/disabled-testcases.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/disabled-testcases.xml Thu Mar 6 05:33:44 2008
@@ -27,13 +27,6 @@
nominal line.</description>
</testcase>
<testcase>
- <name>Bugzilla #36391: reference-orientation</name>
- <file>block-container_reference-orientation_bug36391.xml</file>
- <description>There's a problem involving nested block-containers
- and reference-orientation 180/-180.</description>
- <reference>http://issues.apache.org/bugzilla/show_bug.cgi?id=36391</reference>
- </testcase>
- <testcase>
<name>Auto-height block-containers produce fences</name>
<file>block-container_space-before_space-after_3.xml</file>
<description>Block-containers with no height currently don't
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/disabled-testcases.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml Thu Mar 6 05:33:44 2008
@@ -1,355 +1,355 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!-- $Id$ -->
-<testcase>
- <info>
- <p>
- Checks hyphenation for various languages
- </p>
- </info>
- <fo>
-
-<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
-
- <fo:layout-master-set>
- <fo:simple-page-master master-name="simple"
- page-height="29.7cm"
- page-width="21cm"
- margin-top="1cm"
- margin-bottom="2cm"
- margin-left="7cm"
- margin-right="3cm">
- <fo:region-body margin-top="1.5cm"/>
- </fo:simple-page-master>
- </fo:layout-master-set>
- <!-- end: defines page layout -->
-
-
- <fo:page-sequence master-reference="simple">
-
- <fo:flow flow-name="xsl-region-body"
- text-align="justify">
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- US English hypenation-ladder-count="no-limit"
- </fo:block>
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="en"
- country="US"
- hyphenate="true"
- hyphenation-ladder-count="no-limit"
- >
- This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
- W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
- another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
- widespread deployment. This enhances the functionality and interoperability of the Web.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- US English hypenation-ladder-count="1"
- </fo:block>
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="en"
- country="US"
- hyphenate="true"
- hyphenation-ladder-count="1"
- >
- This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
- W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
- another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
- widespread deployment. This enhances the functionality and interoperability of the Web.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- US English hypenation-ladder-count="2"
- </fo:block>
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="en"
- country="US"
- hyphenate="true"
- hyphenation-ladder-count="2"
- >
- This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
- W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
- another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
- widespread deployment. This enhances the functionality and interoperability of the Web.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- US English hypenation-ladder-count="3"
- </fo:block>
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="en"
- country="US"
- hyphenate="true"
- hyphenation-ladder-count="3"
- >
- This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
- W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
- another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
- widespread deployment. This enhances the functionality and interoperability of the Web.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- US English hypenation-ladder-count="4"
- </fo:block>
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="en"
- country="US"
- hyphenate="true"
- hyphenation-ladder-count="4"
- >
- This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
- W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
- another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
- widespread deployment. This enhances the functionality and interoperability of the Web.
- </fo:block>
-
- <fo:block break-before="page"
- font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- German hypenation-ladder-count="no-limit"
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="de"
- hyphenate="true"
- hyphenation-ladder-count="no-limit"
- >
- 1. Warum TEI?
- Die Verwendungszeit elektronischer Editionen wird von mehreren
- Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
- ihrer Darstellung verwendet werden, der etwas längeren der
- Betriebssysteme, unter denen die Darstellungsprogramme laufen,
- der logischen Einrichtung des Datenträgers, auf dem sich die
- Edition befindet, und dessen physischer Dauer.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- German hypenation-ladder-count="1"
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="de"
- hyphenate="true"
- hyphenation-ladder-count="1"
- >
- 1. Warum TEI?
- Die Verwendungszeit elektronischer Editionen wird von mehreren
- Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
- ihrer Darstellung verwendet werden, der etwas längeren der
- Betriebssysteme, unter denen die Darstellungsprogramme laufen,
- der logischen Einrichtung des Datenträgers, auf dem sich die
- Edition befindet, und dessen physischer Dauer.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- German hypenation-ladder-count="2"
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="de"
- hyphenate="true"
- hyphenation-ladder-count="2"
- >
- 1. Warum TEI?
- Die Verwendungszeit elektronischer Editionen wird von mehreren
- Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
- ihrer Darstellung verwendet werden, der etwas längeren der
- Betriebssysteme, unter denen die Darstellungsprogramme laufen,
- der logischen Einrichtung des Datenträgers, auf dem sich die
- Edition befindet, und dessen physischer Dauer.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- German hypenation-ladder-count="3"
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="de"
- hyphenate="true"
- hyphenation-ladder-count="3"
- >
- 1. Warum TEI?
- Die Verwendungszeit elektronischer Editionen wird von mehreren
- Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
- ihrer Darstellung verwendet werden, der etwas längeren der
- Betriebssysteme, unter denen die Darstellungsprogramme laufen,
- der logischen Einrichtung des Datenträgers, auf dem sich die
- Edition befindet, und dessen physischer Dauer.
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- background-color="blue"
- color="white"
- text-align="start">
- German hypenation-ladder-count="4"
- </fo:block>
-
- <fo:block font-size="12pt"
- font-family="sans-serif"
- space-after="3pt"
- language="de"
- hyphenate="true"
- hyphenation-ladder-count="4"
- >
- 1. Warum TEI?
- Die Verwendungszeit elektronischer Editionen wird von mehreren
- Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
- ihrer Darstellung verwendet werden, der etwas längeren der
- Betriebssysteme, unter denen die Darstellungsprogramme laufen,
- der logischen Einrichtung des Datenträgers, auf dem sich die
- Edition befindet, und dessen physischer Dauer.
- </fo:block>
-
- </fo:flow>
- </fo:page-sequence>
-</fo:root>
-</fo>
- <checks>
- <eval expected="8" xpath="count(//pageViewport[1]//flow/block[2]/lineArea)"/>
- <eval expected="Di-" xpath="//pageViewport[1]//flow/block[2]/lineArea[2]/text/word[10]"/>
- <eval expected="norma-" xpath="//pageViewport[1]//flow/block[2]/lineArea[4]/text/word[12]"/>
- <eval expected="mak-" xpath="//pageViewport[1]//flow/block[2]/lineArea[5]/text/word[9]"/>
- <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[2]/lineArea[6]/text/word[10]"/>
- <eval expected="en-" xpath="//pageViewport[1]//flow/block[2]/lineArea[7]/text/word[9]"/>
-
- <eval expected="9" xpath="count(//pageViewport[1]//flow/block[4]/lineArea)"/>
- <eval expected="Di-" xpath="//pageViewport[1]//flow/block[4]/lineArea[2]/text/word[10]"/>
- <eval expected="nor-" xpath="//pageViewport[1]//flow/block[4]/lineArea[4]/text/word[12]"/>
- <eval expected="in" xpath="//pageViewport[1]//flow/block[4]/lineArea[5]/text/word[8]"/>
- <eval expected="the" xpath="//pageViewport[1]//flow/block[4]/lineArea[6]/text/word[9]"/>
- <eval expected="deployment." xpath="//pageViewport[1]//flow/block[4]/lineArea[7]/text/word[7]"/>
-
- <eval expected="8" xpath="count(//pageViewport[1]//flow/block[6]/lineArea)"/>
- <eval expected="Di-" xpath="//pageViewport[1]//flow/block[6]/lineArea[2]/text/word[10]"/>
- <eval expected="norma-" xpath="//pageViewport[1]//flow/block[6]/lineArea[4]/text/word[12]"/>
- <eval expected="making" xpath="//pageViewport[1]//flow/block[6]/lineArea[5]/text/word[9]"/>
- <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[6]/lineArea[6]/text/word[9]"/>
- <eval expected="en-" xpath="//pageViewport[1]//flow/block[6]/lineArea[7]/text/word[9]"/>
-
- <eval expected="8" xpath="count(//pageViewport[1]//flow/block[8]/lineArea)"/>
- <eval expected="Di-" xpath="//pageViewport[1]//flow/block[8]/lineArea[2]/text/word[10]"/>
- <eval expected="norma-" xpath="//pageViewport[1]//flow/block[8]/lineArea[4]/text/word[12]"/>
- <eval expected="making" xpath="//pageViewport[1]//flow/block[8]/lineArea[5]/text/word[9]"/>
- <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[8]/lineArea[6]/text/word[9]"/>
- <eval expected="en-" xpath="//pageViewport[1]//flow/block[8]/lineArea[7]/text/word[9]"/>
-
- <eval expected="8" xpath="count(//pageViewport[1]//flow/block[10]/lineArea)"/>
- <eval expected="Di-" xpath="//pageViewport[1]//flow/block[10]/lineArea[2]/text/word[10]"/>
- <eval expected="norma-" xpath="//pageViewport[1]//flow/block[10]/lineArea[4]/text/word[12]"/>
- <eval expected="mak-" xpath="//pageViewport[1]//flow/block[10]/lineArea[5]/text/word[9]"/>
- <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[10]/lineArea[6]/text/word[10]"/>
- <eval expected="en-" xpath="//pageViewport[1]//flow/block[10]/lineArea[7]/text/word[9]"/>
-
- <eval expected="7" xpath="count(//pageViewport[2]//flow/block[2]/lineArea)"/>
- <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[2]/lineArea[1]/text/word[7]"/>
- <eval expected="Le-" xpath="//pageViewport[2]//flow/block[2]/lineArea[2]/text/word[9]"/>
- <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[2]/lineArea[3]/text/word[8]"/>
- <eval expected="un-" xpath="//pageViewport[2]//flow/block[2]/lineArea[4]/text/word[8]"/>
- <eval expected="logischen" xpath="//pageViewport[2]//flow/block[2]/lineArea[5]/text/word[7]"/>
- <eval expected="be-" xpath="//pageViewport[2]//flow/block[2]/lineArea[6]/text/word[9]"/>
-
- <eval expected="7" xpath="count(//pageViewport[2]//flow/block[4]/lineArea)"/>
- <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[4]/lineArea[1]/text/word[7]"/>
- <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[4]/lineArea[2]/text/word[8]"/>
- <eval expected="ver-" xpath="//pageViewport[2]//flow/block[4]/lineArea[3]/text/word[8]"/>
- <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[4]/lineArea[4]/text/word[7]"/>
- <eval expected="lo-" xpath="//pageViewport[2]//flow/block[4]/lineArea[5]/text/word[7]"/>
- <eval expected="die" xpath="//pageViewport[2]//flow/block[4]/lineArea[6]/text/word[8]"/>
-
- <eval expected="7" xpath="count(//pageViewport[2]//flow/block[6]/lineArea)"/>
- <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[1]/text/word[7]"/>
- <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[6]/lineArea[2]/text/word[8]"/>
- <eval expected="ver-" xpath="//pageViewport[2]//flow/block[6]/lineArea[3]/text/word[8]"/>
- <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[6]/lineArea[4]/text/word[7]"/>
- <eval expected="logi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[5]/text/word[7]"/>
- <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[6]/text/word[9]"/>
-
- <eval expected="7" xpath="count(//pageViewport[2]//flow/block[8]/lineArea)"/>
- <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[8]/lineArea[1]/text/word[7]"/>
- <eval expected="Le-" xpath="//pageViewport[2]//flow/block[8]/lineArea[2]/text/word[9]"/>
- <eval expected="ver-" xpath="//pageViewport[2]//flow/block[8]/lineArea[3]/text/word[8]"/>
- <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[8]/lineArea[4]/text/word[7]"/>
- <eval expected="logi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[5]/text/word[7]"/>
- <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[6]/text/word[9]"/>
-
- <eval expected="7" xpath="count(//pageViewport[2]//flow/block[10]/lineArea)"/>
- <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[10]/lineArea[1]/text/word[7]"/>
- <eval expected="Le-" xpath="//pageViewport[2]//flow/block[10]/lineArea[2]/text/word[9]"/>
- <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[10]/lineArea[3]/text/word[8]"/>
- <eval expected="un-" xpath="//pageViewport[2]//flow/block[10]/lineArea[4]/text/word[8]"/>
- <eval expected="logischen" xpath="//pageViewport[2]//flow/block[10]/lineArea[5]/text/word[7]"/>
- <eval expected="be-" xpath="//pageViewport[2]//flow/block[10]/lineArea[6]/text/word[9]"/>
-
- </checks>
-</testcase>
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- $Id$ -->
+<testcase>
+ <info>
+ <p>
+ Checks hyphenation for various languages
+ </p>
+ </info>
+ <fo>
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple"
+ page-height="29.7cm"
+ page-width="21cm"
+ margin-top="1cm"
+ margin-bottom="2cm"
+ margin-left="7cm"
+ margin-right="3cm">
+ <fo:region-body margin-top="1.5cm"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <!-- end: defines page layout -->
+
+
+ <fo:page-sequence master-reference="simple">
+
+ <fo:flow flow-name="xsl-region-body"
+ text-align="justify">
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ US English hypenation-ladder-count="no-limit"
+ </fo:block>
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="en"
+ country="US"
+ hyphenate="true"
+ hyphenation-ladder-count="no-limit"
+ >
+ This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+ W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+ another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+ widespread deployment. This enhances the functionality and interoperability of the Web.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ US English hypenation-ladder-count="1"
+ </fo:block>
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="en"
+ country="US"
+ hyphenate="true"
+ hyphenation-ladder-count="1"
+ >
+ This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+ W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+ another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+ widespread deployment. This enhances the functionality and interoperability of the Web.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ US English hypenation-ladder-count="2"
+ </fo:block>
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="en"
+ country="US"
+ hyphenate="true"
+ hyphenation-ladder-count="2"
+ >
+ This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+ W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+ another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+ widespread deployment. This enhances the functionality and interoperability of the Web.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ US English hypenation-ladder-count="3"
+ </fo:block>
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="en"
+ country="US"
+ hyphenate="true"
+ hyphenation-ladder-count="3"
+ >
+ This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+ W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+ another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+ widespread deployment. This enhances the functionality and interoperability of the Web.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ US English hypenation-ladder-count="4"
+ </fo:block>
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="en"
+ country="US"
+ hyphenate="true"
+ hyphenation-ladder-count="4"
+ >
+ This document has been reviewed by W3C Members and other interested parties and has been endorsed by the Director as a
+ W3C Recommendation. It is a stable document and may be used as reference material or cited as a normative reference from
+ another document. W3C's role in making the Recommendation is to draw attention to the specification and to promote its
+ widespread deployment. This enhances the functionality and interoperability of the Web.
+ </fo:block>
+
+ <fo:block break-before="page"
+ font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ German hypenation-ladder-count="no-limit"
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="de"
+ hyphenate="true"
+ hyphenation-ladder-count="no-limit"
+ >
+ 1. Warum TEI?
+ Die Verwendungszeit elektronischer Editionen wird von mehreren
+ Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+ ihrer Darstellung verwendet werden, der etwas längeren der
+ Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+ der logischen Einrichtung des Datenträgers, auf dem sich die
+ Edition befindet, und dessen physischer Dauer.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ German hypenation-ladder-count="1"
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="de"
+ hyphenate="true"
+ hyphenation-ladder-count="1"
+ >
+ 1. Warum TEI?
+ Die Verwendungszeit elektronischer Editionen wird von mehreren
+ Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+ ihrer Darstellung verwendet werden, der etwas längeren der
+ Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+ der logischen Einrichtung des Datenträgers, auf dem sich die
+ Edition befindet, und dessen physischer Dauer.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ German hypenation-ladder-count="2"
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="de"
+ hyphenate="true"
+ hyphenation-ladder-count="2"
+ >
+ 1. Warum TEI?
+ Die Verwendungszeit elektronischer Editionen wird von mehreren
+ Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+ ihrer Darstellung verwendet werden, der etwas längeren der
+ Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+ der logischen Einrichtung des Datenträgers, auf dem sich die
+ Edition befindet, und dessen physischer Dauer.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ German hypenation-ladder-count="3"
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="de"
+ hyphenate="true"
+ hyphenation-ladder-count="3"
+ >
+ 1. Warum TEI?
+ Die Verwendungszeit elektronischer Editionen wird von mehreren
+ Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+ ihrer Darstellung verwendet werden, der etwas längeren der
+ Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+ der logischen Einrichtung des Datenträgers, auf dem sich die
+ Edition befindet, und dessen physischer Dauer.
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ background-color="blue"
+ color="white"
+ text-align="start">
+ German hypenation-ladder-count="4"
+ </fo:block>
+
+ <fo:block font-size="12pt"
+ font-family="sans-serif"
+ space-after="3pt"
+ language="de"
+ hyphenate="true"
+ hyphenation-ladder-count="4"
+ >
+ 1. Warum TEI?
+ Die Verwendungszeit elektronischer Editionen wird von mehreren
+ Faktoren verkürzt: der kurzen Lebensdauer der Programme, die zu
+ ihrer Darstellung verwendet werden, der etwas längeren der
+ Betriebssysteme, unter denen die Darstellungsprogramme laufen,
+ der logischen Einrichtung des Datenträgers, auf dem sich die
+ Edition befindet, und dessen physischer Dauer.
+ </fo:block>
+
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+</fo>
+ <checks>
+ <eval expected="8" xpath="count(//pageViewport[1]//flow/block[2]/lineArea)"/>
+ <eval expected="Di-" xpath="//pageViewport[1]//flow/block[2]/lineArea[2]/text/word[10]"/>
+ <eval expected="norma-" xpath="//pageViewport[1]//flow/block[2]/lineArea[4]/text/word[12]"/>
+ <eval expected="mak-" xpath="//pageViewport[1]//flow/block[2]/lineArea[5]/text/word[9]"/>
+ <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[2]/lineArea[6]/text/word[10]"/>
+ <eval expected="en-" xpath="//pageViewport[1]//flow/block[2]/lineArea[7]/text/word[9]"/>
+
+ <eval expected="9" xpath="count(//pageViewport[1]//flow/block[4]/lineArea)"/>
+ <eval expected="Di-" xpath="//pageViewport[1]//flow/block[4]/lineArea[2]/text/word[10]"/>
+ <eval expected="nor-" xpath="//pageViewport[1]//flow/block[4]/lineArea[4]/text/word[12]"/>
+ <eval expected="in" xpath="//pageViewport[1]//flow/block[4]/lineArea[5]/text/word[8]"/>
+ <eval expected="the" xpath="//pageViewport[1]//flow/block[4]/lineArea[6]/text/word[9]"/>
+ <eval expected="deployment." xpath="//pageViewport[1]//flow/block[4]/lineArea[7]/text/word[7]"/>
+
+ <eval expected="8" xpath="count(//pageViewport[1]//flow/block[6]/lineArea)"/>
+ <eval expected="Di-" xpath="//pageViewport[1]//flow/block[6]/lineArea[2]/text/word[10]"/>
+ <eval expected="norma-" xpath="//pageViewport[1]//flow/block[6]/lineArea[4]/text/word[12]"/>
+ <eval expected="making" xpath="//pageViewport[1]//flow/block[6]/lineArea[5]/text/word[9]"/>
+ <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[6]/lineArea[6]/text/word[9]"/>
+ <eval expected="en-" xpath="//pageViewport[1]//flow/block[6]/lineArea[7]/text/word[9]"/>
+
+ <eval expected="8" xpath="count(//pageViewport[1]//flow/block[8]/lineArea)"/>
+ <eval expected="Di-" xpath="//pageViewport[1]//flow/block[8]/lineArea[2]/text/word[10]"/>
+ <eval expected="norma-" xpath="//pageViewport[1]//flow/block[8]/lineArea[4]/text/word[12]"/>
+ <eval expected="making" xpath="//pageViewport[1]//flow/block[8]/lineArea[5]/text/word[9]"/>
+ <eval expected="specifica-" xpath="//pageViewport[1]//flow/block[8]/lineArea[6]/text/word[9]"/>
+ <eval expected="en-" xpath="//pageViewport[1]//flow/block[8]/lineArea[7]/text/word[9]"/>
+
+ <eval expected="8" xpath="count(//pageViewport[1]//flow/block[10]/lineArea)"/>
+ <eval expected="Di-" xpath="//pageViewport[1]//flow/block[10]/lineArea[2]/text/word[10]"/>
+ <eval expected="norma-" xpath="//pageViewport[1]//flow/block[10]/lineArea[4]/text/word[12]"/>
+ <eval expected="mak-" xpath="//pageViewport[1]//flow/block[10]/lineArea[5]/text/word[9]"/>
+ <eval expected="specifi-" xpath="//pageViewport[1]//flow/block[10]/lineArea[6]/text/word[10]"/>
+ <eval expected="en-" xpath="//pageViewport[1]//flow/block[10]/lineArea[7]/text/word[9]"/>
+
+ <eval expected="7" xpath="count(//pageViewport[2]//flow/block[2]/lineArea)"/>
+ <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[2]/lineArea[1]/text/word[7]"/>
+ <eval expected="Le-" xpath="//pageViewport[2]//flow/block[2]/lineArea[2]/text/word[9]"/>
+ <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[2]/lineArea[3]/text/word[8]"/>
+ <eval expected="un-" xpath="//pageViewport[2]//flow/block[2]/lineArea[4]/text/word[8]"/>
+ <eval expected="logischen" xpath="//pageViewport[2]//flow/block[2]/lineArea[5]/text/word[7]"/>
+ <eval expected="be-" xpath="//pageViewport[2]//flow/block[2]/lineArea[6]/text/word[9]"/>
+
+ <eval expected="7" xpath="count(//pageViewport[2]//flow/block[4]/lineArea)"/>
+ <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[4]/lineArea[1]/text/word[7]"/>
+ <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[4]/lineArea[2]/text/word[8]"/>
+ <eval expected="ver-" xpath="//pageViewport[2]//flow/block[4]/lineArea[3]/text/word[8]"/>
+ <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[4]/lineArea[4]/text/word[7]"/>
+ <eval expected="lo-" xpath="//pageViewport[2]//flow/block[4]/lineArea[5]/text/word[7]"/>
+ <eval expected="die" xpath="//pageViewport[2]//flow/block[4]/lineArea[6]/text/word[8]"/>
+
+ <eval expected="7" xpath="count(//pageViewport[2]//flow/block[6]/lineArea)"/>
+ <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[1]/text/word[7]"/>
+ <eval expected="kurzen" xpath="//pageViewport[2]//flow/block[6]/lineArea[2]/text/word[8]"/>
+ <eval expected="ver-" xpath="//pageViewport[2]//flow/block[6]/lineArea[3]/text/word[8]"/>
+ <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[6]/lineArea[4]/text/word[7]"/>
+ <eval expected="logi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[5]/text/word[7]"/>
+ <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[6]/lineArea[6]/text/word[9]"/>
+
+ <eval expected="7" xpath="count(//pageViewport[2]//flow/block[8]/lineArea)"/>
+ <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[8]/lineArea[1]/text/word[7]"/>
+ <eval expected="Le-" xpath="//pageViewport[2]//flow/block[8]/lineArea[2]/text/word[9]"/>
+ <eval expected="ver-" xpath="//pageViewport[2]//flow/block[8]/lineArea[3]/text/word[8]"/>
+ <eval expected="Betriebssysteme," xpath="//pageViewport[2]//flow/block[8]/lineArea[4]/text/word[7]"/>
+ <eval expected="logi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[5]/text/word[7]"/>
+ <eval expected="Edi-" xpath="//pageViewport[2]//flow/block[8]/lineArea[6]/text/word[9]"/>
+
+ <eval expected="7" xpath="count(//pageViewport[2]//flow/block[10]/lineArea)"/>
+ <eval expected="Editio-" xpath="//pageViewport[2]//flow/block[10]/lineArea[1]/text/word[7]"/>
+ <eval expected="Le-" xpath="//pageViewport[2]//flow/block[10]/lineArea[2]/text/word[9]"/>
+ <eval expected="verwen-" xpath="//pageViewport[2]//flow/block[10]/lineArea[3]/text/word[8]"/>
+ <eval expected="un-" xpath="//pageViewport[2]//flow/block[10]/lineArea[4]/text/word[8]"/>
+ <eval expected="logischen" xpath="//pageViewport[2]//flow/block[10]/lineArea[5]/text/word[7]"/>
+ <eval expected="be-" xpath="//pageViewport[2]//flow/block[10]/lineArea[6]/text/word[9]"/>
+
+ </checks>
+</testcase>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Modified: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml?rev=634267&r1=634266&r2=634267&view=diff
==============================================================================
--- xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml (original)
+++ xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml Thu Mar 6 05:33:44 2008
@@ -45,6 +45,8 @@
</fo>
<checks>
<eval expected="1" xpath="count(//pageViewport)"/>
+ <eval expected="en" xpath="/areaTree/pageSequence/@language"/>
+ <true xpath="not(boolean(/areaTree/pageSequence/@country))"/>
<eval expected="17230" xpath="//flow/block[1]/lineArea[1]/text[1]/@twsadjust"/>
<eval expected="-1339" xpath="//flow/block[1]/lineArea[2]/text[1]/@twsadjust"/>
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_hyphenation_no-wrap.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_shy_linebreaking_hyph.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/block_uax14_linebreaking_hyph.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
Propchange: xmlgraphics/fop/branches/Temp_ProcessingFeedback/test/layoutengine/hyphenation-testcases/footnote_in_inline.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Thu Mar 6 05:33:44 2008
@@ -1 +1 @@
-Id
+Revision Id
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org