diff options
1593 files changed, 21142 insertions, 19447 deletions
@@ -1,4 +1,7 @@ -This product includes software developed by +Apache FOP +Copyright 1999-2006 The Apache Software Foundation + +This product includes software developed at The Apache Software Foundation (http://www.apache.org/). This software consists of voluntary contributions made by many individuals @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/checkstyle.header b/checkstyle.header index 7db1d87ac..5c2f5a6f5 100644 --- a/checkstyle.header +++ b/checkstyle.header @@ -1,9 +1,10 @@ ^\/\* -^ \* Copyright .* The Apache Software Foundation. -^ \* -^ \* Licensed 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 +^ \* 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 ^ \* diff --git a/conf/fop.xconf b/conf/fop.xconf index bc286e883..c424f9b05 100644 --- a/conf/fop.xconf +++ b/conf/fop.xconf @@ -1,4 +1,21 @@ <?xml version="1.0"?> +<!-- + 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$ --> <!-- diff --git a/examples/embedding/build.xml b/examples/embedding/build.xml index 6861429ba..405c49506 100644 --- a/examples/embedding/build.xml +++ b/examples/embedding/build.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/embedding/java/embedding/ExampleAWTViewer.java b/examples/embedding/java/embedding/ExampleAWTViewer.java index 7749b7fa2..17b789cc7 100644 --- a/examples/embedding/java/embedding/ExampleAWTViewer.java +++ b/examples/embedding/java/embedding/ExampleAWTViewer.java @@ -1,9 +1,10 @@ /*
- * Copyright 1999-2003,2005-2006 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/examples/embedding/java/embedding/ExampleDOM2PDF.java b/examples/embedding/java/embedding/ExampleDOM2PDF.java index 84c56c142..9caa5b72a 100644 --- a/examples/embedding/java/embedding/ExampleDOM2PDF.java +++ b/examples/embedding/java/embedding/ExampleDOM2PDF.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004, 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java b/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java index 137367640..a9519e35d 100644 --- a/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java +++ b/examples/embedding/java/embedding/ExampleFO2OldStylePrint.java @@ -1,9 +1,10 @@ /*
- * Copyright 1999-2006 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/examples/embedding/java/embedding/ExampleFO2PDF.java b/examples/embedding/java/embedding/ExampleFO2PDF.java index 916d13f36..3b239f11b 100644 --- a/examples/embedding/java/embedding/ExampleFO2PDF.java +++ b/examples/embedding/java/embedding/ExampleFO2PDF.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java b/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java index 2a1f72a5d..c9422e1b9 100644 --- a/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java +++ b/examples/embedding/java/embedding/ExampleFO2PDFUsingSAXParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleFO2RTF.java b/examples/embedding/java/embedding/ExampleFO2RTF.java index 9bff99399..b33fb13b8 100644 --- a/examples/embedding/java/embedding/ExampleFO2RTF.java +++ b/examples/embedding/java/embedding/ExampleFO2RTF.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleObj2PDF.java b/examples/embedding/java/embedding/ExampleObj2PDF.java index cd573317f..c3dcbc5d6 100644 --- a/examples/embedding/java/embedding/ExampleObj2PDF.java +++ b/examples/embedding/java/embedding/ExampleObj2PDF.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleObj2XML.java b/examples/embedding/java/embedding/ExampleObj2XML.java index ce749290d..90f9ba5b0 100644 --- a/examples/embedding/java/embedding/ExampleObj2XML.java +++ b/examples/embedding/java/embedding/ExampleObj2XML.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleSVG2PDF.java b/examples/embedding/java/embedding/ExampleSVG2PDF.java index d9944c93c..ca0f46146 100644 --- a/examples/embedding/java/embedding/ExampleSVG2PDF.java +++ b/examples/embedding/java/embedding/ExampleSVG2PDF.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleXML2FO.java b/examples/embedding/java/embedding/ExampleXML2FO.java index f93327059..07b946435 100644 --- a/examples/embedding/java/embedding/ExampleXML2FO.java +++ b/examples/embedding/java/embedding/ExampleXML2FO.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/ExampleXML2PDF.java b/examples/embedding/java/embedding/ExampleXML2PDF.java index 01868b2c1..2769b032a 100644 --- a/examples/embedding/java/embedding/ExampleXML2PDF.java +++ b/examples/embedding/java/embedding/ExampleXML2PDF.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/MultipleFO2PDF.java b/examples/embedding/java/embedding/MultipleFO2PDF.java index 6a0e1146d..7a30f0905 100644 --- a/examples/embedding/java/embedding/MultipleFO2PDF.java +++ b/examples/embedding/java/embedding/MultipleFO2PDF.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/intermediate/ExampleConcat.java b/examples/embedding/java/embedding/intermediate/ExampleConcat.java index 93fd1c10f..3f179f966 100644 --- a/examples/embedding/java/embedding/intermediate/ExampleConcat.java +++ b/examples/embedding/java/embedding/intermediate/ExampleConcat.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/intermediate/ExampleStamp.java b/examples/embedding/java/embedding/intermediate/ExampleStamp.java index 05f386bf8..c34da9024 100644 --- a/examples/embedding/java/embedding/intermediate/ExampleStamp.java +++ b/examples/embedding/java/embedding/intermediate/ExampleStamp.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/model/ProjectMember.java b/examples/embedding/java/embedding/model/ProjectMember.java index 631d285da..0efc6d514 100644 --- a/examples/embedding/java/embedding/model/ProjectMember.java +++ b/examples/embedding/java/embedding/model/ProjectMember.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/model/ProjectTeam.java b/examples/embedding/java/embedding/model/ProjectTeam.java index 3272e6529..3dfceb3db 100644 --- a/examples/embedding/java/embedding/model/ProjectTeam.java +++ b/examples/embedding/java/embedding/model/ProjectTeam.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/model/ProjectTeamInputSource.java b/examples/embedding/java/embedding/model/ProjectTeamInputSource.java index 46298a0c3..2953f41d7 100644 --- a/examples/embedding/java/embedding/model/ProjectTeamInputSource.java +++ b/examples/embedding/java/embedding/model/ProjectTeamInputSource.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/model/ProjectTeamXMLReader.java b/examples/embedding/java/embedding/model/ProjectTeamXMLReader.java index db6057398..c86f94f9a 100644 --- a/examples/embedding/java/embedding/model/ProjectTeamXMLReader.java +++ b/examples/embedding/java/embedding/model/ProjectTeamXMLReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/tools/AbstractObjectReader.java b/examples/embedding/java/embedding/tools/AbstractObjectReader.java index 9d4573b86..8ec4836bb 100644 --- a/examples/embedding/java/embedding/tools/AbstractObjectReader.java +++ b/examples/embedding/java/embedding/tools/AbstractObjectReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/java/embedding/tools/EasyGenerationContentHandlerProxy.java b/examples/embedding/java/embedding/tools/EasyGenerationContentHandlerProxy.java index b4a4a42ad..fe35ad426 100644 --- a/examples/embedding/java/embedding/tools/EasyGenerationContentHandlerProxy.java +++ b/examples/embedding/java/embedding/tools/EasyGenerationContentHandlerProxy.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/embedding/xml/fo/helloworld.fo b/examples/embedding/xml/fo/helloworld.fo index 483450028..d9345b594 100644 --- a/examples/embedding/xml/fo/helloworld.fo +++ b/examples/embedding/xml/fo/helloworld.fo @@ -1,4 +1,21 @@ <?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$ --> <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> <fo:layout-master-set> <fo:simple-page-master master-name="simpleA4" page-height="29.7cm" page-width="21cm" margin-top="2cm" margin-bottom="2cm" margin-left="2cm" margin-right="2cm"> diff --git a/examples/embedding/xml/svg/helloworld.svg b/examples/embedding/xml/svg/helloworld.svg index 6eec44cd3..f21b1d9df 100644 --- a/examples/embedding/xml/svg/helloworld.svg +++ b/examples/embedding/xml/svg/helloworld.svg @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="iso-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN" "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd"> <svg xml:space="preserve" x="-1.70458in" y="0.198315in" width="2.6622in" height="1.89672in" style="shape-rendering:geometricPrecision; text-rendering:geometricPrecision; image-rendering:optimizeQuality" viewBox="-4330 0 6762 4818"> diff --git a/examples/embedding/xml/xml/projectteam.xml b/examples/embedding/xml/xml/projectteam.xml index 11af078fd..4f0aeeb64 100644 --- a/examples/embedding/xml/xml/projectteam.xml +++ b/examples/embedding/xml/xml/projectteam.xml @@ -1,4 +1,21 @@ <?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$ --> <projectteam> <projectname>The Killer Application</projectname> <member> diff --git a/examples/embedding/xml/xslt/atstamp.xsl b/examples/embedding/xml/xslt/atstamp.xsl index ee21dd823..99ba74cf2 100644 --- a/examples/embedding/xml/xslt/atstamp.xsl +++ b/examples/embedding/xml/xslt/atstamp.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/embedding/xml/xslt/projectteam2fo.xsl b/examples/embedding/xml/xslt/projectteam2fo.xsl index f500e3162..a921d9507 100644 --- a/examples/embedding/xml/xslt/projectteam2fo.xsl +++ b/examples/embedding/xml/xslt/projectteam2fo.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2003-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/fo/build.xml b/examples/fo/build.xml index 8813e53b0..02cd5f72b 100644 --- a/examples/fo/build.xml +++ b/examples/fo/build.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/fo/fo-reference/xml2pdf.xsl b/examples/fo/fo-reference/xml2pdf.xsl index 80f240971..ad1330592 100644 --- a/examples/fo/fo-reference/xml2pdf.xsl +++ b/examples/fo/fo-reference/xml2pdf.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/fo/fo-reference/xslfoRef.xml b/examples/fo/fo-reference/xslfoRef.xml index b518db514..078ede8a3 100644 --- a/examples/fo/fo-reference/xslfoRef.xml +++ b/examples/fo/fo-reference/xslfoRef.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/hyphenation/analyse b/examples/hyphenation/analyse index dc8ae425d..caf665454 100755 --- a/examples/hyphenation/analyse +++ b/examples/hyphenation/analyse @@ -1,10 +1,11 @@ #! /bin/sh # -# Copyright 2006 The Apache Software Foundation -# -# Licensed 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 +# 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 # diff --git a/examples/hyphenation/build.xml b/examples/hyphenation/build.xml index ae20354ce..6cb4d8bf7 100644 --- a/examples/hyphenation/build.xml +++ b/examples/hyphenation/build.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java b/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java index 25070ca8b..ccd86ab25 100644 --- a/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java +++ b/examples/hyphenation/src/org/apache/fop/hyphenation/HyphenationTreeAnalysis.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/hyphenation/src/org/apache/fop/hyphenation/TernaryTreeAnalysis.java b/examples/hyphenation/src/org/apache/fop/hyphenation/TernaryTreeAnalysis.java index a5399475c..9ac6ff804 100644 --- a/examples/hyphenation/src/org/apache/fop/hyphenation/TernaryTreeAnalysis.java +++ b/examples/hyphenation/src/org/apache/fop/hyphenation/TernaryTreeAnalysis.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/mathml/build.xml b/examples/mathml/build.xml index 64c56b01c..c24c06b24 100644 --- a/examples/mathml/build.xml +++ b/examples/mathml/build.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java b/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java index 5eb22e581..f4c4bc329 100644 --- a/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java +++ b/examples/mathml/src/org/apache/fop/mathml/MathMLElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java b/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java index 4f0d21d2e..050004392 100644 --- a/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java +++ b/examples/mathml/src/org/apache/fop/mathml/MathMLElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java b/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java index e4546149f..b7a6d1732 100644 --- a/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java +++ b/examples/mathml/src/org/apache/fop/mathml/MathMLObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/build.xml b/examples/plan/build.xml index d9df43796..394310002 100644 --- a/examples/plan/build.xml +++ b/examples/plan/build.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/examples/plan/src/org/apache/fop/plan/ActionInfo.java b/examples/plan/src/org/apache/fop/plan/ActionInfo.java index ce404e962..350ccce8f 100644 --- a/examples/plan/src/org/apache/fop/plan/ActionInfo.java +++ b/examples/plan/src/org/apache/fop/plan/ActionInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/EventList.java b/examples/plan/src/org/apache/fop/plan/EventList.java index 962b769f4..188c9975a 100644 --- a/examples/plan/src/org/apache/fop/plan/EventList.java +++ b/examples/plan/src/org/apache/fop/plan/EventList.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/GroupInfo.java b/examples/plan/src/org/apache/fop/plan/GroupInfo.java index db9a3d84b..e94170d76 100644 --- a/examples/plan/src/org/apache/fop/plan/GroupInfo.java +++ b/examples/plan/src/org/apache/fop/plan/GroupInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/Main.java b/examples/plan/src/org/apache/fop/plan/Main.java index 8f00094a5..c2b1a5ad5 100644 --- a/examples/plan/src/org/apache/fop/plan/Main.java +++ b/examples/plan/src/org/apache/fop/plan/Main.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/PlanDrawer.java b/examples/plan/src/org/apache/fop/plan/PlanDrawer.java index ff5c87e32..8398659e0 100644 --- a/examples/plan/src/org/apache/fop/plan/PlanDrawer.java +++ b/examples/plan/src/org/apache/fop/plan/PlanDrawer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/PlanElement.java b/examples/plan/src/org/apache/fop/plan/PlanElement.java index a4dfac439..9e4f7bb16 100644 --- a/examples/plan/src/org/apache/fop/plan/PlanElement.java +++ b/examples/plan/src/org/apache/fop/plan/PlanElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java b/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java index 94c6127e5..556518d42 100644 --- a/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java +++ b/examples/plan/src/org/apache/fop/plan/PlanElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/PlanHints.java b/examples/plan/src/org/apache/fop/plan/PlanHints.java index 5aea6af03..0411262ab 100644 --- a/examples/plan/src/org/apache/fop/plan/PlanHints.java +++ b/examples/plan/src/org/apache/fop/plan/PlanHints.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/PlanObj.java b/examples/plan/src/org/apache/fop/plan/PlanObj.java index 08da53819..32ad522b1 100644 --- a/examples/plan/src/org/apache/fop/plan/PlanObj.java +++ b/examples/plan/src/org/apache/fop/plan/PlanObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/PlanRenderer.java b/examples/plan/src/org/apache/fop/plan/PlanRenderer.java index 62790eb67..0b592adc6 100644 --- a/examples/plan/src/org/apache/fop/plan/PlanRenderer.java +++ b/examples/plan/src/org/apache/fop/plan/PlanRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java b/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java index ada23055a..71025f15b 100644 --- a/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java +++ b/examples/plan/src/org/apache/fop/plan/SimplePlanDrawer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -1,10 +1,11 @@ #! /bin/sh # -# Copyright 2005 The Apache Software Foundation -# -# Licensed 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 +# 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 # @@ -1,4 +1,18 @@ @ECHO OFF
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
rem %~dp0 is the expanded pathname of the current script under NT
set LOCAL_FOP_HOME=
diff --git a/forrest.properties b/forrest.properties index cd6bdffc0..f4fb7d9ca 100644 --- a/forrest.properties +++ b/forrest.properties @@ -1,8 +1,9 @@ -# Copyright 2002-2004 The Apache Software Foundation -# -# Licensed 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 +# 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 # diff --git a/hyph/hyphenation.dtd b/hyph/hyphenation.dtd index d6094694a..fcd394116 100644 --- a/hyph/hyphenation.dtd +++ b/hyph/hyphenation.dtd @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="US-ASCII"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/publish.xml b/publish.xml index 24717a261..bc5e3338f 100644 --- a/publish.xml +++ b/publish.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?>
<!--
- Copyright 2005-2006 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/src/codegen/Courier.xml b/src/codegen/Courier.xml index c44b497ea..89c7314db 100644 --- a/src/codegen/Courier.xml +++ b/src/codegen/Courier.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/CourierBold.xml b/src/codegen/CourierBold.xml index 7a193ddbf..92a777a50 100644 --- a/src/codegen/CourierBold.xml +++ b/src/codegen/CourierBold.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/CourierBoldOblique.xml b/src/codegen/CourierBoldOblique.xml index dcd98772e..914fdab84 100644 --- a/src/codegen/CourierBoldOblique.xml +++ b/src/codegen/CourierBoldOblique.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/CourierOblique.xml b/src/codegen/CourierOblique.xml index 05fcab057..3b043c17c 100644 --- a/src/codegen/CourierOblique.xml +++ b/src/codegen/CourierOblique.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/Helvetica.xml b/src/codegen/Helvetica.xml index 846424f41..d63eb5a11 100644 --- a/src/codegen/Helvetica.xml +++ b/src/codegen/Helvetica.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/HelveticaBold.xml b/src/codegen/HelveticaBold.xml index e4402105c..c417937b4 100644 --- a/src/codegen/HelveticaBold.xml +++ b/src/codegen/HelveticaBold.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/HelveticaBoldOblique.xml b/src/codegen/HelveticaBoldOblique.xml index 70c45f280..087b225e4 100644 --- a/src/codegen/HelveticaBoldOblique.xml +++ b/src/codegen/HelveticaBoldOblique.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/HelveticaOblique.xml b/src/codegen/HelveticaOblique.xml index afc8653cf..d913b6d51 100644 --- a/src/codegen/HelveticaOblique.xml +++ b/src/codegen/HelveticaOblique.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/Symbol.xml b/src/codegen/Symbol.xml index 1f408366f..241d4d2c6 100644 --- a/src/codegen/Symbol.xml +++ b/src/codegen/Symbol.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/TimesBold.xml b/src/codegen/TimesBold.xml index 2ae98fc0c..12bb17580 100644 --- a/src/codegen/TimesBold.xml +++ b/src/codegen/TimesBold.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/TimesBoldItalic.xml b/src/codegen/TimesBoldItalic.xml index 18c1433a7..540e891e1 100644 --- a/src/codegen/TimesBoldItalic.xml +++ b/src/codegen/TimesBoldItalic.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/TimesItalic.xml b/src/codegen/TimesItalic.xml index 293e866d0..4868aed05 100644 --- a/src/codegen/TimesItalic.xml +++ b/src/codegen/TimesItalic.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/TimesRoman.xml b/src/codegen/TimesRoman.xml index 436de0925..1f21290de 100644 --- a/src/codegen/TimesRoman.xml +++ b/src/codegen/TimesRoman.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/ZapfDingbats.xml b/src/codegen/ZapfDingbats.xml index ab3a0756d..0420908a0 100644 --- a/src/codegen/ZapfDingbats.xml +++ b/src/codegen/ZapfDingbats.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/charlist.xml b/src/codegen/charlist.xml index 7ddc93a05..110714af6 100644 --- a/src/codegen/charlist.xml +++ b/src/codegen/charlist.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/code-point-mapping.xsl b/src/codegen/code-point-mapping.xsl index dbf485f34..7d0d6cd71 100644 --- a/src/codegen/code-point-mapping.xsl +++ b/src/codegen/code-point-mapping.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/colorkw.xml b/src/codegen/colorkw.xml index 5e27adec6..0a0c2717d 100644 --- a/src/codegen/colorkw.xml +++ b/src/codegen/colorkw.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/constants.xml b/src/codegen/constants.xml index c1cb7ef88..d477506bb 100644 --- a/src/codegen/constants.xml +++ b/src/codegen/constants.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/constants.xsl b/src/codegen/constants.xsl index 78fb7af6d..af51489af 100644 --- a/src/codegen/constants.xsl +++ b/src/codegen/constants.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/encodings.xml b/src/codegen/encodings.xml index 388d6026f..85aabb21f 100644 --- a/src/codegen/encodings.xml +++ b/src/codegen/encodings.xml @@ -1,10 +1,11 @@ <?xml version='1.0'?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/fo-property-mapping.xsl b/src/codegen/fo-property-mapping.xsl index e475f27ed..408144a36 100644 --- a/src/codegen/fo-property-mapping.xsl +++ b/src/codegen/fo-property-mapping.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/foelements.xml b/src/codegen/foelements.xml index e3a798345..db1360aab 100644 --- a/src/codegen/foelements.xml +++ b/src/codegen/foelements.xml @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/font-file.xsl b/src/codegen/font-file.xsl index a6c384c5b..72ee81a68 100644 --- a/src/codegen/font-file.xsl +++ b/src/codegen/font-file.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004,2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/foproperties.xml b/src/codegen/foproperties.xml index 30c324994..f4a19eb27 100644 --- a/src/codegen/foproperties.xml +++ b/src/codegen/foproperties.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="yes" ?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/glyphlist.xml b/src/codegen/glyphlist.xml index 619426b18..aeb56e2b6 100644 --- a/src/codegen/glyphlist.xml +++ b/src/codegen/glyphlist.xml @@ -1,10 +1,11 @@ <?xml version='1.0'?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/properties.dtd b/src/codegen/properties.dtd index abb98ff89..8ae36acb0 100644 --- a/src/codegen/properties.dtd +++ b/src/codegen/properties.dtd @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/property-sets.xsl b/src/codegen/property-sets.xsl index 5103e737e..761a2cd23 100644 --- a/src/codegen/property-sets.xsl +++ b/src/codegen/property-sets.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/propinc.xsl b/src/codegen/propinc.xsl index a0a29b658..9f9adf9ef 100644 --- a/src/codegen/propinc.xsl +++ b/src/codegen/propinc.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/propmaker.xsl b/src/codegen/propmaker.xsl index 45ab9d26a..21cde4c53 100644 --- a/src/codegen/propmaker.xsl +++ b/src/codegen/propmaker.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/t1font-file.xsl b/src/codegen/t1font-file.xsl index e5f10506d..f5c285097 100644 --- a/src/codegen/t1font-file.xsl +++ b/src/codegen/t1font-file.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/codegen/ttffontfile.xsl b/src/codegen/ttffontfile.xsl index 84bdc29a2..7231010bf 100644 --- a/src/codegen/ttffontfile.xsl +++ b/src/codegen/ttffontfile.xsl @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/conf/web.xml b/src/conf/web.xml index cc78a204e..ccc50fad4 100644 --- a/src/conf/web.xml +++ b/src/conf/web.xml @@ -1,4 +1,21 @@ <?xml version="1.0" encoding="ISO-8859-1"?> +<!-- + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. +--> +<!-- $Id$ --> <!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd"> <web-app> diff --git a/src/documentation/classes/CatalogManager.properties b/src/documentation/classes/CatalogManager.properties index 8b4822ae3..66304d3f1 100644 --- a/src/documentation/classes/CatalogManager.properties +++ b/src/documentation/classes/CatalogManager.properties @@ -1,8 +1,9 @@ -# Copyright 2002-2004 The Apache Software Foundation -# -# Licensed 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 +# 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 # diff --git a/src/documentation/content/calendar.rdf b/src/documentation/content/calendar.rdf index 6dd31a323..254d07448 100644 --- a/src/documentation/content/calendar.rdf +++ b/src/documentation/content/calendar.rdf @@ -1,15 +1,24 @@ <?xml version="1.0"?> -<rdf:RDF xml:lang="en" - xmlns="http://www.w3.org/2002/12/cal/ical#" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!-- - ======================================================================= + 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 - Copyright (c) 2006 The Apache Software Foundation. - All rights reserved. + 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$ --> +<rdf:RDF xml:lang="en" + xmlns="http://www.w3.org/2002/12/cal/ical#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <!-- Purpose of this file: It contains project-specific events that we'd like published on http://asylum.zones.apache.org/rdfcal/ diff --git a/src/documentation/content/doap.rdf b/src/documentation/content/doap.rdf index 3387cd26b..2c800a79f 100644 --- a/src/documentation/content/doap.rdf +++ b/src/documentation/content/doap.rdf @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/anttask.xml b/src/documentation/content/xdocs/0.20.5/anttask.xml index 51623f4a3..c6da0cba0 100644 --- a/src/documentation/content/xdocs/0.20.5/anttask.xml +++ b/src/documentation/content/xdocs/0.20.5/anttask.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/compiling.xml b/src/documentation/content/xdocs/0.20.5/compiling.xml index 6162b0c03..1c5d09e0f 100644 --- a/src/documentation/content/xdocs/0.20.5/compiling.xml +++ b/src/documentation/content/xdocs/0.20.5/compiling.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/configuration.xml b/src/documentation/content/xdocs/0.20.5/configuration.xml index 90e6e7067..95edd695e 100644 --- a/src/documentation/content/xdocs/0.20.5/configuration.xml +++ b/src/documentation/content/xdocs/0.20.5/configuration.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/embedding.xml b/src/documentation/content/xdocs/0.20.5/embedding.xml index 2270df46b..db42a7423 100644 --- a/src/documentation/content/xdocs/0.20.5/embedding.xml +++ b/src/documentation/content/xdocs/0.20.5/embedding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/extensions.xml b/src/documentation/content/xdocs/0.20.5/extensions.xml index a89cf9926..68a68b19d 100644 --- a/src/documentation/content/xdocs/0.20.5/extensions.xml +++ b/src/documentation/content/xdocs/0.20.5/extensions.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/fonts.xml b/src/documentation/content/xdocs/0.20.5/fonts.xml index 1262bf0dd..79a5dc0ae 100644 --- a/src/documentation/content/xdocs/0.20.5/fonts.xml +++ b/src/documentation/content/xdocs/0.20.5/fonts.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/graphics.xml b/src/documentation/content/xdocs/0.20.5/graphics.xml index 6f9e54b67..8f40e52cd 100644 --- a/src/documentation/content/xdocs/0.20.5/graphics.xml +++ b/src/documentation/content/xdocs/0.20.5/graphics.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/hyphenation.xml b/src/documentation/content/xdocs/0.20.5/hyphenation.xml index e4669853f..aef17881a 100644 --- a/src/documentation/content/xdocs/0.20.5/hyphenation.xml +++ b/src/documentation/content/xdocs/0.20.5/hyphenation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/index.xml b/src/documentation/content/xdocs/0.20.5/index.xml index e0c8e12e6..fa186ec42 100644 --- a/src/documentation/content/xdocs/0.20.5/index.xml +++ b/src/documentation/content/xdocs/0.20.5/index.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/output.xml b/src/documentation/content/xdocs/0.20.5/output.xml index ac9eb357b..a5b001685 100644 --- a/src/documentation/content/xdocs/0.20.5/output.xml +++ b/src/documentation/content/xdocs/0.20.5/output.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/pdfencryption.xml b/src/documentation/content/xdocs/0.20.5/pdfencryption.xml index 1921b97a9..ef60fc0b5 100755 --- a/src/documentation/content/xdocs/0.20.5/pdfencryption.xml +++ b/src/documentation/content/xdocs/0.20.5/pdfencryption.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/running.xml b/src/documentation/content/xdocs/0.20.5/running.xml index f5aad4751..6d491c2c2 100644 --- a/src/documentation/content/xdocs/0.20.5/running.xml +++ b/src/documentation/content/xdocs/0.20.5/running.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.20.5/servlets.xml b/src/documentation/content/xdocs/0.20.5/servlets.xml index 89ce0b848..6416c3a50 100644 --- a/src/documentation/content/xdocs/0.20.5/servlets.xml +++ b/src/documentation/content/xdocs/0.20.5/servlets.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/anttask.xml b/src/documentation/content/xdocs/0.92/anttask.xml index ba21c861a..9831f2c01 100644 --- a/src/documentation/content/xdocs/0.92/anttask.xml +++ b/src/documentation/content/xdocs/0.92/anttask.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/compiling.xml b/src/documentation/content/xdocs/0.92/compiling.xml index ad02f3046..76d7b214f 100644 --- a/src/documentation/content/xdocs/0.92/compiling.xml +++ b/src/documentation/content/xdocs/0.92/compiling.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/configuration.xml b/src/documentation/content/xdocs/0.92/configuration.xml index 188301a0f..9bc5bebc2 100644 --- a/src/documentation/content/xdocs/0.92/configuration.xml +++ b/src/documentation/content/xdocs/0.92/configuration.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/embedding.xml b/src/documentation/content/xdocs/0.92/embedding.xml index 06b241eb4..00d57c75e 100644 --- a/src/documentation/content/xdocs/0.92/embedding.xml +++ b/src/documentation/content/xdocs/0.92/embedding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/extensions.xml b/src/documentation/content/xdocs/0.92/extensions.xml index 71fff1e09..e2d19eca8 100644 --- a/src/documentation/content/xdocs/0.92/extensions.xml +++ b/src/documentation/content/xdocs/0.92/extensions.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/fonts.xml b/src/documentation/content/xdocs/0.92/fonts.xml index 5c1fc0c6f..afe5a8558 100644 --- a/src/documentation/content/xdocs/0.92/fonts.xml +++ b/src/documentation/content/xdocs/0.92/fonts.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/graphics.xml b/src/documentation/content/xdocs/0.92/graphics.xml index e52f25736..9f56f0526 100644 --- a/src/documentation/content/xdocs/0.92/graphics.xml +++ b/src/documentation/content/xdocs/0.92/graphics.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/hyphenation.xml b/src/documentation/content/xdocs/0.92/hyphenation.xml index 6b21dd951..ed97c6868 100644 --- a/src/documentation/content/xdocs/0.92/hyphenation.xml +++ b/src/documentation/content/xdocs/0.92/hyphenation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/index.xml b/src/documentation/content/xdocs/0.92/index.xml index 401cfdfc9..d42f3fe0a 100644 --- a/src/documentation/content/xdocs/0.92/index.xml +++ b/src/documentation/content/xdocs/0.92/index.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/intermediate.xml b/src/documentation/content/xdocs/0.92/intermediate.xml index ad42f2645..3a9a9494c 100644 --- a/src/documentation/content/xdocs/0.92/intermediate.xml +++ b/src/documentation/content/xdocs/0.92/intermediate.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/output.xml b/src/documentation/content/xdocs/0.92/output.xml index 89b5ee233..28b26934c 100644 --- a/src/documentation/content/xdocs/0.92/output.xml +++ b/src/documentation/content/xdocs/0.92/output.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/pdfa.xml b/src/documentation/content/xdocs/0.92/pdfa.xml index 0df4d6adb..70479f49a 100644 --- a/src/documentation/content/xdocs/0.92/pdfa.xml +++ b/src/documentation/content/xdocs/0.92/pdfa.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/pdfencryption.xml b/src/documentation/content/xdocs/0.92/pdfencryption.xml index aca98135a..f68eae437 100755 --- a/src/documentation/content/xdocs/0.92/pdfencryption.xml +++ b/src/documentation/content/xdocs/0.92/pdfencryption.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/running.xml b/src/documentation/content/xdocs/0.92/running.xml index 302f2efe4..8cc0fe280 100644 --- a/src/documentation/content/xdocs/0.92/running.xml +++ b/src/documentation/content/xdocs/0.92/running.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/servlets.xml b/src/documentation/content/xdocs/0.92/servlets.xml index b26cef592..cecbcaa60 100644 --- a/src/documentation/content/xdocs/0.92/servlets.xml +++ b/src/documentation/content/xdocs/0.92/servlets.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/0.92/upgrading.xml b/src/documentation/content/xdocs/0.92/upgrading.xml index b60a1c5e7..ea87d118c 100644 --- a/src/documentation/content/xdocs/0.92/upgrading.xml +++ b/src/documentation/content/xdocs/0.92/upgrading.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/DnI/BookMaker.java b/src/documentation/content/xdocs/DnI/BookMaker.java index 91f730711..3f8366b4b 100644 --- a/src/documentation/content/xdocs/DnI/BookMaker.java +++ b/src/documentation/content/xdocs/DnI/BookMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/DnI.xml b/src/documentation/content/xdocs/DnI/DnI.xml index c2da029ed..a4875e5c2 100644 --- a/src/documentation/content/xdocs/DnI/DnI.xml +++ b/src/documentation/content/xdocs/DnI/DnI.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/Makefile b/src/documentation/content/xdocs/DnI/Makefile index c6e124143..4c9d645a8 100644 --- a/src/documentation/content/xdocs/DnI/Makefile +++ b/src/documentation/content/xdocs/DnI/Makefile @@ -1,8 +1,9 @@ -# Copyright 2004-2005 The Apache Software Foundation. -# -# Licensed 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 +# 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 # diff --git a/src/documentation/content/xdocs/DnI/addareas.xml b/src/documentation/content/xdocs/DnI/addareas.xml index 9ceb4ff49..3cbbffaba 100644 --- a/src/documentation/content/xdocs/DnI/addareas.xml +++ b/src/documentation/content/xdocs/DnI/addareas.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/areatree.xml b/src/documentation/content/xdocs/DnI/areatree.xml index 1b8b93dfe..2e8bf1945 100644 --- a/src/documentation/content/xdocs/DnI/areatree.xml +++ b/src/documentation/content/xdocs/DnI/areatree.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/build.xml b/src/documentation/content/xdocs/DnI/build.xml index ae34c5959..f7c8b98f1 100644 --- a/src/documentation/content/xdocs/DnI/build.xml +++ b/src/documentation/content/xdocs/DnI/build.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/DnI/configuration.xml b/src/documentation/content/xdocs/DnI/configuration.xml index 0e857836a..991b05e03 100644 --- a/src/documentation/content/xdocs/DnI/configuration.xml +++ b/src/documentation/content/xdocs/DnI/configuration.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/cust-fo-docbook.xsl b/src/documentation/content/xdocs/DnI/cust-fo-docbook.xsl index 5cb0d063a..7a58051c2 100644 --- a/src/documentation/content/xdocs/DnI/cust-fo-docbook.xsl +++ b/src/documentation/content/xdocs/DnI/cust-fo-docbook.xsl @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/cust-html-docbook.xsl b/src/documentation/content/xdocs/DnI/cust-html-docbook.xsl index 7bad08772..27e723e8b 100644 --- a/src/documentation/content/xdocs/DnI/cust-html-docbook.xsl +++ b/src/documentation/content/xdocs/DnI/cust-html-docbook.xsl @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/cust-xhtml-docbook.xsl b/src/documentation/content/xdocs/DnI/cust-xhtml-docbook.xsl index 764e99eb9..019acac20 100644 --- a/src/documentation/content/xdocs/DnI/cust-xhtml-docbook.xsl +++ b/src/documentation/content/xdocs/DnI/cust-xhtml-docbook.xsl @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/fonts.xml b/src/documentation/content/xdocs/DnI/fonts.xml index 7c2b97263..f538c3edb 100644 --- a/src/documentation/content/xdocs/DnI/fonts.xml +++ b/src/documentation/content/xdocs/DnI/fonts.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/foptrees.xml b/src/documentation/content/xdocs/DnI/foptrees.xml index 46c70b11c..2dbddc57c 100644 --- a/src/documentation/content/xdocs/DnI/foptrees.xml +++ b/src/documentation/content/xdocs/DnI/foptrees.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/fotree.xml b/src/documentation/content/xdocs/DnI/fotree.xml index d0b7e6cf1..0b6f5f815 100644 --- a/src/documentation/content/xdocs/DnI/fotree.xml +++ b/src/documentation/content/xdocs/DnI/fotree.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/getnextbreakposs.xml b/src/documentation/content/xdocs/DnI/getnextbreakposs.xml index 1e2f177a1..3aa84601d 100644 --- a/src/documentation/content/xdocs/DnI/getnextbreakposs.xml +++ b/src/documentation/content/xdocs/DnI/getnextbreakposs.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/overview.xml b/src/documentation/content/xdocs/DnI/overview.xml index aff1bc6c3..d085f713f 100644 --- a/src/documentation/content/xdocs/DnI/overview.xml +++ b/src/documentation/content/xdocs/DnI/overview.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/preparation.xml b/src/documentation/content/xdocs/DnI/preparation.xml index e34b5452a..bcd0d5631 100644 --- a/src/documentation/content/xdocs/DnI/preparation.xml +++ b/src/documentation/content/xdocs/DnI/preparation.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/properties.xml b/src/documentation/content/xdocs/DnI/properties.xml index 569b9135e..8193b83e8 100644 --- a/src/documentation/content/xdocs/DnI/properties.xml +++ b/src/documentation/content/xdocs/DnI/properties.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/DnI/rendering.xml b/src/documentation/content/xdocs/DnI/rendering.xml index 82f3b429c..4f4d963a8 100644 --- a/src/documentation/content/xdocs/DnI/rendering.xml +++ b/src/documentation/content/xdocs/DnI/rendering.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/documentation/content/xdocs/bugs.xml b/src/documentation/content/xdocs/bugs.xml index 007302032..233a69c5b 100644 --- a/src/documentation/content/xdocs/bugs.xml +++ b/src/documentation/content/xdocs/bugs.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/compliance.ihtml b/src/documentation/content/xdocs/compliance.ihtml index 9a5567b51..633cebdc1 100644 --- a/src/documentation/content/xdocs/compliance.ihtml +++ b/src/documentation/content/xdocs/compliance.ihtml @@ -1,11 +1,12 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!-- - Copyright 2002-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/api-doc.xml b/src/documentation/content/xdocs/dev/api-doc.xml index babafe8dd..94a671953 100644 --- a/src/documentation/content/xdocs/dev/api-doc.xml +++ b/src/documentation/content/xdocs/dev/api-doc.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/conventions.xml b/src/documentation/content/xdocs/dev/conventions.xml index d632cbb58..e68c11a5e 100644 --- a/src/documentation/content/xdocs/dev/conventions.xml +++ b/src/documentation/content/xdocs/dev/conventions.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/areas.xml b/src/documentation/content/xdocs/dev/design/areas.xml index be887f67d..6966b782f 100644 --- a/src/documentation/content/xdocs/dev/design/areas.xml +++ b/src/documentation/content/xdocs/dev/design/areas.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/breakpos.xml b/src/documentation/content/xdocs/dev/design/breakpos.xml index ff0063f9a..f76a91ee8 100644 --- a/src/documentation/content/xdocs/dev/design/breakpos.xml +++ b/src/documentation/content/xdocs/dev/design/breakpos.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/configuration.xml b/src/documentation/content/xdocs/dev/design/configuration.xml index 051961762..886a2fdde 100644 --- a/src/documentation/content/xdocs/dev/design/configuration.xml +++ b/src/documentation/content/xdocs/dev/design/configuration.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/embedding.xml b/src/documentation/content/xdocs/dev/design/embedding.xml index 999a0e40f..2fe66f2fe 100644 --- a/src/documentation/content/xdocs/dev/design/embedding.xml +++ b/src/documentation/content/xdocs/dev/design/embedding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/extending.xml b/src/documentation/content/xdocs/dev/design/extending.xml index 20d21ec23..17d5763c8 100644 --- a/src/documentation/content/xdocs/dev/design/extending.xml +++ b/src/documentation/content/xdocs/dev/design/extending.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/fotree.xml b/src/documentation/content/xdocs/dev/design/fotree.xml index c780ba161..cc99cb22f 100644 --- a/src/documentation/content/xdocs/dev/design/fotree.xml +++ b/src/documentation/content/xdocs/dev/design/fotree.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/images.xml b/src/documentation/content/xdocs/dev/design/images.xml index 40670a944..c946090f9 100644 --- a/src/documentation/content/xdocs/dev/design/images.xml +++ b/src/documentation/content/xdocs/dev/design/images.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/index.xml b/src/documentation/content/xdocs/dev/design/index.xml index 5f5c4c7e9..d74e13232 100644 --- a/src/documentation/content/xdocs/dev/design/index.xml +++ b/src/documentation/content/xdocs/dev/design/index.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/layout.xml b/src/documentation/content/xdocs/dev/design/layout.xml index c51cff626..3973a192a 100644 --- a/src/documentation/content/xdocs/dev/design/layout.xml +++ b/src/documentation/content/xdocs/dev/design/layout.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/optimise.xml b/src/documentation/content/xdocs/dev/design/optimise.xml index 5c07d2155..162dd9d64 100644 --- a/src/documentation/content/xdocs/dev/design/optimise.xml +++ b/src/documentation/content/xdocs/dev/design/optimise.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/parsing.xml b/src/documentation/content/xdocs/dev/design/parsing.xml index 6664915ea..d3b253df2 100644 --- a/src/documentation/content/xdocs/dev/design/parsing.xml +++ b/src/documentation/content/xdocs/dev/design/parsing.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/pdf-library.xml b/src/documentation/content/xdocs/dev/design/pdf-library.xml index a3f31b953..ba6fa01d7 100644 --- a/src/documentation/content/xdocs/dev/design/pdf-library.xml +++ b/src/documentation/content/xdocs/dev/design/pdf-library.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/properties.xml b/src/documentation/content/xdocs/dev/design/properties.xml index 8eea8d697..1ffb247b2 100644 --- a/src/documentation/content/xdocs/dev/design/properties.xml +++ b/src/documentation/content/xdocs/dev/design/properties.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/renderers.xml b/src/documentation/content/xdocs/dev/design/renderers.xml index 52d121f01..4c169e71f 100644 --- a/src/documentation/content/xdocs/dev/design/renderers.xml +++ b/src/documentation/content/xdocs/dev/design/renderers.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/startup.xml b/src/documentation/content/xdocs/dev/design/startup.xml index 94cf4cb90..c4da884d6 100644 --- a/src/documentation/content/xdocs/dev/design/startup.xml +++ b/src/documentation/content/xdocs/dev/design/startup.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/svg.xml b/src/documentation/content/xdocs/dev/design/svg.xml index 4e01df253..6779fb919 100644 --- a/src/documentation/content/xdocs/dev/design/svg.xml +++ b/src/documentation/content/xdocs/dev/design/svg.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/design/useragent.xml b/src/documentation/content/xdocs/dev/design/useragent.xml index b5865ab35..329778fec 100644 --- a/src/documentation/content/xdocs/dev/design/useragent.xml +++ b/src/documentation/content/xdocs/dev/design/useragent.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/doc.xml b/src/documentation/content/xdocs/dev/doc.xml index 9fe07aaff..742a2cc7a 100644 --- a/src/documentation/content/xdocs/dev/doc.xml +++ b/src/documentation/content/xdocs/dev/doc.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/extensions.xml b/src/documentation/content/xdocs/dev/extensions.xml index 0226ae564..a79a0d872 100644 --- a/src/documentation/content/xdocs/dev/extensions.xml +++ b/src/documentation/content/xdocs/dev/extensions.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/faq.xml b/src/documentation/content/xdocs/dev/faq.xml index 69faea47e..2206f9f9d 100644 --- a/src/documentation/content/xdocs/dev/faq.xml +++ b/src/documentation/content/xdocs/dev/faq.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/fo/embedding.fo b/src/documentation/content/xdocs/dev/fo/embedding.fo index f264d2c9f..c3503d6a6 100644 --- a/src/documentation/content/xdocs/dev/fo/embedding.fo +++ b/src/documentation/content/xdocs/dev/fo/embedding.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/fonts.xml b/src/documentation/content/xdocs/dev/fonts.xml index d88bbad28..1ce561c46 100644 --- a/src/documentation/content/xdocs/dev/fonts.xml +++ b/src/documentation/content/xdocs/dev/fonts.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/implement.xml b/src/documentation/content/xdocs/dev/implement.xml index 47337dabb..9533c55a9 100644 --- a/src/documentation/content/xdocs/dev/implement.xml +++ b/src/documentation/content/xdocs/dev/implement.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/index.xml b/src/documentation/content/xdocs/dev/index.xml index ecca865a4..56fe03be9 100644 --- a/src/documentation/content/xdocs/dev/index.xml +++ b/src/documentation/content/xdocs/dev/index.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/release.xml b/src/documentation/content/xdocs/dev/release.xml index 17059af46..ed5069026 100644 --- a/src/documentation/content/xdocs/dev/release.xml +++ b/src/documentation/content/xdocs/dev/release.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/rtflib.xml b/src/documentation/content/xdocs/dev/rtflib.xml index 1e8260819..d13a49873 100644 --- a/src/documentation/content/xdocs/dev/rtflib.xml +++ b/src/documentation/content/xdocs/dev/rtflib.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/svg.xml b/src/documentation/content/xdocs/dev/svg.xml index 68a43d6d1..e6b3b890d 100644 --- a/src/documentation/content/xdocs/dev/svg.xml +++ b/src/documentation/content/xdocs/dev/svg.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/svg/images.svg b/src/documentation/content/xdocs/dev/svg/images.svg index 4343feaed..f78cfe90a 100644 --- a/src/documentation/content/xdocs/dev/svg/images.svg +++ b/src/documentation/content/xdocs/dev/svg/images.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/svg/link.svg b/src/documentation/content/xdocs/dev/svg/link.svg index cd5ee6b02..917d137d3 100644 --- a/src/documentation/content/xdocs/dev/svg/link.svg +++ b/src/documentation/content/xdocs/dev/svg/link.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/svg/paints.svg b/src/documentation/content/xdocs/dev/svg/paints.svg index 81ecce67c..14b685fd1 100644 --- a/src/documentation/content/xdocs/dev/svg/paints.svg +++ b/src/documentation/content/xdocs/dev/svg/paints.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/svg/text.svg b/src/documentation/content/xdocs/dev/svg/text.svg index e13177a81..14c88bd05 100644 --- a/src/documentation/content/xdocs/dev/svg/text.svg +++ b/src/documentation/content/xdocs/dev/svg/text.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/svg/transparency.svg b/src/documentation/content/xdocs/dev/svg/transparency.svg index 8d546f917..be855aec3 100644 --- a/src/documentation/content/xdocs/dev/svg/transparency.svg +++ b/src/documentation/content/xdocs/dev/svg/transparency.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/testing.xml b/src/documentation/content/xdocs/dev/testing.xml index 683edd331..92589d589 100644 --- a/src/documentation/content/xdocs/dev/testing.xml +++ b/src/documentation/content/xdocs/dev/testing.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/dev/tools.xml b/src/documentation/content/xdocs/dev/tools.xml index 7e6068431..325a47ce8 100644 --- a/src/documentation/content/xdocs/dev/tools.xml +++ b/src/documentation/content/xdocs/dev/tools.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/download.xml b/src/documentation/content/xdocs/download.xml index a81b18504..6c9647a69 100644 --- a/src/documentation/content/xdocs/download.xml +++ b/src/documentation/content/xdocs/download.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/examples.xml b/src/documentation/content/xdocs/examples.xml index 2248c9107..8b40246d9 100644 --- a/src/documentation/content/xdocs/examples.xml +++ b/src/documentation/content/xdocs/examples.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/faq.xml b/src/documentation/content/xdocs/faq.xml index aae992ac0..02ed82542 100644 --- a/src/documentation/content/xdocs/faq.xml +++ b/src/documentation/content/xdocs/faq.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo.xml b/src/documentation/content/xdocs/fo.xml index f5ca9629b..fa7a16ca2 100644 --- a/src/documentation/content/xdocs/fo.xml +++ b/src/documentation/content/xdocs/fo.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo/align.fo b/src/documentation/content/xdocs/fo/align.fo index 0fb8a5e18..ee0cc8827 100644 --- a/src/documentation/content/xdocs/fo/align.fo +++ b/src/documentation/content/xdocs/fo/align.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo/align2.fo b/src/documentation/content/xdocs/fo/align2.fo index c05e024ba..d16553139 100644 --- a/src/documentation/content/xdocs/fo/align2.fo +++ b/src/documentation/content/xdocs/fo/align2.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo/blocks.ent b/src/documentation/content/xdocs/fo/blocks.ent index 5168f2c15..84f48518b 100644 --- a/src/documentation/content/xdocs/fo/blocks.ent +++ b/src/documentation/content/xdocs/fo/blocks.ent @@ -1,9 +1,10 @@ <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo/embed.fo b/src/documentation/content/xdocs/fo/embed.fo index 2a36ce545..558e9d397 100644 --- a/src/documentation/content/xdocs/fo/embed.fo +++ b/src/documentation/content/xdocs/fo/embed.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo/fonts.fo b/src/documentation/content/xdocs/fo/fonts.fo index 997fc427e..12e176eba 100644 --- a/src/documentation/content/xdocs/fo/fonts.fo +++ b/src/documentation/content/xdocs/fo/fonts.fo @@ -1,10 +1,11 @@ <?xml version="1.0" ?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/fo/size.fo b/src/documentation/content/xdocs/fo/size.fo index 1ad488655..225adb491 100644 --- a/src/documentation/content/xdocs/fo/size.fo +++ b/src/documentation/content/xdocs/fo/size.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/gethelp.xml b/src/documentation/content/xdocs/gethelp.xml index 760edbe2a..8a0a41439 100644 --- a/src/documentation/content/xdocs/gethelp.xml +++ b/src/documentation/content/xdocs/gethelp.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/index.xml b/src/documentation/content/xdocs/index.xml index 3f3f5f0a5..6edc8580e 100644 --- a/src/documentation/content/xdocs/index.xml +++ b/src/documentation/content/xdocs/index.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/knownissues.xml b/src/documentation/content/xdocs/knownissues.xml index 797755621..dc04d9262 100644 --- a/src/documentation/content/xdocs/knownissues.xml +++ b/src/documentation/content/xdocs/knownissues.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/license.xml b/src/documentation/content/xdocs/license.xml index 34fed9636..e4e8e9471 100644 --- a/src/documentation/content/xdocs/license.xml +++ b/src/documentation/content/xdocs/license.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/maillist.xml b/src/documentation/content/xdocs/maillist.xml index 4de88d762..ac98024a7 100644 --- a/src/documentation/content/xdocs/maillist.xml +++ b/src/documentation/content/xdocs/maillist.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/news.xml b/src/documentation/content/xdocs/news.xml index b9f551b8f..bb9b27a32 100644 --- a/src/documentation/content/xdocs/news.xml +++ b/src/documentation/content/xdocs/news.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/relnotes.xml b/src/documentation/content/xdocs/relnotes.xml index 9cc964423..161beabca 100644 --- a/src/documentation/content/xdocs/relnotes.xml +++ b/src/documentation/content/xdocs/relnotes.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/resources.xml b/src/documentation/content/xdocs/resources.xml index 8a34dda05..663c60efe 100644 --- a/src/documentation/content/xdocs/resources.xml +++ b/src/documentation/content/xdocs/resources.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/site.xml b/src/documentation/content/xdocs/site.xml index 96b60461f..a82158024 100644 --- a/src/documentation/content/xdocs/site.xml +++ b/src/documentation/content/xdocs/site.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/status.xml b/src/documentation/content/xdocs/status.xml index 603063a4b..206dd9fcd 100644 --- a/src/documentation/content/xdocs/status.xml +++ b/src/documentation/content/xdocs/status.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/tabs.xml b/src/documentation/content/xdocs/tabs.xml index 4a0ab9b0e..8aba41984 100644 --- a/src/documentation/content/xdocs/tabs.xml +++ b/src/documentation/content/xdocs/tabs.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/team.xml b/src/documentation/content/xdocs/team.xml index c21e8171b..2b9af709e 100644 --- a/src/documentation/content/xdocs/team.xml +++ b/src/documentation/content/xdocs/team.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/anttask.xml b/src/documentation/content/xdocs/trunk/anttask.xml index ba21c861a..9831f2c01 100644 --- a/src/documentation/content/xdocs/trunk/anttask.xml +++ b/src/documentation/content/xdocs/trunk/anttask.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/compiling.xml b/src/documentation/content/xdocs/trunk/compiling.xml index ad02f3046..76d7b214f 100644 --- a/src/documentation/content/xdocs/trunk/compiling.xml +++ b/src/documentation/content/xdocs/trunk/compiling.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/configuration.xml b/src/documentation/content/xdocs/trunk/configuration.xml index 07691e13a..53a48b2e8 100644 --- a/src/documentation/content/xdocs/trunk/configuration.xml +++ b/src/documentation/content/xdocs/trunk/configuration.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/embedding.xml b/src/documentation/content/xdocs/trunk/embedding.xml index 06b241eb4..00d57c75e 100644 --- a/src/documentation/content/xdocs/trunk/embedding.xml +++ b/src/documentation/content/xdocs/trunk/embedding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/extensions.xml b/src/documentation/content/xdocs/trunk/extensions.xml index 71fff1e09..e2d19eca8 100644 --- a/src/documentation/content/xdocs/trunk/extensions.xml +++ b/src/documentation/content/xdocs/trunk/extensions.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/fonts.xml b/src/documentation/content/xdocs/trunk/fonts.xml index 5c1fc0c6f..afe5a8558 100644 --- a/src/documentation/content/xdocs/trunk/fonts.xml +++ b/src/documentation/content/xdocs/trunk/fonts.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/graphics.xml b/src/documentation/content/xdocs/trunk/graphics.xml index e52f25736..9f56f0526 100644 --- a/src/documentation/content/xdocs/trunk/graphics.xml +++ b/src/documentation/content/xdocs/trunk/graphics.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/hyphenation.xml b/src/documentation/content/xdocs/trunk/hyphenation.xml index 6b21dd951..ed97c6868 100644 --- a/src/documentation/content/xdocs/trunk/hyphenation.xml +++ b/src/documentation/content/xdocs/trunk/hyphenation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/index.xml b/src/documentation/content/xdocs/trunk/index.xml index ea60c741b..dfa92c3b9 100644 --- a/src/documentation/content/xdocs/trunk/index.xml +++ b/src/documentation/content/xdocs/trunk/index.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/intermediate.xml b/src/documentation/content/xdocs/trunk/intermediate.xml index ad42f2645..3a9a9494c 100644 --- a/src/documentation/content/xdocs/trunk/intermediate.xml +++ b/src/documentation/content/xdocs/trunk/intermediate.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/output.xml b/src/documentation/content/xdocs/trunk/output.xml index ec789ca0f..a0a53324f 100644 --- a/src/documentation/content/xdocs/trunk/output.xml +++ b/src/documentation/content/xdocs/trunk/output.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/pdfa.xml b/src/documentation/content/xdocs/trunk/pdfa.xml index e0d8ccf8f..505a10805 100644 --- a/src/documentation/content/xdocs/trunk/pdfa.xml +++ b/src/documentation/content/xdocs/trunk/pdfa.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/pdfencryption.xml b/src/documentation/content/xdocs/trunk/pdfencryption.xml index aca98135a..f68eae437 100755 --- a/src/documentation/content/xdocs/trunk/pdfencryption.xml +++ b/src/documentation/content/xdocs/trunk/pdfencryption.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/running.xml b/src/documentation/content/xdocs/trunk/running.xml index 302f2efe4..8cc0fe280 100644 --- a/src/documentation/content/xdocs/trunk/running.xml +++ b/src/documentation/content/xdocs/trunk/running.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/servlets.xml b/src/documentation/content/xdocs/trunk/servlets.xml index b26cef592..cecbcaa60 100644 --- a/src/documentation/content/xdocs/trunk/servlets.xml +++ b/src/documentation/content/xdocs/trunk/servlets.xml @@ -1,10 +1,11 @@ <?xml version="1.0" standalone="no"?> <!-- - Copyright 1999-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/content/xdocs/trunk/upgrading.xml b/src/documentation/content/xdocs/trunk/upgrading.xml index abfb3b939..e052295c8 100644 --- a/src/documentation/content/xdocs/trunk/upgrading.xml +++ b/src/documentation/content/xdocs/trunk/upgrading.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/images/logo2.svg b/src/documentation/resources/images/logo2.svg index d394a5922..9dfb623b3 100644 --- a/src/documentation/resources/images/logo2.svg +++ b/src/documentation/resources/images/logo2.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/images/svg/EmbeddingExampleFO2PDF.svg b/src/documentation/resources/images/svg/EmbeddingExampleFO2PDF.svg index 470c7c546..66acfdeaf 100644 --- a/src/documentation/resources/images/svg/EmbeddingExampleFO2PDF.svg +++ b/src/documentation/resources/images/svg/EmbeddingExampleFO2PDF.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/images/svg/EmbeddingExampleObj2PDF.svg b/src/documentation/resources/images/svg/EmbeddingExampleObj2PDF.svg index 17c8ec7ae..cae661410 100644 --- a/src/documentation/resources/images/svg/EmbeddingExampleObj2PDF.svg +++ b/src/documentation/resources/images/svg/EmbeddingExampleObj2PDF.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/images/svg/EmbeddingExampleObj2XML.svg b/src/documentation/resources/images/svg/EmbeddingExampleObj2XML.svg index d74f5ef3e..5c6a2eca7 100644 --- a/src/documentation/resources/images/svg/EmbeddingExampleObj2XML.svg +++ b/src/documentation/resources/images/svg/EmbeddingExampleObj2XML.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/images/svg/EmbeddingExampleXML2FO.svg b/src/documentation/resources/images/svg/EmbeddingExampleXML2FO.svg index 3abbeb5a7..395fe46c8 100644 --- a/src/documentation/resources/images/svg/EmbeddingExampleXML2FO.svg +++ b/src/documentation/resources/images/svg/EmbeddingExampleXML2FO.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/images/svg/EmbeddingExampleXML2PDF.svg b/src/documentation/resources/images/svg/EmbeddingExampleXML2PDF.svg index 0f88b8351..f0b0d6dcd 100644 --- a/src/documentation/resources/images/svg/EmbeddingExampleXML2PDF.svg +++ b/src/documentation/resources/images/svg/EmbeddingExampleXML2PDF.svg @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/schema/catalog.fop.xcat b/src/documentation/resources/schema/catalog.fop.xcat index 652fbf687..327019c56 100644 --- a/src/documentation/resources/schema/catalog.fop.xcat +++ b/src/documentation/resources/schema/catalog.fop.xcat @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/schema/catalog.xcat b/src/documentation/resources/schema/catalog.xcat index 80b28ad6b..e4b09a781 100644 --- a/src/documentation/resources/schema/catalog.xcat +++ b/src/documentation/resources/schema/catalog.xcat @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/schema/dtd/compliance-v10.dtd b/src/documentation/resources/schema/dtd/compliance-v10.dtd index 4e3a061aa..4ed235c81 100644 --- a/src/documentation/resources/schema/dtd/compliance-v10.dtd +++ b/src/documentation/resources/schema/dtd/compliance-v10.dtd @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/changes2document.xsl b/src/documentation/resources/stylesheets/changes2document.xsl index d2dc6f112..8ac82a938 100644 --- a/src/documentation/resources/stylesheets/changes2document.xsl +++ b/src/documentation/resources/stylesheets/changes2document.xsl @@ -1,11 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2005 The Apache Software Foundation or its licensors, - as applicable. - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/compliance2document.xsl b/src/documentation/resources/stylesheets/compliance2document.xsl index d5cf2d543..d4af94b59 100644 --- a/src/documentation/resources/stylesheets/compliance2document.xsl +++ b/src/documentation/resources/stylesheets/compliance2document.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/compliance2fo.xsl b/src/documentation/resources/stylesheets/compliance2fo.xsl index 2e67a75f1..7af7336f3 100644 --- a/src/documentation/resources/stylesheets/compliance2fo.xsl +++ b/src/documentation/resources/stylesheets/compliance2fo.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/compliance2html.xsl b/src/documentation/resources/stylesheets/compliance2html.xsl index 94c82a6bf..e3646f7ca 100644 --- a/src/documentation/resources/stylesheets/compliance2html.xsl +++ b/src/documentation/resources/stylesheets/compliance2html.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/disabled-testcases2document.xsl b/src/documentation/resources/stylesheets/disabled-testcases2document.xsl index 7e3fcf501..7dc47c90c 100644 --- a/src/documentation/resources/stylesheets/disabled-testcases2document.xsl +++ b/src/documentation/resources/stylesheets/disabled-testcases2document.xsl @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2005 The Apache Software Foundation. - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/dotdots.xsl b/src/documentation/resources/stylesheets/dotdots.xsl index 2f6aeb881..af854de0a 100644 --- a/src/documentation/resources/stylesheets/dotdots.xsl +++ b/src/documentation/resources/stylesheets/dotdots.xsl @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 2002-2004 The Apache Software Foundation or its licensors, - as applicable. - - Licensed 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 + 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 diff --git a/src/documentation/resources/stylesheets/releaseNotes2document.xsl b/src/documentation/resources/stylesheets/releaseNotes2document.xsl index 0569b7a1c..700f5e317 100644 --- a/src/documentation/resources/stylesheets/releaseNotes2document.xsl +++ b/src/documentation/resources/stylesheets/releaseNotes2document.xsl @@ -1,11 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2005 The Apache Software Foundation or its licensors, - as applicable. - - Licensed 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 + 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 diff --git a/src/documentation/sitemap.xmap b/src/documentation/sitemap.xmap index 18e5ed69d..c9eed11a7 100644 --- a/src/documentation/sitemap.xmap +++ b/src/documentation/sitemap.xmap @@ -1,11 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 1999-2005 The Apache Software Foundation or its licensors, - as applicable. - - Licensed 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 + 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 diff --git a/src/documentation/skinconf.xml b/src/documentation/skinconf.xml index de7a9dd35..42f74e9cf 100644 --- a/src/documentation/skinconf.xml +++ b/src/documentation/skinconf.xml @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2002-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/foschema/fop-configuration.xsd b/src/foschema/fop-configuration.xsd index a4abd3576..2cc0fca56 100644 --- a/src/foschema/fop-configuration.xsd +++ b/src/foschema/fop-configuration.xsd @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/foschema/fop.xsd b/src/foschema/fop.xsd index 030d92d0f..a787bf32c 100644 --- a/src/foschema/fop.xsd +++ b/src/foschema/fop.xsd @@ -1,10 +1,11 @@ <?xml version = "1.0" encoding = "UTF-8"?> <!-- - Copyright 1999-2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/foschema/schema2completion.xsl b/src/foschema/schema2completion.xsl index 8c966904a..f07e7a6d3 100644 --- a/src/foschema/schema2completion.xsl +++ b/src/foschema/schema2completion.xsl @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/foschema/schema2dtd.xsl b/src/foschema/schema2dtd.xsl index 789f836bc..088747653 100644 --- a/src/foschema/schema2dtd.xsl +++ b/src/foschema/schema2dtd.xsl @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 1999-2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java b/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java index da1e042f0..76bb3e4bc 100644 --- a/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java +++ b/src/java-1.3/org/apache/fop/svg/GraphicsConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java-1.4/org/apache/fop/image/ImageIOImage.java b/src/java-1.4/org/apache/fop/image/ImageIOImage.java index 1c97423cf..db9262adc 100644 --- a/src/java-1.4/org/apache/fop/image/ImageIOImage.java +++ b/src/java-1.4/org/apache/fop/image/ImageIOImage.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java-1.4/org/apache/fop/image/JpegImageIOImage.java b/src/java-1.4/org/apache/fop/image/JpegImageIOImage.java index 510838799..86d78f666 100644 --- a/src/java-1.4/org/apache/fop/image/JpegImageIOImage.java +++ b/src/java-1.4/org/apache/fop/image/JpegImageIOImage.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java b/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java index ae2b4c8e5..a92baed27 100644 --- a/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java +++ b/src/java-1.4/org/apache/fop/svg/GraphicsConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/Version.java b/src/java/org/apache/fop/Version.java index bad7ee8b6..7e421ad29 100644 --- a/src/java/org/apache/fop/Version.java +++ b/src/java/org/apache/fop/Version.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/apps/FOPException.java b/src/java/org/apache/fop/apps/FOPException.java index 4f9d3a3a9..3e1c180e9 100644 --- a/src/java/org/apache/fop/apps/FOPException.java +++ b/src/java/org/apache/fop/apps/FOPException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/apps/FOURIResolver.java b/src/java/org/apache/fop/apps/FOURIResolver.java index 68eda5825..925cd62f8 100644 --- a/src/java/org/apache/fop/apps/FOURIResolver.java +++ b/src/java/org/apache/fop/apps/FOURIResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/apps/FOUserAgent.java b/src/java/org/apache/fop/apps/FOUserAgent.java index 5c78221f4..2f4b730b7 100644 --- a/src/java/org/apache/fop/apps/FOUserAgent.java +++ b/src/java/org/apache/fop/apps/FOUserAgent.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/apps/Fop.java b/src/java/org/apache/fop/apps/Fop.java index 574a17350..a7602a981 100644 --- a/src/java/org/apache/fop/apps/Fop.java +++ b/src/java/org/apache/fop/apps/Fop.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/apps/FopFactory.java b/src/java/org/apache/fop/apps/FopFactory.java index 152d75829..d5cc4dee9 100644 --- a/src/java/org/apache/fop/apps/FopFactory.java +++ b/src/java/org/apache/fop/apps/FopFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/apps/FormattingResults.java b/src/java/org/apache/fop/apps/FormattingResults.java index 53c2d816a..80449bd4b 100644 --- a/src/java/org/apache/fop/apps/FormattingResults.java +++ b/src/java/org/apache/fop/apps/FormattingResults.java @@ -1,84 +1,85 @@ -/* - * Copyright 1999-2003,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* $Id$ */ - -package org.apache.fop.apps; - -import java.util.List; - -import org.apache.fop.fo.pagination.PageSequence; - -/** - * Class for reporting back formatting results to the calling application. - */ -public class FormattingResults { - - private int pageCount = 0; - private List pageSequences = null; - - /** - * Constructor for the FormattingResults object - */ - public FormattingResults() { - } - - /** - * Gets the number of pages rendered - * - * @return The number of pages overall - */ - public int getPageCount() { - return this.pageCount; - } - - /** - * Gets the results for the individual page-sequences. - * - * @return A List with PageSequenceResults objects - */ - public List getPageSequences() { - return this.pageSequences; - } - - /** - * Resets this object - */ - public void reset() { - this.pageCount = 0; - if (this.pageSequences != null) { - this.pageSequences.clear(); - } - } - - /** - * Reports the result of one page sequence rendering - * back into this object. - * - * @param pageSequence the PageSequence which just completed rendering - * @param pageCount the number of pages rendered for that PageSequence - */ - public void haveFormattedPageSequence(PageSequence pageSequence, int pageCount) { - this.pageCount += pageCount; - if (this.pageSequences == null) { - this.pageSequences = new java.util.ArrayList(); - } - this.pageSequences.add( - new PageSequenceResults(pageSequence.getId(), - pageCount)); - } -} - +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.apps;
+
+import java.util.List;
+
+import org.apache.fop.fo.pagination.PageSequence;
+
+/**
+ * Class for reporting back formatting results to the calling application.
+ */
+public class FormattingResults {
+
+ private int pageCount = 0;
+ private List pageSequences = null;
+
+ /**
+ * Constructor for the FormattingResults object
+ */
+ public FormattingResults() {
+ }
+
+ /**
+ * Gets the number of pages rendered
+ *
+ * @return The number of pages overall
+ */
+ public int getPageCount() {
+ return this.pageCount;
+ }
+
+ /**
+ * Gets the results for the individual page-sequences.
+ *
+ * @return A List with PageSequenceResults objects
+ */
+ public List getPageSequences() {
+ return this.pageSequences;
+ }
+
+ /**
+ * Resets this object
+ */
+ public void reset() {
+ this.pageCount = 0;
+ if (this.pageSequences != null) {
+ this.pageSequences.clear();
+ }
+ }
+
+ /**
+ * Reports the result of one page sequence rendering
+ * back into this object.
+ *
+ * @param pageSequence the PageSequence which just completed rendering
+ * @param pageCount the number of pages rendered for that PageSequence
+ */
+ public void haveFormattedPageSequence(PageSequence pageSequence, int pageCount) {
+ this.pageCount += pageCount;
+ if (this.pageSequences == null) {
+ this.pageSequences = new java.util.ArrayList();
+ }
+ this.pageSequences.add(
+ new PageSequenceResults(pageSequence.getId(),
+ pageCount));
+ }
+}
+
diff --git a/src/java/org/apache/fop/apps/MimeConstants.java b/src/java/org/apache/fop/apps/MimeConstants.java index 5deff5237..b17998393 100644 --- a/src/java/org/apache/fop/apps/MimeConstants.java +++ b/src/java/org/apache/fop/apps/MimeConstants.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
@@ -13,6 +14,9 @@ * See the License for the specific language governing permissions and
* limitations under the License.
*/
+
+/* $Id$ */
+
package org.apache.fop.apps;
/**
diff --git a/src/java/org/apache/fop/apps/PageSequenceResults.java b/src/java/org/apache/fop/apps/PageSequenceResults.java index 1819840e3..ae873b5e3 100644 --- a/src/java/org/apache/fop/apps/PageSequenceResults.java +++ b/src/java/org/apache/fop/apps/PageSequenceResults.java @@ -1,58 +1,59 @@ -/* - * Copyright 1999-2003,2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* $Id$ */ - -package org.apache.fop.apps; - -/** - * Class for reporting back formatting results to the calling application. This - * particular class is used to report the results of a single page-sequence. - */ -public class PageSequenceResults { - - private String id; - private int pageCount; - - /** - * Constructor for the PageSequenceResults object - * - * @param id ID of the page-sequence, if available - * @param pageCount The number of resulting pages - */ - public PageSequenceResults(String id, int pageCount) { - this.id = id; - this.pageCount = pageCount; - } - - /** - * Gets the ID of the page-sequence if one was specified. - * - * @return The ID - */ - public String getID() { - return this.id; - } - - /** - * Gets the number of pages that resulted by processing the page-sequence. - * - * @return The number of pages generated - */ - public int getPageCount() { - return this.pageCount; - } -} +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.apps;
+
+/**
+ * Class for reporting back formatting results to the calling application. This
+ * particular class is used to report the results of a single page-sequence.
+ */
+public class PageSequenceResults {
+
+ private String id;
+ private int pageCount;
+
+ /**
+ * Constructor for the PageSequenceResults object
+ *
+ * @param id ID of the page-sequence, if available
+ * @param pageCount The number of resulting pages
+ */
+ public PageSequenceResults(String id, int pageCount) {
+ this.id = id;
+ this.pageCount = pageCount;
+ }
+
+ /**
+ * Gets the ID of the page-sequence if one was specified.
+ *
+ * @return The ID
+ */
+ public String getID() {
+ return this.id;
+ }
+
+ /**
+ * Gets the number of pages that resulted by processing the page-sequence.
+ *
+ * @return The number of pages generated
+ */
+ public int getPageCount() {
+ return this.pageCount;
+ }
+}
diff --git a/src/java/org/apache/fop/area/AbstractOffDocumentItem.java b/src/java/org/apache/fop/area/AbstractOffDocumentItem.java index 4f56b026d..94cfa9e09 100644 --- a/src/java/org/apache/fop/area/AbstractOffDocumentItem.java +++ b/src/java/org/apache/fop/area/AbstractOffDocumentItem.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Area.java b/src/java/org/apache/fop/area/Area.java index ab2136ac3..0fc11960e 100644 --- a/src/java/org/apache/fop/area/Area.java +++ b/src/java/org/apache/fop/area/Area.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/AreaTreeHandler.java b/src/java/org/apache/fop/area/AreaTreeHandler.java index a3b97805b..2215fc05e 100644 --- a/src/java/org/apache/fop/area/AreaTreeHandler.java +++ b/src/java/org/apache/fop/area/AreaTreeHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/AreaTreeModel.java b/src/java/org/apache/fop/area/AreaTreeModel.java index 74e2eb562..c91364cbb 100644 --- a/src/java/org/apache/fop/area/AreaTreeModel.java +++ b/src/java/org/apache/fop/area/AreaTreeModel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/AreaTreeObject.java b/src/java/org/apache/fop/area/AreaTreeObject.java index f8aed7ab4..94250deba 100644 --- a/src/java/org/apache/fop/area/AreaTreeObject.java +++ b/src/java/org/apache/fop/area/AreaTreeObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/AreaTreeParser.java b/src/java/org/apache/fop/area/AreaTreeParser.java index e0c274655..b6d1e8163 100644 --- a/src/java/org/apache/fop/area/AreaTreeParser.java +++ b/src/java/org/apache/fop/area/AreaTreeParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/BeforeFloat.java b/src/java/org/apache/fop/area/BeforeFloat.java index 4ebbaf296..23883f133 100644 --- a/src/java/org/apache/fop/area/BeforeFloat.java +++ b/src/java/org/apache/fop/area/BeforeFloat.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Block.java b/src/java/org/apache/fop/area/Block.java index f51bb7efc..264a9e690 100644 --- a/src/java/org/apache/fop/area/Block.java +++ b/src/java/org/apache/fop/area/Block.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/BlockParent.java b/src/java/org/apache/fop/area/BlockParent.java index fe6650dbc..626b18ae5 100644 --- a/src/java/org/apache/fop/area/BlockParent.java +++ b/src/java/org/apache/fop/area/BlockParent.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/BlockViewport.java b/src/java/org/apache/fop/area/BlockViewport.java index df93eb5e5..af994afd4 100644 --- a/src/java/org/apache/fop/area/BlockViewport.java +++ b/src/java/org/apache/fop/area/BlockViewport.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/BodyRegion.java b/src/java/org/apache/fop/area/BodyRegion.java index 565bab42d..dc63ae778 100644 --- a/src/java/org/apache/fop/area/BodyRegion.java +++ b/src/java/org/apache/fop/area/BodyRegion.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -14,7 +15,7 @@ * limitations under the License. */ -/* $Id: BodyRegion.java,v 1.4 2004/02/27 17:41:26 jeremias Exp $ */ +/* $Id$ */ package org.apache.fop.area; diff --git a/src/java/org/apache/fop/area/BookmarkData.java b/src/java/org/apache/fop/area/BookmarkData.java index ab022e7d9..8ef1e6086 100644 --- a/src/java/org/apache/fop/area/BookmarkData.java +++ b/src/java/org/apache/fop/area/BookmarkData.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/CTM.java b/src/java/org/apache/fop/area/CTM.java index 230f2680b..d27e4ca20 100644 --- a/src/java/org/apache/fop/area/CTM.java +++ b/src/java/org/apache/fop/area/CTM.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/CachedRenderPagesModel.java b/src/java/org/apache/fop/area/CachedRenderPagesModel.java index 6692b5f5b..4d4237078 100644 --- a/src/java/org/apache/fop/area/CachedRenderPagesModel.java +++ b/src/java/org/apache/fop/area/CachedRenderPagesModel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Footnote.java b/src/java/org/apache/fop/area/Footnote.java index afa12afaf..0366740b0 100644 --- a/src/java/org/apache/fop/area/Footnote.java +++ b/src/java/org/apache/fop/area/Footnote.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/LineArea.java b/src/java/org/apache/fop/area/LineArea.java index eb2343565..449a5d915 100644 --- a/src/java/org/apache/fop/area/LineArea.java +++ b/src/java/org/apache/fop/area/LineArea.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/LinkResolver.java b/src/java/org/apache/fop/area/LinkResolver.java index 28390ee6c..603aede87 100644 --- a/src/java/org/apache/fop/area/LinkResolver.java +++ b/src/java/org/apache/fop/area/LinkResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/MainReference.java b/src/java/org/apache/fop/area/MainReference.java index f3d1ac7d2..55728f8fd 100644 --- a/src/java/org/apache/fop/area/MainReference.java +++ b/src/java/org/apache/fop/area/MainReference.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/NormalFlow.java b/src/java/org/apache/fop/area/NormalFlow.java index 02b0aac50..e927122c9 100644 --- a/src/java/org/apache/fop/area/NormalFlow.java +++ b/src/java/org/apache/fop/area/NormalFlow.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java b/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java index 4797fbaab..cd75e203b 100644 --- a/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java +++ b/src/java/org/apache/fop/area/OffDocumentExtensionAttachment.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/OffDocumentItem.java b/src/java/org/apache/fop/area/OffDocumentItem.java index 6bac6800d..e4e07f974 100644 --- a/src/java/org/apache/fop/area/OffDocumentItem.java +++ b/src/java/org/apache/fop/area/OffDocumentItem.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Page.java b/src/java/org/apache/fop/area/Page.java index fba37f506..64a6db576 100644 --- a/src/java/org/apache/fop/area/Page.java +++ b/src/java/org/apache/fop/area/Page.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/PageSequence.java b/src/java/org/apache/fop/area/PageSequence.java index 39cb72214..d39ec7cf2 100644 --- a/src/java/org/apache/fop/area/PageSequence.java +++ b/src/java/org/apache/fop/area/PageSequence.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/PageViewport.java b/src/java/org/apache/fop/area/PageViewport.java index e4be2d8e2..282bce367 100644 --- a/src/java/org/apache/fop/area/PageViewport.java +++ b/src/java/org/apache/fop/area/PageViewport.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/RegionReference.java b/src/java/org/apache/fop/area/RegionReference.java index eb85fc4b8..00b51263d 100644 --- a/src/java/org/apache/fop/area/RegionReference.java +++ b/src/java/org/apache/fop/area/RegionReference.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/RegionViewport.java b/src/java/org/apache/fop/area/RegionViewport.java index 23017fded..586048a1b 100644 --- a/src/java/org/apache/fop/area/RegionViewport.java +++ b/src/java/org/apache/fop/area/RegionViewport.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/RenderPagesModel.java b/src/java/org/apache/fop/area/RenderPagesModel.java index fbd44780a..da9305fa1 100644 --- a/src/java/org/apache/fop/area/RenderPagesModel.java +++ b/src/java/org/apache/fop/area/RenderPagesModel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Resolvable.java b/src/java/org/apache/fop/area/Resolvable.java index e8ad3f791..e9c0198ce 100644 --- a/src/java/org/apache/fop/area/Resolvable.java +++ b/src/java/org/apache/fop/area/Resolvable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Span.java b/src/java/org/apache/fop/area/Span.java index d1ba95190..401adda64 100644 --- a/src/java/org/apache/fop/area/Span.java +++ b/src/java/org/apache/fop/area/Span.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/Trait.java b/src/java/org/apache/fop/area/Trait.java index 0ab88a3de..6db47949a 100644 --- a/src/java/org/apache/fop/area/Trait.java +++ b/src/java/org/apache/fop/area/Trait.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/AbstractTextArea.java b/src/java/org/apache/fop/area/inline/AbstractTextArea.java index 200b3e568..6f56a955b 100644 --- a/src/java/org/apache/fop/area/inline/AbstractTextArea.java +++ b/src/java/org/apache/fop/area/inline/AbstractTextArea.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Anchor.java b/src/java/org/apache/fop/area/inline/Anchor.java index 5f94caae0..4114025c8 100644 --- a/src/java/org/apache/fop/area/inline/Anchor.java +++ b/src/java/org/apache/fop/area/inline/Anchor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Character.java b/src/java/org/apache/fop/area/inline/Character.java index 04f73aa86..6b6f9744f 100644 --- a/src/java/org/apache/fop/area/inline/Character.java +++ b/src/java/org/apache/fop/area/inline/Character.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Container.java b/src/java/org/apache/fop/area/inline/Container.java index b1982e452..b22d09687 100644 --- a/src/java/org/apache/fop/area/inline/Container.java +++ b/src/java/org/apache/fop/area/inline/Container.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/FilledArea.java b/src/java/org/apache/fop/area/inline/FilledArea.java index 214e4110a..6b84c660d 100644 --- a/src/java/org/apache/fop/area/inline/FilledArea.java +++ b/src/java/org/apache/fop/area/inline/FilledArea.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/ForeignObject.java b/src/java/org/apache/fop/area/inline/ForeignObject.java index 8a47be6e1..4daa41957 100644 --- a/src/java/org/apache/fop/area/inline/ForeignObject.java +++ b/src/java/org/apache/fop/area/inline/ForeignObject.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Image.java b/src/java/org/apache/fop/area/inline/Image.java index 0efe48250..1e0a65114 100644 --- a/src/java/org/apache/fop/area/inline/Image.java +++ b/src/java/org/apache/fop/area/inline/Image.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/InlineArea.java b/src/java/org/apache/fop/area/inline/InlineArea.java index d4e0f47cf..892ad6062 100644 --- a/src/java/org/apache/fop/area/inline/InlineArea.java +++ b/src/java/org/apache/fop/area/inline/InlineArea.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/InlineBlockParent.java b/src/java/org/apache/fop/area/inline/InlineBlockParent.java index 9934b1316..7cb611939 100644 --- a/src/java/org/apache/fop/area/inline/InlineBlockParent.java +++ b/src/java/org/apache/fop/area/inline/InlineBlockParent.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/InlineParent.java b/src/java/org/apache/fop/area/inline/InlineParent.java index 122c8b2c9..016154989 100644 --- a/src/java/org/apache/fop/area/inline/InlineParent.java +++ b/src/java/org/apache/fop/area/inline/InlineParent.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Leader.java b/src/java/org/apache/fop/area/inline/Leader.java index e68469b01..1bcc72eab 100644 --- a/src/java/org/apache/fop/area/inline/Leader.java +++ b/src/java/org/apache/fop/area/inline/Leader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Space.java b/src/java/org/apache/fop/area/inline/Space.java index cf8235589..e0e9982bf 100644 --- a/src/java/org/apache/fop/area/inline/Space.java +++ b/src/java/org/apache/fop/area/inline/Space.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/SpaceArea.java b/src/java/org/apache/fop/area/inline/SpaceArea.java index 193553464..2dcf3d188 100644 --- a/src/java/org/apache/fop/area/inline/SpaceArea.java +++ b/src/java/org/apache/fop/area/inline/SpaceArea.java @@ -1,9 +1,10 @@ /*
- * Copyright 2004-2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/area/inline/TextArea.java b/src/java/org/apache/fop/area/inline/TextArea.java index a3962f457..5e3d3da39 100644 --- a/src/java/org/apache/fop/area/inline/TextArea.java +++ b/src/java/org/apache/fop/area/inline/TextArea.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java index fe5e25eef..f8585e95a 100644 --- a/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java +++ b/src/java/org/apache/fop/area/inline/UnresolvedPageNumber.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/Viewport.java b/src/java/org/apache/fop/area/inline/Viewport.java index e8035a904..fadeb6e97 100644 --- a/src/java/org/apache/fop/area/inline/Viewport.java +++ b/src/java/org/apache/fop/area/inline/Viewport.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/area/inline/WordArea.java b/src/java/org/apache/fop/area/inline/WordArea.java index f62dc499f..a592bdd80 100644 --- a/src/java/org/apache/fop/area/inline/WordArea.java +++ b/src/java/org/apache/fop/area/inline/WordArea.java @@ -1,9 +1,10 @@ /*
- * Copyright 2004-2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/area/inline/package.html b/src/java/org/apache/fop/area/inline/package.html index 249d862ca..064a17d0c 100644 --- a/src/java/org/apache/fop/area/inline/package.html +++ b/src/java/org/apache/fop/area/inline/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/area/package.html b/src/java/org/apache/fop/area/package.html index 4be652919..c0f096e11 100644 --- a/src/java/org/apache/fop/area/package.html +++ b/src/java/org/apache/fop/area/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/cli/AreaTreeInputHandler.java b/src/java/org/apache/fop/cli/AreaTreeInputHandler.java index c4f0c5395..4662a0ebc 100644 --- a/src/java/org/apache/fop/cli/AreaTreeInputHandler.java +++ b/src/java/org/apache/fop/cli/AreaTreeInputHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/cli/CommandLineOptions.java b/src/java/org/apache/fop/cli/CommandLineOptions.java index d88e73cac..cfd5a878e 100644 --- a/src/java/org/apache/fop/cli/CommandLineOptions.java +++ b/src/java/org/apache/fop/cli/CommandLineOptions.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/cli/InputHandler.java b/src/java/org/apache/fop/cli/InputHandler.java index 13d756ada..bdf4f6a6a 100644 --- a/src/java/org/apache/fop/cli/InputHandler.java +++ b/src/java/org/apache/fop/cli/InputHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/cli/Main.java b/src/java/org/apache/fop/cli/Main.java index 8bdf91f46..cf793e2c0 100644 --- a/src/java/org/apache/fop/cli/Main.java +++ b/src/java/org/apache/fop/cli/Main.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/CompoundDatatype.java b/src/java/org/apache/fop/datatypes/CompoundDatatype.java index 6f88e82a7..85805933a 100644 --- a/src/java/org/apache/fop/datatypes/CompoundDatatype.java +++ b/src/java/org/apache/fop/datatypes/CompoundDatatype.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/FODimension.java b/src/java/org/apache/fop/datatypes/FODimension.java index 32e4538e9..8c50cf52a 100644 --- a/src/java/org/apache/fop/datatypes/FODimension.java +++ b/src/java/org/apache/fop/datatypes/FODimension.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/KeepValue.java b/src/java/org/apache/fop/datatypes/KeepValue.java index 4ff42cca3..312df9a04 100644 --- a/src/java/org/apache/fop/datatypes/KeepValue.java +++ b/src/java/org/apache/fop/datatypes/KeepValue.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/Length.java b/src/java/org/apache/fop/datatypes/Length.java index 08ef93e93..a8b6435b1 100644 --- a/src/java/org/apache/fop/datatypes/Length.java +++ b/src/java/org/apache/fop/datatypes/Length.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/LengthBase.java b/src/java/org/apache/fop/datatypes/LengthBase.java index 30a93e515..7270344fe 100644 --- a/src/java/org/apache/fop/datatypes/LengthBase.java +++ b/src/java/org/apache/fop/datatypes/LengthBase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/Numeric.java b/src/java/org/apache/fop/datatypes/Numeric.java index 92bc3d107..495a65ce0 100644 --- a/src/java/org/apache/fop/datatypes/Numeric.java +++ b/src/java/org/apache/fop/datatypes/Numeric.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/PercentBase.java b/src/java/org/apache/fop/datatypes/PercentBase.java index 40814f0de..6452086de 100644 --- a/src/java/org/apache/fop/datatypes/PercentBase.java +++ b/src/java/org/apache/fop/datatypes/PercentBase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/PercentBaseContext.java b/src/java/org/apache/fop/datatypes/PercentBaseContext.java index 6ba943ea3..bf01482f0 100644 --- a/src/java/org/apache/fop/datatypes/PercentBaseContext.java +++ b/src/java/org/apache/fop/datatypes/PercentBaseContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java b/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java index 4a3f26227..e755f45ea 100644 --- a/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java +++ b/src/java/org/apache/fop/datatypes/SimplePercentBaseContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/URISpecification.java b/src/java/org/apache/fop/datatypes/URISpecification.java index d05162ab2..c6f8c078c 100644 --- a/src/java/org/apache/fop/datatypes/URISpecification.java +++ b/src/java/org/apache/fop/datatypes/URISpecification.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java b/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java index 6d3e8fa36..76c31b4af 100644 --- a/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java +++ b/src/java/org/apache/fop/datatypes/ValidationPercentBaseContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -14,7 +15,7 @@ * limitations under the License. */ -/* $Id: SimplePercentBaseContext.java 279656 2005-09-08 22:06:48Z pietsch $ */ +/* $Id$ */ package org.apache.fop.datatypes; diff --git a/src/java/org/apache/fop/fo/CharIterator.java b/src/java/org/apache/fop/fo/CharIterator.java index 69dce0602..fae2743f3 100644 --- a/src/java/org/apache/fop/fo/CharIterator.java +++ b/src/java/org/apache/fop/fo/CharIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/Constants.java b/src/java/org/apache/fop/fo/Constants.java index b28a350fc..0e91b4efd 100644 --- a/src/java/org/apache/fop/fo/Constants.java +++ b/src/java/org/apache/fop/fo/Constants.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/ElementMapping.java b/src/java/org/apache/fop/fo/ElementMapping.java index 1142891b0..06ed58201 100644 --- a/src/java/org/apache/fop/fo/ElementMapping.java +++ b/src/java/org/apache/fop/fo/ElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/ElementMappingRegistry.java b/src/java/org/apache/fop/fo/ElementMappingRegistry.java index b91b489f9..5cfa50ccb 100644 --- a/src/java/org/apache/fop/fo/ElementMappingRegistry.java +++ b/src/java/org/apache/fop/fo/ElementMappingRegistry.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FOElementMapping.java b/src/java/org/apache/fop/fo/FOElementMapping.java index 609cfcc34..015ff6f69 100644 --- a/src/java/org/apache/fop/fo/FOElementMapping.java +++ b/src/java/org/apache/fop/fo/FOElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FOEventHandler.java b/src/java/org/apache/fop/fo/FOEventHandler.java index c8b11afd3..69cb7d06b 100644 --- a/src/java/org/apache/fop/fo/FOEventHandler.java +++ b/src/java/org/apache/fop/fo/FOEventHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FONode.java b/src/java/org/apache/fop/fo/FONode.java index 7663cb49b..2fa53902e 100644 --- a/src/java/org/apache/fop/fo/FONode.java +++ b/src/java/org/apache/fop/fo/FONode.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FOPropertyMapping.java b/src/java/org/apache/fop/fo/FOPropertyMapping.java index 34c2591b5..7c1bbc773 100644 --- a/src/java/org/apache/fop/fo/FOPropertyMapping.java +++ b/src/java/org/apache/fop/fo/FOPropertyMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FOText.java b/src/java/org/apache/fop/fo/FOText.java index c3c059a8e..8b578b146 100644 --- a/src/java/org/apache/fop/fo/FOText.java +++ b/src/java/org/apache/fop/fo/FOText.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FOTreeBuilder.java b/src/java/org/apache/fop/fo/FOTreeBuilder.java index f64bae87a..0f2874b4b 100644 --- a/src/java/org/apache/fop/fo/FOTreeBuilder.java +++ b/src/java/org/apache/fop/fo/FOTreeBuilder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FObj.java b/src/java/org/apache/fop/fo/FObj.java index 44da27900..29278b1b8 100644 --- a/src/java/org/apache/fop/fo/FObj.java +++ b/src/java/org/apache/fop/fo/FObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/FObjMixed.java b/src/java/org/apache/fop/fo/FObjMixed.java index d26dc6653..7efcbf59f 100644 --- a/src/java/org/apache/fop/fo/FObjMixed.java +++ b/src/java/org/apache/fop/fo/FObjMixed.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/InlineCharIterator.java b/src/java/org/apache/fop/fo/InlineCharIterator.java index 267b251d4..8a375097e 100644 --- a/src/java/org/apache/fop/fo/InlineCharIterator.java +++ b/src/java/org/apache/fop/fo/InlineCharIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/NullCharIterator.java b/src/java/org/apache/fop/fo/NullCharIterator.java index 01c054c45..494d167fd 100644 --- a/src/java/org/apache/fop/fo/NullCharIterator.java +++ b/src/java/org/apache/fop/fo/NullCharIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/OneCharIterator.java b/src/java/org/apache/fop/fo/OneCharIterator.java index c0e4bd16f..1d96320c1 100644 --- a/src/java/org/apache/fop/fo/OneCharIterator.java +++ b/src/java/org/apache/fop/fo/OneCharIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/PropertyList.java b/src/java/org/apache/fop/fo/PropertyList.java index 1f148d5fc..6fdd1bf21 100644 --- a/src/java/org/apache/fop/fo/PropertyList.java +++ b/src/java/org/apache/fop/fo/PropertyList.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/PropertyListMaker.java b/src/java/org/apache/fop/fo/PropertyListMaker.java index 2782dd787..018b0ea7d 100755 --- a/src/java/org/apache/fop/fo/PropertyListMaker.java +++ b/src/java/org/apache/fop/fo/PropertyListMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/PropertySets.java b/src/java/org/apache/fop/fo/PropertySets.java index c0dbe4a19..29455add1 100644 --- a/src/java/org/apache/fop/fo/PropertySets.java +++ b/src/java/org/apache/fop/fo/PropertySets.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/RecursiveCharIterator.java b/src/java/org/apache/fop/fo/RecursiveCharIterator.java index e317f9805..4af014f12 100644 --- a/src/java/org/apache/fop/fo/RecursiveCharIterator.java +++ b/src/java/org/apache/fop/fo/RecursiveCharIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/StaticPropertyList.java b/src/java/org/apache/fop/fo/StaticPropertyList.java index a8455ee9e..f4b8f7ad6 100755 --- a/src/java/org/apache/fop/fo/StaticPropertyList.java +++ b/src/java/org/apache/fop/fo/StaticPropertyList.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/UnknownXMLObj.java b/src/java/org/apache/fop/fo/UnknownXMLObj.java index 49e104a96..406e869fc 100644 --- a/src/java/org/apache/fop/fo/UnknownXMLObj.java +++ b/src/java/org/apache/fop/fo/UnknownXMLObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/ValidationException.java b/src/java/org/apache/fop/fo/ValidationException.java index 19e176beb..645d3db4d 100755 --- a/src/java/org/apache/fop/fo/ValidationException.java +++ b/src/java/org/apache/fop/fo/ValidationException.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/XMLObj.java b/src/java/org/apache/fop/fo/XMLObj.java index 87cb004c3..5ce81e7b5 100644 --- a/src/java/org/apache/fop/fo/XMLObj.java +++ b/src/java/org/apache/fop/fo/XMLObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java index 593f9a3c3..9055057a9 100644 --- a/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java +++ b/src/java/org/apache/fop/fo/XMLWhiteSpaceHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/AbsFunction.java b/src/java/org/apache/fop/fo/expr/AbsFunction.java index d9ae642b0..64936459f 100644 --- a/src/java/org/apache/fop/fo/expr/AbsFunction.java +++ b/src/java/org/apache/fop/fo/expr/AbsFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java index d064ee998..a1c0259fa 100644 --- a/src/java/org/apache/fop/fo/expr/BodyStartFunction.java +++ b/src/java/org/apache/fop/fo/expr/BodyStartFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/CeilingFunction.java b/src/java/org/apache/fop/fo/expr/CeilingFunction.java index f33bdd2c7..9330fbdb3 100644 --- a/src/java/org/apache/fop/fo/expr/CeilingFunction.java +++ b/src/java/org/apache/fop/fo/expr/CeilingFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/FloorFunction.java b/src/java/org/apache/fop/fo/expr/FloorFunction.java index 4105224a7..e7d253d69 100644 --- a/src/java/org/apache/fop/fo/expr/FloorFunction.java +++ b/src/java/org/apache/fop/fo/expr/FloorFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/FopPropValFunction.java b/src/java/org/apache/fop/fo/expr/FopPropValFunction.java index 1cc9af329..47f5afd92 100644 --- a/src/java/org/apache/fop/fo/expr/FopPropValFunction.java +++ b/src/java/org/apache/fop/fo/expr/FopPropValFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/FromParentFunction.java b/src/java/org/apache/fop/fo/expr/FromParentFunction.java index 800c1904a..b5a82de56 100644 --- a/src/java/org/apache/fop/fo/expr/FromParentFunction.java +++ b/src/java/org/apache/fop/fo/expr/FromParentFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java b/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java index 61ef82d8b..731b403f1 100644 --- a/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java +++ b/src/java/org/apache/fop/fo/expr/FromTableColumnFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/Function.java b/src/java/org/apache/fop/fo/expr/Function.java index f6188740b..a06627f6c 100644 --- a/src/java/org/apache/fop/fo/expr/Function.java +++ b/src/java/org/apache/fop/fo/expr/Function.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/FunctionBase.java b/src/java/org/apache/fop/fo/expr/FunctionBase.java index fa6491ca0..24d2fef49 100644 --- a/src/java/org/apache/fop/fo/expr/FunctionBase.java +++ b/src/java/org/apache/fop/fo/expr/FunctionBase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java b/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java index 505c075a5..3e5cadf04 100644 --- a/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java +++ b/src/java/org/apache/fop/fo/expr/InheritedPropFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java index 4682272b5..39e5fafa2 100644 --- a/src/java/org/apache/fop/fo/expr/LabelEndFunction.java +++ b/src/java/org/apache/fop/fo/expr/LabelEndFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/MaxFunction.java b/src/java/org/apache/fop/fo/expr/MaxFunction.java index 9745a1f51..26e1a8f4c 100644 --- a/src/java/org/apache/fop/fo/expr/MaxFunction.java +++ b/src/java/org/apache/fop/fo/expr/MaxFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/MinFunction.java b/src/java/org/apache/fop/fo/expr/MinFunction.java index c36f5b194..5e5fc7bee 100644 --- a/src/java/org/apache/fop/fo/expr/MinFunction.java +++ b/src/java/org/apache/fop/fo/expr/MinFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/NCnameProperty.java b/src/java/org/apache/fop/fo/expr/NCnameProperty.java index 97de7fc05..7188fb953 100644 --- a/src/java/org/apache/fop/fo/expr/NCnameProperty.java +++ b/src/java/org/apache/fop/fo/expr/NCnameProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java b/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java index 28a2467ef..2aab5eee9 100644 --- a/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java +++ b/src/java/org/apache/fop/fo/expr/NearestSpecPropFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/NumericOp.java b/src/java/org/apache/fop/fo/expr/NumericOp.java index 3edc41196..af77bb44c 100755 --- a/src/java/org/apache/fop/fo/expr/NumericOp.java +++ b/src/java/org/apache/fop/fo/expr/NumericOp.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/NumericProperty.java b/src/java/org/apache/fop/fo/expr/NumericProperty.java index 942d09eb5..f00b9951c 100644 --- a/src/java/org/apache/fop/fo/expr/NumericProperty.java +++ b/src/java/org/apache/fop/fo/expr/NumericProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java b/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java index ccdbf9829..ba9ae2ddf 100644 --- a/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java +++ b/src/java/org/apache/fop/fo/expr/PPColWidthFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/PropertyException.java b/src/java/org/apache/fop/fo/expr/PropertyException.java index 696412c88..3e4b5f9d1 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyException.java +++ b/src/java/org/apache/fop/fo/expr/PropertyException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/PropertyInfo.java b/src/java/org/apache/fop/fo/expr/PropertyInfo.java index 9cd5e714e..08b95628c 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyInfo.java +++ b/src/java/org/apache/fop/fo/expr/PropertyInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/PropertyParser.java b/src/java/org/apache/fop/fo/expr/PropertyParser.java index 2c841b155..77b35a845 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyParser.java +++ b/src/java/org/apache/fop/fo/expr/PropertyParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java b/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java index 95f8923d7..5fe5f4445 100644 --- a/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java +++ b/src/java/org/apache/fop/fo/expr/PropertyTokenizer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/RGBColorFunction.java b/src/java/org/apache/fop/fo/expr/RGBColorFunction.java index f3aae9208..d74d1b7f4 100644 --- a/src/java/org/apache/fop/fo/expr/RGBColorFunction.java +++ b/src/java/org/apache/fop/fo/expr/RGBColorFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java b/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java index 07a2e2440..5c52ebe17 100755 --- a/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java +++ b/src/java/org/apache/fop/fo/expr/RelativeNumericProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/RoundFunction.java b/src/java/org/apache/fop/fo/expr/RoundFunction.java index 06f3effd2..f68f15e16 100644 --- a/src/java/org/apache/fop/fo/expr/RoundFunction.java +++ b/src/java/org/apache/fop/fo/expr/RoundFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/SystemColorFunction.java b/src/java/org/apache/fop/fo/expr/SystemColorFunction.java index 871f7d7e1..678a56ef8 100644 --- a/src/java/org/apache/fop/fo/expr/SystemColorFunction.java +++ b/src/java/org/apache/fop/fo/expr/SystemColorFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/expr/package.html b/src/java/org/apache/fop/fo/expr/package.html index 8f980490b..0ccd91ee5 100644 --- a/src/java/org/apache/fop/fo/expr/package.html +++ b/src/java/org/apache/fop/fo/expr/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java b/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java index 2a611f74e..ed4f69041 100644 --- a/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionAttachment.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java b/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java index 5f823d2a3..0fafb0ca0 100644 --- a/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java index 37aad8bcb..9123a8bb7 100644 --- a/src/java/org/apache/fop/fo/extensions/ExtensionObj.java +++ b/src/java/org/apache/fop/fo/extensions/ExtensionObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java b/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java index 86611b3fc..fb1810db1 100644 --- a/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/OldExtensionElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/package.html b/src/java/org/apache/fop/fo/extensions/package.html index c88531e8a..237037308 100644 --- a/src/java/org/apache/fop/fo/extensions/package.html +++ b/src/java/org/apache/fop/fo/extensions/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java b/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java index 0fce5b8dd..49394ea3c 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/svg/BatikExtensionElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java index 47cc66340..a6958acdb 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java +++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java index 78fab53f8..a9b07bc0d 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/svg/SVGElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java b/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java index c1b3272d1..60ba9d276 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java +++ b/src/java/org/apache/fop/fo/extensions/svg/SVGObj.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/svg/package.html b/src/java/org/apache/fop/fo/extensions/svg/package.html index 7d513cea1..5b57f7db4 100644 --- a/src/java/org/apache/fop/fo/extensions/svg/package.html +++ b/src/java/org/apache/fop/fo/extensions/svg/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java b/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java index 93a7cf9f5..ca6019aae 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/AbstractMetadataElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java b/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java index 46986b8a3..51ec81dc8 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/RDFElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java b/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java index 83d5383bb..7f4df95a3 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/RDFElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java b/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java index dd76e77b5..970cc62a2 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/XMPContentHandlerFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java b/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java index af3f9a34f..62e940c18 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/XMPElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java b/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java index 1fe9ca055..3398fbda5 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/XMPMetaElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java b/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java index 40fe5fa48..c761a08ed 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java +++ b/src/java/org/apache/fop/fo/extensions/xmp/XMPMetadata.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/extensions/xmp/package.html b/src/java/org/apache/fop/fo/extensions/xmp/package.html index 11f25ab55..d644bffcb 100644 --- a/src/java/org/apache/fop/fo/extensions/xmp/package.html +++ b/src/java/org/apache/fop/fo/extensions/xmp/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/flow/AbstractGraphics.java b/src/java/org/apache/fop/fo/flow/AbstractGraphics.java index 540f2e616..d35b9692a 100644 --- a/src/java/org/apache/fop/fo/flow/AbstractGraphics.java +++ b/src/java/org/apache/fop/fo/flow/AbstractGraphics.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java b/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java index f6f7d0b37..7ef26adbd 100644 --- a/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java +++ b/src/java/org/apache/fop/fo/flow/AbstractListItemPart.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/BasicLink.java b/src/java/org/apache/fop/fo/flow/BasicLink.java index 3fd8e0398..0b8bc4f5b 100644 --- a/src/java/org/apache/fop/fo/flow/BasicLink.java +++ b/src/java/org/apache/fop/fo/flow/BasicLink.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/BidiOverride.java b/src/java/org/apache/fop/fo/flow/BidiOverride.java index 4f4871ebe..8546459fb 100644 --- a/src/java/org/apache/fop/fo/flow/BidiOverride.java +++ b/src/java/org/apache/fop/fo/flow/BidiOverride.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Block.java b/src/java/org/apache/fop/fo/flow/Block.java index f4e600c81..6e9e5d662 100644 --- a/src/java/org/apache/fop/fo/flow/Block.java +++ b/src/java/org/apache/fop/fo/flow/Block.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/BlockContainer.java b/src/java/org/apache/fop/fo/flow/BlockContainer.java index 78357087e..0bcee2b32 100644 --- a/src/java/org/apache/fop/fo/flow/BlockContainer.java +++ b/src/java/org/apache/fop/fo/flow/BlockContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java index 0baf54262..5afe52eb4 100644 --- a/src/java/org/apache/fop/fo/flow/Character.java +++ b/src/java/org/apache/fop/fo/flow/Character.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java index a84256b46..5925613ba 100644 --- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java +++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Float.java b/src/java/org/apache/fop/fo/flow/Float.java index 86dadb287..3e720cb47 100644 --- a/src/java/org/apache/fop/fo/flow/Float.java +++ b/src/java/org/apache/fop/fo/flow/Float.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Footnote.java b/src/java/org/apache/fop/fo/flow/Footnote.java index fdaafe815..73cfe19bc 100644 --- a/src/java/org/apache/fop/fo/flow/Footnote.java +++ b/src/java/org/apache/fop/fo/flow/Footnote.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/FootnoteBody.java b/src/java/org/apache/fop/fo/flow/FootnoteBody.java index 72ca32754..4e7ddbad1 100644 --- a/src/java/org/apache/fop/fo/flow/FootnoteBody.java +++ b/src/java/org/apache/fop/fo/flow/FootnoteBody.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java index 71360df51..e68c11857 100644 --- a/src/java/org/apache/fop/fo/flow/InitialPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/InitialPropertySet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Inline.java b/src/java/org/apache/fop/fo/flow/Inline.java index 40959f07e..27506ba30 100644 --- a/src/java/org/apache/fop/fo/flow/Inline.java +++ b/src/java/org/apache/fop/fo/flow/Inline.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/InlineContainer.java b/src/java/org/apache/fop/fo/flow/InlineContainer.java index 11e561b78..5551861c8 100644 --- a/src/java/org/apache/fop/fo/flow/InlineContainer.java +++ b/src/java/org/apache/fop/fo/flow/InlineContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/InlineLevel.java b/src/java/org/apache/fop/fo/flow/InlineLevel.java index d73b023df..06e7c775a 100644 --- a/src/java/org/apache/fop/fo/flow/InlineLevel.java +++ b/src/java/org/apache/fop/fo/flow/InlineLevel.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java index 8df738014..c79b29090 100644 --- a/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java +++ b/src/java/org/apache/fop/fo/flow/InstreamForeignObject.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java index 02498e3f9..cad2c2376 100644 --- a/src/java/org/apache/fop/fo/flow/Leader.java +++ b/src/java/org/apache/fop/fo/flow/Leader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/ListBlock.java b/src/java/org/apache/fop/fo/flow/ListBlock.java index d11143fc8..2051451c5 100644 --- a/src/java/org/apache/fop/fo/flow/ListBlock.java +++ b/src/java/org/apache/fop/fo/flow/ListBlock.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/ListItem.java b/src/java/org/apache/fop/fo/flow/ListItem.java index 8db824669..3d9e9c624 100644 --- a/src/java/org/apache/fop/fo/flow/ListItem.java +++ b/src/java/org/apache/fop/fo/flow/ListItem.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/ListItemBody.java b/src/java/org/apache/fop/fo/flow/ListItemBody.java index 5e5697960..2c7b9afc1 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemBody.java +++ b/src/java/org/apache/fop/fo/flow/ListItemBody.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/ListItemLabel.java b/src/java/org/apache/fop/fo/flow/ListItemLabel.java index 67bba7662..8b9214abf 100644 --- a/src/java/org/apache/fop/fo/flow/ListItemLabel.java +++ b/src/java/org/apache/fop/fo/flow/ListItemLabel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Marker.java b/src/java/org/apache/fop/fo/flow/Marker.java index 489148a19..d848e281d 100644 --- a/src/java/org/apache/fop/fo/flow/Marker.java +++ b/src/java/org/apache/fop/fo/flow/Marker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/MultiCase.java b/src/java/org/apache/fop/fo/flow/MultiCase.java index 762901df3..63ab48aeb 100644 --- a/src/java/org/apache/fop/fo/flow/MultiCase.java +++ b/src/java/org/apache/fop/fo/flow/MultiCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/MultiProperties.java b/src/java/org/apache/fop/fo/flow/MultiProperties.java index a550eff0c..4a589b898 100644 --- a/src/java/org/apache/fop/fo/flow/MultiProperties.java +++ b/src/java/org/apache/fop/fo/flow/MultiProperties.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java index af634d81e..a647af6b1 100644 --- a/src/java/org/apache/fop/fo/flow/MultiPropertySet.java +++ b/src/java/org/apache/fop/fo/flow/MultiPropertySet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/MultiSwitch.java b/src/java/org/apache/fop/fo/flow/MultiSwitch.java index c9b6a7798..409fe71d9 100644 --- a/src/java/org/apache/fop/fo/flow/MultiSwitch.java +++ b/src/java/org/apache/fop/fo/flow/MultiSwitch.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/MultiToggle.java b/src/java/org/apache/fop/fo/flow/MultiToggle.java index 118f45757..0ac1d8af6 100644 --- a/src/java/org/apache/fop/fo/flow/MultiToggle.java +++ b/src/java/org/apache/fop/fo/flow/MultiToggle.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/PageNumber.java b/src/java/org/apache/fop/fo/flow/PageNumber.java index c26f14f95..06f621be5 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumber.java +++ b/src/java/org/apache/fop/fo/flow/PageNumber.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java index da17509c3..9c63b4c1b 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitation.java +++ b/src/java/org/apache/fop/fo/flow/PageNumberCitation.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java b/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java index 89817e4ef..7bce6cd14 100644 --- a/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java +++ b/src/java/org/apache/fop/fo/flow/PageNumberCitationLast.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java index 7aec11771..bbdaa24a7 100644 --- a/src/java/org/apache/fop/fo/flow/RetrieveMarker.java +++ b/src/java/org/apache/fop/fo/flow/RetrieveMarker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Table.java b/src/java/org/apache/fop/fo/flow/Table.java index 164b0f796..954c3ba0b 100644 --- a/src/java/org/apache/fop/fo/flow/Table.java +++ b/src/java/org/apache/fop/fo/flow/Table.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableAndCaption.java b/src/java/org/apache/fop/fo/flow/TableAndCaption.java index 21d7970d4..dbcadd792 100644 --- a/src/java/org/apache/fop/fo/flow/TableAndCaption.java +++ b/src/java/org/apache/fop/fo/flow/TableAndCaption.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableBody.java b/src/java/org/apache/fop/fo/flow/TableBody.java index d0b706e33..655279ee8 100644 --- a/src/java/org/apache/fop/fo/flow/TableBody.java +++ b/src/java/org/apache/fop/fo/flow/TableBody.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableCaption.java b/src/java/org/apache/fop/fo/flow/TableCaption.java index 12df3ff32..6df6d2e9b 100644 --- a/src/java/org/apache/fop/fo/flow/TableCaption.java +++ b/src/java/org/apache/fop/fo/flow/TableCaption.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableCell.java b/src/java/org/apache/fop/fo/flow/TableCell.java index 8f9282a5d..15cbac391 100644 --- a/src/java/org/apache/fop/fo/flow/TableCell.java +++ b/src/java/org/apache/fop/fo/flow/TableCell.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableColumn.java b/src/java/org/apache/fop/fo/flow/TableColumn.java index d66bff061..9fbce1849 100644 --- a/src/java/org/apache/fop/fo/flow/TableColumn.java +++ b/src/java/org/apache/fop/fo/flow/TableColumn.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableFObj.java b/src/java/org/apache/fop/fo/flow/TableFObj.java index fb2c72e1b..1497f2c6e 100644 --- a/src/java/org/apache/fop/fo/flow/TableFObj.java +++ b/src/java/org/apache/fop/fo/flow/TableFObj.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableFooter.java b/src/java/org/apache/fop/fo/flow/TableFooter.java index d14aae9c2..e698b1d55 100644 --- a/src/java/org/apache/fop/fo/flow/TableFooter.java +++ b/src/java/org/apache/fop/fo/flow/TableFooter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableHeader.java b/src/java/org/apache/fop/fo/flow/TableHeader.java index d9c90197c..ac6e96871 100644 --- a/src/java/org/apache/fop/fo/flow/TableHeader.java +++ b/src/java/org/apache/fop/fo/flow/TableHeader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/TableRow.java b/src/java/org/apache/fop/fo/flow/TableRow.java index 0827cf779..f93720545 100644 --- a/src/java/org/apache/fop/fo/flow/TableRow.java +++ b/src/java/org/apache/fop/fo/flow/TableRow.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/Wrapper.java b/src/java/org/apache/fop/fo/flow/Wrapper.java index 93d8868de..61ec2c857 100644 --- a/src/java/org/apache/fop/fo/flow/Wrapper.java +++ b/src/java/org/apache/fop/fo/flow/Wrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/flow/package.html b/src/java/org/apache/fop/fo/flow/package.html index 8c8e3a612..0eb08f4d6 100644 --- a/src/java/org/apache/fop/fo/flow/package.html +++ b/src/java/org/apache/fop/fo/flow/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/package.html b/src/java/org/apache/fop/fo/package.html index e4d15b1d7..86e102030 100644 --- a/src/java/org/apache/fop/fo/package.html +++ b/src/java/org/apache/fop/fo/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/pagination/ColorProfile.java b/src/java/org/apache/fop/fo/pagination/ColorProfile.java index 8ce99a009..ff77b9eac 100644 --- a/src/java/org/apache/fop/fo/pagination/ColorProfile.java +++ b/src/java/org/apache/fop/fo/pagination/ColorProfile.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java index 1ac786751..4076140aa 100644 --- a/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/ConditionalPageMasterReference.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/Declarations.java b/src/java/org/apache/fop/fo/pagination/Declarations.java index f316f6c48..a3a96361a 100644 --- a/src/java/org/apache/fop/fo/pagination/Declarations.java +++ b/src/java/org/apache/fop/fo/pagination/Declarations.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/Flow.java b/src/java/org/apache/fop/fo/pagination/Flow.java index 599f30b6c..0962df5d7 100644 --- a/src/java/org/apache/fop/fo/pagination/Flow.java +++ b/src/java/org/apache/fop/fo/pagination/Flow.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java index a98f3a0ff..69f621c65 100644 --- a/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java +++ b/src/java/org/apache/fop/fo/pagination/LayoutMasterSet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java b/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java index 6a283c3b8..4289076ea 100644 --- a/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java +++ b/src/java/org/apache/fop/fo/pagination/PageNumberGenerator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/PageSequence.java b/src/java/org/apache/fop/fo/pagination/PageSequence.java index b79f194d1..56796f0da 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequence.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequence.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java index a55e6920c..56b156012 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequenceMaster.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java b/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java index 61b8d0416..3f7cb66d1 100644 --- a/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java +++ b/src/java/org/apache/fop/fo/pagination/PageSequenceWrapper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/Region.java b/src/java/org/apache/fop/fo/pagination/Region.java index 65412a6d5..642a2e490 100644 --- a/src/java/org/apache/fop/fo/pagination/Region.java +++ b/src/java/org/apache/fop/fo/pagination/Region.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionAfter.java b/src/java/org/apache/fop/fo/pagination/RegionAfter.java index e7ed20f09..455f994ed 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionAfter.java +++ b/src/java/org/apache/fop/fo/pagination/RegionAfter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionBA.java b/src/java/org/apache/fop/fo/pagination/RegionBA.java index f732c721f..fff3fb26f 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBA.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBA.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionBefore.java b/src/java/org/apache/fop/fo/pagination/RegionBefore.java index d6abea44f..adb85681b 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBefore.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBefore.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionBody.java b/src/java/org/apache/fop/fo/pagination/RegionBody.java index 7c5cb7d0c..d6fbb8d96 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionBody.java +++ b/src/java/org/apache/fop/fo/pagination/RegionBody.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionEnd.java b/src/java/org/apache/fop/fo/pagination/RegionEnd.java index 41297a786..5420b756b 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionEnd.java +++ b/src/java/org/apache/fop/fo/pagination/RegionEnd.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionSE.java b/src/java/org/apache/fop/fo/pagination/RegionSE.java index 4ab2ebd05..ac56d6e10 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionSE.java +++ b/src/java/org/apache/fop/fo/pagination/RegionSE.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RegionStart.java b/src/java/org/apache/fop/fo/pagination/RegionStart.java index f8f44c982..f702c3b78 100644 --- a/src/java/org/apache/fop/fo/pagination/RegionStart.java +++ b/src/java/org/apache/fop/fo/pagination/RegionStart.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java index 5a08c2873..9b2c8b2ef 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java +++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterAlternatives.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java index 811b30d54..a09b129a3 100644 --- a/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/RepeatablePageMasterReference.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/Root.java b/src/java/org/apache/fop/fo/pagination/Root.java index 6f301fbaa..47ee3096a 100644 --- a/src/java/org/apache/fop/fo/pagination/Root.java +++ b/src/java/org/apache/fop/fo/pagination/Root.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/SideRegion.java b/src/java/org/apache/fop/fo/pagination/SideRegion.java index 1475bc342..41786c83d 100644 --- a/src/java/org/apache/fop/fo/pagination/SideRegion.java +++ b/src/java/org/apache/fop/fo/pagination/SideRegion.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java index 5db4915ff..e26d27d63 100644 --- a/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java +++ b/src/java/org/apache/fop/fo/pagination/SimplePageMaster.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java index cea4a20d7..623b50de7 100644 --- a/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java +++ b/src/java/org/apache/fop/fo/pagination/SinglePageMasterReference.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/StaticContent.java b/src/java/org/apache/fop/fo/pagination/StaticContent.java index 3c9841725..43f6806ca 100644 --- a/src/java/org/apache/fop/fo/pagination/StaticContent.java +++ b/src/java/org/apache/fop/fo/pagination/StaticContent.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java b/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java index 2d0138f32..af045624e 100644 --- a/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java +++ b/src/java/org/apache/fop/fo/pagination/SubSequenceSpecifier.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/Title.java b/src/java/org/apache/fop/fo/pagination/Title.java index 01174151a..92c6e8f24 100644 --- a/src/java/org/apache/fop/fo/pagination/Title.java +++ b/src/java/org/apache/fop/fo/pagination/Title.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java b/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java index bf847acff..9786a3db9 100644 --- a/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java +++ b/src/java/org/apache/fop/fo/pagination/bookmarks/Bookmark.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java index fd702a7b4..b7c5fc8c5 100644 --- a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java +++ b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTitle.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java index 033c8171a..1b743d763 100644 --- a/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java +++ b/src/java/org/apache/fop/fo/pagination/bookmarks/BookmarkTree.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/pagination/bookmarks/package.html b/src/java/org/apache/fop/fo/pagination/bookmarks/package.html index a5567dc7e..0370f97b8 100644 --- a/src/java/org/apache/fop/fo/pagination/bookmarks/package.html +++ b/src/java/org/apache/fop/fo/pagination/bookmarks/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/pagination/package.html b/src/java/org/apache/fop/fo/pagination/package.html index c0f62a450..fe3734859 100644 --- a/src/java/org/apache/fop/fo/pagination/package.html +++ b/src/java/org/apache/fop/fo/pagination/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java b/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java index ee42e845a..cc1c98323 100644 --- a/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/BackgroundPositionShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java b/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java index 360fb1aae..37cb2119c 100644 --- a/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/BorderSpacingShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java b/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java index 2dad68853..819cae5d0 100644 --- a/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/BorderWidthPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java b/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java index 9d7963635..f568e5123 100644 --- a/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/BoxPropShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CharacterProperty.java b/src/java/org/apache/fop/fo/properties/CharacterProperty.java index bf2e9db00..79b0ebc07 100644 --- a/src/java/org/apache/fop/fo/properties/CharacterProperty.java +++ b/src/java/org/apache/fop/fo/properties/CharacterProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/ColorProperty.java b/src/java/org/apache/fop/fo/properties/ColorProperty.java index 4b76d5afe..bc42ff451 100644 --- a/src/java/org/apache/fop/fo/properties/ColorProperty.java +++ b/src/java/org/apache/fop/fo/properties/ColorProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java b/src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java index 21af6657a..e1f6928cc 100644 --- a/src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/ColumnNumberPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java b/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java index 9320d6d87..36e7377f4 100644 --- a/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java +++ b/src/java/org/apache/fop/fo/properties/CommonAbsolutePosition.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonAccessibility.java b/src/java/org/apache/fop/fo/properties/CommonAccessibility.java index 7bf382070..15ffbffc1 100644 --- a/src/java/org/apache/fop/fo/properties/CommonAccessibility.java +++ b/src/java/org/apache/fop/fo/properties/CommonAccessibility.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonAural.java b/src/java/org/apache/fop/fo/properties/CommonAural.java index 54a5024a6..f5e20584a 100644 --- a/src/java/org/apache/fop/fo/properties/CommonAural.java +++ b/src/java/org/apache/fop/fo/properties/CommonAural.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java index 7cf8dc6f1..5d7d36b4b 100755 --- a/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java +++ b/src/java/org/apache/fop/fo/properties/CommonBorderPaddingBackground.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonFont.java b/src/java/org/apache/fop/fo/properties/CommonFont.java index d9bcdf5b5..11c53ad30 100755 --- a/src/java/org/apache/fop/fo/properties/CommonFont.java +++ b/src/java/org/apache/fop/fo/properties/CommonFont.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonHyphenation.java b/src/java/org/apache/fop/fo/properties/CommonHyphenation.java index a621494e4..e10fdad8e 100644 --- a/src/java/org/apache/fop/fo/properties/CommonHyphenation.java +++ b/src/java/org/apache/fop/fo/properties/CommonHyphenation.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java b/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java index d049d275a..93d0868e0 100644 --- a/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java +++ b/src/java/org/apache/fop/fo/properties/CommonMarginBlock.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonMarginInline.java b/src/java/org/apache/fop/fo/properties/CommonMarginInline.java index 4a5353f33..eb892d0a4 100644 --- a/src/java/org/apache/fop/fo/properties/CommonMarginInline.java +++ b/src/java/org/apache/fop/fo/properties/CommonMarginInline.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java b/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java index e8178ada8..504fb6362 100644 --- a/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java +++ b/src/java/org/apache/fop/fo/properties/CommonRelativePosition.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java index 984b854a0..37aa474f0 100644 --- a/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java +++ b/src/java/org/apache/fop/fo/properties/CommonTextDecoration.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java b/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java index 5fe37209b..39b2289a9 100644 --- a/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/CompoundPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java index 34bfa579c..638f525b1 100644 --- a/src/java/org/apache/fop/fo/properties/CondLengthProperty.java +++ b/src/java/org/apache/fop/fo/properties/CondLengthProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java b/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java index 8603cc2ec..6f76a1cc7 100644 --- a/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/CorrespondingPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java b/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java index c5ff73b55..6bd30929a 100644 --- a/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/DimensionPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/EnumLength.java b/src/java/org/apache/fop/fo/properties/EnumLength.java index 910335613..efa1475ab 100755 --- a/src/java/org/apache/fop/fo/properties/EnumLength.java +++ b/src/java/org/apache/fop/fo/properties/EnumLength.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/EnumNumber.java b/src/java/org/apache/fop/fo/properties/EnumNumber.java index 0a9c2bac4..032aaeb60 100755 --- a/src/java/org/apache/fop/fo/properties/EnumNumber.java +++ b/src/java/org/apache/fop/fo/properties/EnumNumber.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/EnumProperty.java b/src/java/org/apache/fop/fo/properties/EnumProperty.java index 658e52c07..9919e6df8 100644 --- a/src/java/org/apache/fop/fo/properties/EnumProperty.java +++ b/src/java/org/apache/fop/fo/properties/EnumProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/FixedLength.java b/src/java/org/apache/fop/fo/properties/FixedLength.java index 733218d67..a043d803e 100644 --- a/src/java/org/apache/fop/fo/properties/FixedLength.java +++ b/src/java/org/apache/fop/fo/properties/FixedLength.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java b/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java index d699ccf09..48082e1d8 100644 --- a/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java +++ b/src/java/org/apache/fop/fo/properties/FontFamilyProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/FontShorthandParser.java b/src/java/org/apache/fop/fo/properties/FontShorthandParser.java index 96b6ead86..1f2994233 100644 --- a/src/java/org/apache/fop/fo/properties/FontShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/FontShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java b/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java index 3d1fa6604..e652d153d 100644 --- a/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java +++ b/src/java/org/apache/fop/fo/properties/FontShorthandProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java b/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java index 5cb36f978..cc39359c9 100644 --- a/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/FontSizePropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java b/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java index 825633206..719ed43e8 100644 --- a/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/FontStretchPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -14,7 +15,7 @@ * limitations under the License. */ -/* $Id: $ */ +/* $Id$ */ package org.apache.fop.fo.properties; import org.apache.fop.fo.Constants; diff --git a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java index c86a9676e..6eb7046cf 100644 --- a/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/GenericShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java index 4e9a990a0..0eb857c31 100644 --- a/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/KeepProperty.java b/src/java/org/apache/fop/fo/properties/KeepProperty.java index 14f0e54a2..fe3566d41 100644 --- a/src/java/org/apache/fop/fo/properties/KeepProperty.java +++ b/src/java/org/apache/fop/fo/properties/KeepProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/LengthPairProperty.java b/src/java/org/apache/fop/fo/properties/LengthPairProperty.java index a982c2adc..b5e8722e9 100644 --- a/src/java/org/apache/fop/fo/properties/LengthPairProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthPairProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/LengthProperty.java b/src/java/org/apache/fop/fo/properties/LengthProperty.java index ce99a13c0..79f9cfba7 100644 --- a/src/java/org/apache/fop/fo/properties/LengthProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java b/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java index b11d4b806..69217a56f 100644 --- a/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java +++ b/src/java/org/apache/fop/fo/properties/LengthRangeProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java index 5c4907bf7..86472b81a 100644 --- a/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/LineHeightPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/ListProperty.java b/src/java/org/apache/fop/fo/properties/ListProperty.java index d400544e6..530ef5723 100644 --- a/src/java/org/apache/fop/fo/properties/ListProperty.java +++ b/src/java/org/apache/fop/fo/properties/ListProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/NumberProperty.java b/src/java/org/apache/fop/fo/properties/NumberProperty.java index 2ba084e75..b2fdcce68 100644 --- a/src/java/org/apache/fop/fo/properties/NumberProperty.java +++ b/src/java/org/apache/fop/fo/properties/NumberProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java b/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java index 6b991525a..8f8f24b9f 100644 --- a/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/PageBreakShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java b/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java index 0c165ca29..8e0ad18ed 100644 --- a/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java +++ b/src/java/org/apache/fop/fo/properties/PageDimensionMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/PercentLength.java b/src/java/org/apache/fop/fo/properties/PercentLength.java index b17785c36..e43ac529c 100644 --- a/src/java/org/apache/fop/fo/properties/PercentLength.java +++ b/src/java/org/apache/fop/fo/properties/PercentLength.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java b/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java index 5b44cb0f4..914af4f1c 100755 --- a/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/PositionShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/Property.java b/src/java/org/apache/fop/fo/properties/Property.java index 41003439d..432a14811 100644 --- a/src/java/org/apache/fop/fo/properties/Property.java +++ b/src/java/org/apache/fop/fo/properties/Property.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/PropertyMaker.java b/src/java/org/apache/fop/fo/properties/PropertyMaker.java index db6b4fb47..900e4b79d 100644 --- a/src/java/org/apache/fop/fo/properties/PropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/PropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java b/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java index e246a033a..87ade2cde 100644 --- a/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java +++ b/src/java/org/apache/fop/fo/properties/ReferenceOrientationMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/ShorthandParser.java b/src/java/org/apache/fop/fo/properties/ShorthandParser.java index 902bfcbe5..bf51c3f66 100644 --- a/src/java/org/apache/fop/fo/properties/ShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/ShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/SpaceProperty.java b/src/java/org/apache/fop/fo/properties/SpaceProperty.java index 3d667c0f0..9ad809cbd 100644 --- a/src/java/org/apache/fop/fo/properties/SpaceProperty.java +++ b/src/java/org/apache/fop/fo/properties/SpaceProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/SpacePropertyMaker.java b/src/java/org/apache/fop/fo/properties/SpacePropertyMaker.java index cca88c72d..c7de88341 100644 --- a/src/java/org/apache/fop/fo/properties/SpacePropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/SpacePropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java b/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java index f4f709a05..ba547b37a 100755 --- a/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java +++ b/src/java/org/apache/fop/fo/properties/SpacingPropertyMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/StringProperty.java b/src/java/org/apache/fop/fo/properties/StringProperty.java index b5e6a4fd9..1b1699c5a 100644 --- a/src/java/org/apache/fop/fo/properties/StringProperty.java +++ b/src/java/org/apache/fop/fo/properties/StringProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java b/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java index 696a2c98e..9c094840e 100644 --- a/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java +++ b/src/java/org/apache/fop/fo/properties/TableBorderPrecedence.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/TableColLength.java b/src/java/org/apache/fop/fo/properties/TableColLength.java index 93edae5f4..d85c89aba 100644 --- a/src/java/org/apache/fop/fo/properties/TableColLength.java +++ b/src/java/org/apache/fop/fo/properties/TableColLength.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java b/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java index 70bd7a57e..516537fb4 100644 --- a/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java +++ b/src/java/org/apache/fop/fo/properties/TextDecorationProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java index 5a6fb4810..20d3d7303 100644 --- a/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java +++ b/src/java/org/apache/fop/fo/properties/ToBeImplementedProperty.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java b/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java index 60b22d753..86330948d 100644 --- a/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/VerticalAlignShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java b/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java index afe88dc5b..2e228e8a6 100644 --- a/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java +++ b/src/java/org/apache/fop/fo/properties/WhiteSpaceShorthandParser.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fo/properties/package.html b/src/java/org/apache/fop/fo/properties/package.html index b0797ac97..9ace84101 100644 --- a/src/java/org/apache/fop/fo/properties/package.html +++ b/src/java/org/apache/fop/fo/properties/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fonts/BFEntry.java b/src/java/org/apache/fop/fonts/BFEntry.java index a367c91c1..f4491b28d 100644 --- a/src/java/org/apache/fop/fonts/BFEntry.java +++ b/src/java/org/apache/fop/fonts/BFEntry.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/CIDFont.java b/src/java/org/apache/fop/fonts/CIDFont.java index 3214e484b..facfb9c88 100644 --- a/src/java/org/apache/fop/fonts/CIDFont.java +++ b/src/java/org/apache/fop/fonts/CIDFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/CIDFontType.java b/src/java/org/apache/fop/fonts/CIDFontType.java index 4a1ecff71..4fa3597b2 100644 --- a/src/java/org/apache/fop/fonts/CIDFontType.java +++ b/src/java/org/apache/fop/fonts/CIDFontType.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/CustomFont.java b/src/java/org/apache/fop/fonts/CustomFont.java index 85c7da1ee..ec266ecc4 100644 --- a/src/java/org/apache/fop/fonts/CustomFont.java +++ b/src/java/org/apache/fop/fonts/CustomFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004, 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/EmbedFontInfo.java b/src/java/org/apache/fop/fonts/EmbedFontInfo.java index 63f3d3b0d..45f9bb6e4 100644 --- a/src/java/org/apache/fop/fonts/EmbedFontInfo.java +++ b/src/java/org/apache/fop/fonts/EmbedFontInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/Font.java b/src/java/org/apache/fop/fonts/Font.java index 1a2d39651..a6b6d52d4 100644 --- a/src/java/org/apache/fop/fonts/Font.java +++ b/src/java/org/apache/fop/fonts/Font.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontDescriptor.java b/src/java/org/apache/fop/fonts/FontDescriptor.java index a7099a6dd..ffc3ea3f2 100644 --- a/src/java/org/apache/fop/fonts/FontDescriptor.java +++ b/src/java/org/apache/fop/fonts/FontDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontInfo.java b/src/java/org/apache/fop/fonts/FontInfo.java index 4bd315941..010479804 100644 --- a/src/java/org/apache/fop/fonts/FontInfo.java +++ b/src/java/org/apache/fop/fonts/FontInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontMetrics.java b/src/java/org/apache/fop/fonts/FontMetrics.java index 3ca228125..1a1bd04e4 100644 --- a/src/java/org/apache/fop/fonts/FontMetrics.java +++ b/src/java/org/apache/fop/fonts/FontMetrics.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontReader.java b/src/java/org/apache/fop/fonts/FontReader.java index cc9888962..0d04d6c71 100644 --- a/src/java/org/apache/fop/fonts/FontReader.java +++ b/src/java/org/apache/fop/fonts/FontReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontResolver.java b/src/java/org/apache/fop/fonts/FontResolver.java index 7999de646..cd8e965fb 100644 --- a/src/java/org/apache/fop/fonts/FontResolver.java +++ b/src/java/org/apache/fop/fonts/FontResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontSetup.java b/src/java/org/apache/fop/fonts/FontSetup.java index 4cab92d9d..fffcf9c62 100644 --- a/src/java/org/apache/fop/fonts/FontSetup.java +++ b/src/java/org/apache/fop/fonts/FontSetup.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontTriplet.java b/src/java/org/apache/fop/fonts/FontTriplet.java index 378bfaeb0..841b69990 100644 --- a/src/java/org/apache/fop/fonts/FontTriplet.java +++ b/src/java/org/apache/fop/fonts/FontTriplet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontType.java b/src/java/org/apache/fop/fonts/FontType.java index d437b2ead..a00721ebf 100644 --- a/src/java/org/apache/fop/fonts/FontType.java +++ b/src/java/org/apache/fop/fonts/FontType.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/FontUtil.java b/src/java/org/apache/fop/fonts/FontUtil.java index 999836d8f..e08ba3815 100644 --- a/src/java/org/apache/fop/fonts/FontUtil.java +++ b/src/java/org/apache/fop/fonts/FontUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/Glyphs.java b/src/java/org/apache/fop/fonts/Glyphs.java index 530c49064..e75a6bf54 100644 --- a/src/java/org/apache/fop/fonts/Glyphs.java +++ b/src/java/org/apache/fop/fonts/Glyphs.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/LazyFont.java b/src/java/org/apache/fop/fonts/LazyFont.java index 19bb4ffde..4d0b57cee 100644 --- a/src/java/org/apache/fop/fonts/LazyFont.java +++ b/src/java/org/apache/fop/fonts/LazyFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/MultiByteFont.java b/src/java/org/apache/fop/fonts/MultiByteFont.java index 037e9726e..ed1bbd505 100644 --- a/src/java/org/apache/fop/fonts/MultiByteFont.java +++ b/src/java/org/apache/fop/fonts/MultiByteFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/MutableFont.java b/src/java/org/apache/fop/fonts/MutableFont.java index 42b5b54e5..3a53d7432 100644 --- a/src/java/org/apache/fop/fonts/MutableFont.java +++ b/src/java/org/apache/fop/fonts/MutableFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/SingleByteFont.java b/src/java/org/apache/fop/fonts/SingleByteFont.java index f03f6f7b5..a170514a9 100644 --- a/src/java/org/apache/fop/fonts/SingleByteFont.java +++ b/src/java/org/apache/fop/fonts/SingleByteFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/Typeface.java b/src/java/org/apache/fop/fonts/Typeface.java index 34ed96215..80bbb1ef2 100644 --- a/src/java/org/apache/fop/fonts/Typeface.java +++ b/src/java/org/apache/fop/fonts/Typeface.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java b/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java index 0f8cfdb06..957a942a2 100644 --- a/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java +++ b/src/java/org/apache/fop/fonts/apps/AbstractFontReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/apps/PFMReader.java b/src/java/org/apache/fop/fonts/apps/PFMReader.java index 0a14578d9..b14132ea3 100644 --- a/src/java/org/apache/fop/fonts/apps/PFMReader.java +++ b/src/java/org/apache/fop/fonts/apps/PFMReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/apps/TTFReader.java b/src/java/org/apache/fop/fonts/apps/TTFReader.java index a897c1625..fe7e01585 100644 --- a/src/java/org/apache/fop/fonts/apps/TTFReader.java +++ b/src/java/org/apache/fop/fonts/apps/TTFReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/apps/package.html b/src/java/org/apache/fop/fonts/apps/package.html index 77c82d956..5e0551c23 100644 --- a/src/java/org/apache/fop/fonts/apps/package.html +++ b/src/java/org/apache/fop/fonts/apps/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/fonts/truetype/FontFileReader.java b/src/java/org/apache/fop/fonts/truetype/FontFileReader.java index f83b597ca..930504752 100644 --- a/src/java/org/apache/fop/fonts/truetype/FontFileReader.java +++ b/src/java/org/apache/fop/fonts/truetype/FontFileReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java b/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java index 164dd5766..77d9f5427 100644 --- a/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java +++ b/src/java/org/apache/fop/fonts/truetype/TTFCmapEntry.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/truetype/TTFDirTabEntry.java b/src/java/org/apache/fop/fonts/truetype/TTFDirTabEntry.java index 8e25e65d6..c1dfc5ea0 100644 --- a/src/java/org/apache/fop/fonts/truetype/TTFDirTabEntry.java +++ b/src/java/org/apache/fop/fonts/truetype/TTFDirTabEntry.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/truetype/TTFFile.java b/src/java/org/apache/fop/fonts/truetype/TTFFile.java index 6e8357d66..6a20e2bb9 100644 --- a/src/java/org/apache/fop/fonts/truetype/TTFFile.java +++ b/src/java/org/apache/fop/fonts/truetype/TTFFile.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/truetype/TTFMtxEntry.java b/src/java/org/apache/fop/fonts/truetype/TTFMtxEntry.java index cc5466830..dae192404 100644 --- a/src/java/org/apache/fop/fonts/truetype/TTFMtxEntry.java +++ b/src/java/org/apache/fop/fonts/truetype/TTFMtxEntry.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java b/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java index 5d7812eab..170aec194 100644 --- a/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java +++ b/src/java/org/apache/fop/fonts/truetype/TTFSubSetFile.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/type1/PFBData.java b/src/java/org/apache/fop/fonts/type1/PFBData.java index 5e552a8fc..cfd2d1e27 100644 --- a/src/java/org/apache/fop/fonts/type1/PFBData.java +++ b/src/java/org/apache/fop/fonts/type1/PFBData.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/type1/PFBParser.java b/src/java/org/apache/fop/fonts/type1/PFBParser.java index ce10ba223..d0bc755b6 100644 --- a/src/java/org/apache/fop/fonts/type1/PFBParser.java +++ b/src/java/org/apache/fop/fonts/type1/PFBParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/type1/PFMFile.java b/src/java/org/apache/fop/fonts/type1/PFMFile.java index b4c31425b..974ea4ec5 100644 --- a/src/java/org/apache/fop/fonts/type1/PFMFile.java +++ b/src/java/org/apache/fop/fonts/type1/PFMFile.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/fonts/type1/PFMInputStream.java b/src/java/org/apache/fop/fonts/type1/PFMInputStream.java index 5f5a17432..8007ac049 100644 --- a/src/java/org/apache/fop/fonts/type1/PFMInputStream.java +++ b/src/java/org/apache/fop/fonts/type1/PFMInputStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/ByteVector.java b/src/java/org/apache/fop/hyphenation/ByteVector.java index f3c232dc6..c4ca1d410 100644 --- a/src/java/org/apache/fop/hyphenation/ByteVector.java +++ b/src/java/org/apache/fop/hyphenation/ByteVector.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/CharVector.java b/src/java/org/apache/fop/hyphenation/CharVector.java index bc4109920..d0b51139e 100644 --- a/src/java/org/apache/fop/hyphenation/CharVector.java +++ b/src/java/org/apache/fop/hyphenation/CharVector.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/Hyphen.java b/src/java/org/apache/fop/hyphenation/Hyphen.java index 84474c98b..848801fc5 100644 --- a/src/java/org/apache/fop/hyphenation/Hyphen.java +++ b/src/java/org/apache/fop/hyphenation/Hyphen.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/Hyphenation.java b/src/java/org/apache/fop/hyphenation/Hyphenation.java index 7a922cbdf..b804164ff 100644 --- a/src/java/org/apache/fop/hyphenation/Hyphenation.java +++ b/src/java/org/apache/fop/hyphenation/Hyphenation.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/HyphenationException.java b/src/java/org/apache/fop/hyphenation/HyphenationException.java index d66ce985d..1d2af2bb1 100644 --- a/src/java/org/apache/fop/hyphenation/HyphenationException.java +++ b/src/java/org/apache/fop/hyphenation/HyphenationException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTree.java b/src/java/org/apache/fop/hyphenation/HyphenationTree.java index d67405c93..67488c5b5 100644 --- a/src/java/org/apache/fop/hyphenation/HyphenationTree.java +++ b/src/java/org/apache/fop/hyphenation/HyphenationTree.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java index df1ae590c..04041525f 100644 --- a/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java +++ b/src/java/org/apache/fop/hyphenation/HyphenationTreeCache.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/HyphenationTreeResolver.java b/src/java/org/apache/fop/hyphenation/HyphenationTreeResolver.java index 65c8da5b8..39146c3d7 100644 --- a/src/java/org/apache/fop/hyphenation/HyphenationTreeResolver.java +++ b/src/java/org/apache/fop/hyphenation/HyphenationTreeResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/Hyphenator.java b/src/java/org/apache/fop/hyphenation/Hyphenator.java index b455ec74f..3d9ef9eb8 100644 --- a/src/java/org/apache/fop/hyphenation/Hyphenator.java +++ b/src/java/org/apache/fop/hyphenation/Hyphenator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/PatternConsumer.java b/src/java/org/apache/fop/hyphenation/PatternConsumer.java index 4f63de381..4053f2767 100644 --- a/src/java/org/apache/fop/hyphenation/PatternConsumer.java +++ b/src/java/org/apache/fop/hyphenation/PatternConsumer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/PatternParser.java b/src/java/org/apache/fop/hyphenation/PatternParser.java index 16adc1b07..5dbe1f5ee 100644 --- a/src/java/org/apache/fop/hyphenation/PatternParser.java +++ b/src/java/org/apache/fop/hyphenation/PatternParser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/TernaryTree.java b/src/java/org/apache/fop/hyphenation/TernaryTree.java index d026dc858..a6f5337bf 100644 --- a/src/java/org/apache/fop/hyphenation/TernaryTree.java +++ b/src/java/org/apache/fop/hyphenation/TernaryTree.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/hyphenation/package.html b/src/java/org/apache/fop/hyphenation/package.html index 454e3798b..0633a5446 100644 --- a/src/java/org/apache/fop/hyphenation/package.html +++ b/src/java/org/apache/fop/hyphenation/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/image/AbstractFopImage.java b/src/java/org/apache/fop/image/AbstractFopImage.java index b6cfeba3f..8c150df41 100644 --- a/src/java/org/apache/fop/image/AbstractFopImage.java +++ b/src/java/org/apache/fop/image/AbstractFopImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/BmpImage.java b/src/java/org/apache/fop/image/BmpImage.java index 64c43e8d1..506137bbb 100644 --- a/src/java/org/apache/fop/image/BmpImage.java +++ b/src/java/org/apache/fop/image/BmpImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/EPSImage.java b/src/java/org/apache/fop/image/EPSImage.java index f04d3d41e..ab708f2a4 100644 --- a/src/java/org/apache/fop/image/EPSImage.java +++ b/src/java/org/apache/fop/image/EPSImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/EmfImage.java b/src/java/org/apache/fop/image/EmfImage.java index 23c393749..4e19b326d 100644 --- a/src/java/org/apache/fop/image/EmfImage.java +++ b/src/java/org/apache/fop/image/EmfImage.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/image/FopImage.java b/src/java/org/apache/fop/image/FopImage.java index 60e637718..0db6a95a0 100644 --- a/src/java/org/apache/fop/image/FopImage.java +++ b/src/java/org/apache/fop/image/FopImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/FopImageConsumer.java b/src/java/org/apache/fop/image/FopImageConsumer.java index dc99855fd..37f2a29a2 100644 --- a/src/java/org/apache/fop/image/FopImageConsumer.java +++ b/src/java/org/apache/fop/image/FopImageConsumer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/GifImage.java b/src/java/org/apache/fop/image/GifImage.java index c00689f23..40c5ab330 100644 --- a/src/java/org/apache/fop/image/GifImage.java +++ b/src/java/org/apache/fop/image/GifImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/ImageCache.java b/src/java/org/apache/fop/image/ImageCache.java index 837462df6..3dd639823 100644 --- a/src/java/org/apache/fop/image/ImageCache.java +++ b/src/java/org/apache/fop/image/ImageCache.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/ImageFactory.java b/src/java/org/apache/fop/image/ImageFactory.java index acf310ada..7d7a92120 100644 --- a/src/java/org/apache/fop/image/ImageFactory.java +++ b/src/java/org/apache/fop/image/ImageFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/ImageLoader.java b/src/java/org/apache/fop/image/ImageLoader.java index f26088a01..111ef919f 100644 --- a/src/java/org/apache/fop/image/ImageLoader.java +++ b/src/java/org/apache/fop/image/ImageLoader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/JAIImage.java b/src/java/org/apache/fop/image/JAIImage.java index d03703d8a..d63642dbe 100644 --- a/src/java/org/apache/fop/image/JAIImage.java +++ b/src/java/org/apache/fop/image/JAIImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/JimiImage.java b/src/java/org/apache/fop/image/JimiImage.java index 2d11440e1..cef32dce0 100644 --- a/src/java/org/apache/fop/image/JimiImage.java +++ b/src/java/org/apache/fop/image/JimiImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/JpegImage.java b/src/java/org/apache/fop/image/JpegImage.java index 247322d18..820a728f9 100644 --- a/src/java/org/apache/fop/image/JpegImage.java +++ b/src/java/org/apache/fop/image/JpegImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/PNGImage.java b/src/java/org/apache/fop/image/PNGImage.java index 43cfbe97f..451cf6abf 100644 --- a/src/java/org/apache/fop/image/PNGImage.java +++ b/src/java/org/apache/fop/image/PNGImage.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/TIFFImage.java b/src/java/org/apache/fop/image/TIFFImage.java index a1a39df30..841bd2304 100644 --- a/src/java/org/apache/fop/image/TIFFImage.java +++ b/src/java/org/apache/fop/image/TIFFImage.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/XMLImage.java b/src/java/org/apache/fop/image/XMLImage.java index cc71016a8..261dc8494 100644 --- a/src/java/org/apache/fop/image/XMLImage.java +++ b/src/java/org/apache/fop/image/XMLImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java b/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java index ee079aad5..7bcd2a997 100644 --- a/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java +++ b/src/java/org/apache/fop/image/XmlGraphicsCommonsImage.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/BMPReader.java b/src/java/org/apache/fop/image/analyser/BMPReader.java index d4e555ae3..7dfb29dc7 100644 --- a/src/java/org/apache/fop/image/analyser/BMPReader.java +++ b/src/java/org/apache/fop/image/analyser/BMPReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/EMFReader.java b/src/java/org/apache/fop/image/analyser/EMFReader.java index 404c65945..b61cff441 100644 --- a/src/java/org/apache/fop/image/analyser/EMFReader.java +++ b/src/java/org/apache/fop/image/analyser/EMFReader.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/image/analyser/EPSReader.java b/src/java/org/apache/fop/image/analyser/EPSReader.java index 8217b6dbd..eba620fee 100644 --- a/src/java/org/apache/fop/image/analyser/EPSReader.java +++ b/src/java/org/apache/fop/image/analyser/EPSReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/GIFReader.java b/src/java/org/apache/fop/image/analyser/GIFReader.java index ed32d9462..74e528481 100644 --- a/src/java/org/apache/fop/image/analyser/GIFReader.java +++ b/src/java/org/apache/fop/image/analyser/GIFReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/ImageReader.java b/src/java/org/apache/fop/image/analyser/ImageReader.java index 99b5538c6..980d1e489 100644 --- a/src/java/org/apache/fop/image/analyser/ImageReader.java +++ b/src/java/org/apache/fop/image/analyser/ImageReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -30,7 +31,7 @@ import org.apache.fop.apps.FOUserAgent; * ImageReader objects read image headers to determine the image size. * * @author Pankaj Narula - * @version $Id: ImageReader.java,v 1.9 2003/03/06 21:25:45 jeremias Exp $ + * @version $Id$ */ public interface ImageReader { diff --git a/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java b/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java index 853508761..4e4c4bce7 100644 --- a/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java +++ b/src/java/org/apache/fop/image/analyser/ImageReaderFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -35,7 +36,7 @@ import org.apache.commons.logging.LogFactory; * Factory for ImageReader objects. * * @author Pankaj Narula - * @version $Id: ImageReaderFactory.java,v 1.13 2003/03/06 21:25:45 jeremias Exp $ + * @version $Id$ */ public class ImageReaderFactory { diff --git a/src/java/org/apache/fop/image/analyser/JPEGReader.java b/src/java/org/apache/fop/image/analyser/JPEGReader.java index b4fde1e11..1cb1d9212 100644 --- a/src/java/org/apache/fop/image/analyser/JPEGReader.java +++ b/src/java/org/apache/fop/image/analyser/JPEGReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/PNGReader.java b/src/java/org/apache/fop/image/analyser/PNGReader.java index 08dd9fa19..ab2c6bff3 100644 --- a/src/java/org/apache/fop/image/analyser/PNGReader.java +++ b/src/java/org/apache/fop/image/analyser/PNGReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/SVGReader.java b/src/java/org/apache/fop/image/analyser/SVGReader.java index 46d76304a..b487572a5 100644 --- a/src/java/org/apache/fop/image/analyser/SVGReader.java +++ b/src/java/org/apache/fop/image/analyser/SVGReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/TIFFReader.java b/src/java/org/apache/fop/image/analyser/TIFFReader.java index fa79c2e79..049e154a0 100644 --- a/src/java/org/apache/fop/image/analyser/TIFFReader.java +++ b/src/java/org/apache/fop/image/analyser/TIFFReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/XMLReader.java b/src/java/org/apache/fop/image/analyser/XMLReader.java index b8d9203ac..34d34ef4a 100644 --- a/src/java/org/apache/fop/image/analyser/XMLReader.java +++ b/src/java/org/apache/fop/image/analyser/XMLReader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/image/analyser/package.html b/src/java/org/apache/fop/image/analyser/package.html index 44a0728fc..677a625b2 100644 --- a/src/java/org/apache/fop/image/analyser/package.html +++ b/src/java/org/apache/fop/image/analyser/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/image/package.html b/src/java/org/apache/fop/image/package.html index 11a62b241..0145864b2 100644 --- a/src/java/org/apache/fop/image/package.html +++ b/src/java/org/apache/fop/image/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java index d118fa4a6..58e301c3f 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java index d5c1a48bb..c549be3ee 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractBreaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java index d8ded23fe..fbacba12d 100644 --- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java index 866b8236d..8892eae16 100644 --- a/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java +++ b/src/java/org/apache/fop/layoutmgr/AreaAdditionUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java index fb1f82dea..c91722360 100644 --- a/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/BalancingColumnBreakingAlgorithm.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java index df4274cc4..127db160b 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java b/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java index 9ef3d61e3..ae03487e1 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java +++ b/src/java/org/apache/fop/layoutmgr/BlockKnuthSequence.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java index 4e6d3750a..623c94c04 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BlockLevelLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLevelLayoutManager.java index ffba6ffbf..7e0e9e50e 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockLevelLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockLevelLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java index 5c57796ce..ea8f808ac 100644 --- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BorderElement.java b/src/java/org/apache/fop/layoutmgr/BorderElement.java index 691fcab90..b1af89a99 100644 --- a/src/java/org/apache/fop/layoutmgr/BorderElement.java +++ b/src/java/org/apache/fop/layoutmgr/BorderElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java b/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java index 2e4dc315e..2af1418db 100644 --- a/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java +++ b/src/java/org/apache/fop/layoutmgr/BorderOrPaddingElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BreakElement.java b/src/java/org/apache/fop/layoutmgr/BreakElement.java index db9246fbf..03e02c32f 100644 --- a/src/java/org/apache/fop/layoutmgr/BreakElement.java +++ b/src/java/org/apache/fop/layoutmgr/BreakElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java index a0f58db13..33f5f96ad 100644 --- a/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/BreakingAlgorithm.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/ConditionalElementListener.java b/src/java/org/apache/fop/layoutmgr/ConditionalElementListener.java index 3cc4be678..50fdc54b0 100644 --- a/src/java/org/apache/fop/layoutmgr/ConditionalElementListener.java +++ b/src/java/org/apache/fop/layoutmgr/ConditionalElementListener.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/ElementListObserver.java b/src/java/org/apache/fop/layoutmgr/ElementListObserver.java index f583ca673..d4f23b1ee 100644 --- a/src/java/org/apache/fop/layoutmgr/ElementListObserver.java +++ b/src/java/org/apache/fop/layoutmgr/ElementListObserver.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/ElementListUtils.java b/src/java/org/apache/fop/layoutmgr/ElementListUtils.java index e68698e57..261974d6b 100644 --- a/src/java/org/apache/fop/layoutmgr/ElementListUtils.java +++ b/src/java/org/apache/fop/layoutmgr/ElementListUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java index 70da380fc..96d564b7d 100644 --- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java index 51868f4e9..70f541b2d 100644 --- a/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/FootnoteBodyLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java b/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java index f66c0d119..839c3bd35 100644 --- a/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java +++ b/src/java/org/apache/fop/layoutmgr/InlineKnuthSequence.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java b/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java index 0aec48b47..53f285377 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthBlockBox.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthBox.java b/src/java/org/apache/fop/layoutmgr/KnuthBox.java index 77f463068..7d3cf33d1 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthBox.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthBox.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthElement.java b/src/java/org/apache/fop/layoutmgr/KnuthElement.java index 97d0bbd56..5d26716ea 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthElement.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthGlue.java b/src/java/org/apache/fop/layoutmgr/KnuthGlue.java index 299266ed8..cfec08fca 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthGlue.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthGlue.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java b/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java index 19b5ae763..ee7b3c6f9 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthPenalty.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java b/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java index 3cd2c9e69..a3b48c26a 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthPossPosIter.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/KnuthSequence.java b/src/java/org/apache/fop/layoutmgr/KnuthSequence.java index c574c7396..4467a397b 100644 --- a/src/java/org/apache/fop/layoutmgr/KnuthSequence.java +++ b/src/java/org/apache/fop/layoutmgr/KnuthSequence.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/LMiter.java b/src/java/org/apache/fop/layoutmgr/LMiter.java index 776ff89bf..9e812a8b7 100644 --- a/src/java/org/apache/fop/layoutmgr/LMiter.java +++ b/src/java/org/apache/fop/layoutmgr/LMiter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/LayoutContext.java b/src/java/org/apache/fop/layoutmgr/LayoutContext.java index ef5b818c3..992117313 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutContext.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java index 35d28a715..39b970682 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java index c55e773ec..b56aed866 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java index 9a812e016..db4663df6 100644 --- a/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java +++ b/src/java/org/apache/fop/layoutmgr/LayoutManagerMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/LeafPosition.java b/src/java/org/apache/fop/layoutmgr/LeafPosition.java index f2f46b43c..9e484b701 100644 --- a/src/java/org/apache/fop/layoutmgr/LeafPosition.java +++ b/src/java/org/apache/fop/layoutmgr/LeafPosition.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/ListElement.java b/src/java/org/apache/fop/layoutmgr/ListElement.java index 6707c66fe..de08a1e1e 100644 --- a/src/java/org/apache/fop/layoutmgr/ListElement.java +++ b/src/java/org/apache/fop/layoutmgr/ListElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java b/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java index e99ec6853..ff9bdb1d9 100644 --- a/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java +++ b/src/java/org/apache/fop/layoutmgr/MinOptMaxUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java b/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java index d78dc6955..314f2c9f1 100644 --- a/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java +++ b/src/java/org/apache/fop/layoutmgr/NonLeafPosition.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/PaddingElement.java b/src/java/org/apache/fop/layoutmgr/PaddingElement.java index 3928b7abe..61c2abb29 100644 --- a/src/java/org/apache/fop/layoutmgr/PaddingElement.java +++ b/src/java/org/apache/fop/layoutmgr/PaddingElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/Page.java b/src/java/org/apache/fop/layoutmgr/Page.java index 70eab62ac..5e9addd1e 100644 --- a/src/java/org/apache/fop/layoutmgr/Page.java +++ b/src/java/org/apache/fop/layoutmgr/Page.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java index acf46ef64..3910fa023 100644 --- a/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java +++ b/src/java/org/apache/fop/layoutmgr/PageBreakingAlgorithm.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java index 0fcb27b32..567153aea 100644 --- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/Position.java b/src/java/org/apache/fop/layoutmgr/Position.java index 700b8f41c..05d68c05a 100644 --- a/src/java/org/apache/fop/layoutmgr/Position.java +++ b/src/java/org/apache/fop/layoutmgr/Position.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/PositionIterator.java b/src/java/org/apache/fop/layoutmgr/PositionIterator.java index 24a641ebd..cd0f92b78 100644 --- a/src/java/org/apache/fop/layoutmgr/PositionIterator.java +++ b/src/java/org/apache/fop/layoutmgr/PositionIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/RelSide.java b/src/java/org/apache/fop/layoutmgr/RelSide.java index 6371cff39..44abb9dd2 100644 --- a/src/java/org/apache/fop/layoutmgr/RelSide.java +++ b/src/java/org/apache/fop/layoutmgr/RelSide.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/SpaceElement.java b/src/java/org/apache/fop/layoutmgr/SpaceElement.java index ef365b78e..5c18835b4 100644 --- a/src/java/org/apache/fop/layoutmgr/SpaceElement.java +++ b/src/java/org/apache/fop/layoutmgr/SpaceElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/SpaceResolver.java b/src/java/org/apache/fop/layoutmgr/SpaceResolver.java index a26763ac2..222f20040 100644 --- a/src/java/org/apache/fop/layoutmgr/SpaceResolver.java +++ b/src/java/org/apache/fop/layoutmgr/SpaceResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java b/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java index a88cd195b..8dd004333 100644 --- a/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java +++ b/src/java/org/apache/fop/layoutmgr/SpaceSpecifier.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java index acbf43e0f..e7ccc2b71 100644 --- a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/TraitSetter.java b/src/java/org/apache/fop/layoutmgr/TraitSetter.java index 78d353093..274204122 100644 --- a/src/java/org/apache/fop/layoutmgr/TraitSetter.java +++ b/src/java/org/apache/fop/layoutmgr/TraitSetter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/UnresolvedListElement.java b/src/java/org/apache/fop/layoutmgr/UnresolvedListElement.java index 5f17db283..2e014ef08 100644 --- a/src/java/org/apache/fop/layoutmgr/UnresolvedListElement.java +++ b/src/java/org/apache/fop/layoutmgr/UnresolvedListElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java b/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java index 57637bbf5..1c7b6b53b 100644 --- a/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java +++ b/src/java/org/apache/fop/layoutmgr/UnresolvedListElementWithLength.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java index cfe74ae4f..2b5bf3fbf 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/AbstractGraphicsLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java index 1c081392f..ac1e12a2e 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java +++ b/src/java/org/apache/fop/layoutmgr/inline/AlignmentContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java index 429261f6f..3c9dd4ed9 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/BasicLinkLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java b/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java index 31d659059..e8a59fca4 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java +++ b/src/java/org/apache/fop/layoutmgr/inline/BasicScaledBaselineTable.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java index bc6a0d44a..f82cd7f41 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/BidiLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java index 9067c575c..26dc8c3b4 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/CharacterLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java index e60794acb..277e919e2 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ContentLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java index e6ddcffbd..ecdbd68e4 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ExternalGraphicLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java index f1a740c7c..c936a3729 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/FootnoteLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java b/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java index 86e8ba48a..3c438ee7e 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java +++ b/src/java/org/apache/fop/layoutmgr/inline/HyphContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java index 87ce904f4..4ffafb061 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ICLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java index ba7bdf245..d3d5868f2 100755 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java index d7c1f8424..80a74ffc4 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineLevelLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java index b31fb8b42..de7b305fd 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InlineStackingLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java b/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java index 6fe5d7a31..8ff6b346e 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java +++ b/src/java/org/apache/fop/layoutmgr/inline/InstreamForeignObjectLM.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java b/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java index e3e896d71..3d20b4ce4 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java +++ b/src/java/org/apache/fop/layoutmgr/inline/KnuthInlineBox.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java index 44009ed51..1f47e7c39 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeaderLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java index 43db78b7f..74eeef2e5 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LeafNodeLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java index ab1079fbc..e7571fda0 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java index 524fe9d9d..59dd9c3c4 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java +++ b/src/java/org/apache/fop/layoutmgr/inline/LineLayoutPossibilities.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java index f55c00fec..b507c3997 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLastLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java index 729e9c939..8ab338e99 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/PageNumberCitationLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java index 39a8d08ec..ff751bcd8 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/PageNumberLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java b/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java index 0aeb2b7b8..25bcb7d0e 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTable.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTableFactory.java b/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTableFactory.java index 4f36acc72..e47f107e3 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTableFactory.java +++ b/src/java/org/apache/fop/layoutmgr/inline/ScaledBaselineTableFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java index 159ece158..35a298db3 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java b/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java index bd8e33597..9c946afbc 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/inline/WrapperLayoutManager.java @@ -1,55 +1,56 @@ -/* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* $Id$ */ - -package org.apache.fop.layoutmgr.inline; - -import org.apache.fop.area.inline.InlineArea; -import org.apache.fop.fo.flow.Wrapper; -import org.apache.fop.layoutmgr.LayoutContext; - -/** - * This is the layout manager for the fo:wrapper formatting object. - */ -public class WrapperLayoutManager extends LeafNodeLayoutManager { - - private Wrapper fobj; - - /** - * Creates a new LM for fo:wrapper. - * @param node the fo:wrapper - */ - public WrapperLayoutManager(Wrapper node) { - super(node); - fobj = node; - } - - /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager */ - public InlineArea get(LayoutContext context) { - //Create a zero-width, zero-height dummy area so this node can - //participate in the ID handling. Otherwise, addId() wouldn't - //be called. - InlineArea area = new InlineArea(); - return area; - } - - /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */ - protected void addId() { - getPSLM().addIDToPage(fobj.getId()); - } - -} +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.layoutmgr.inline;
+
+import org.apache.fop.area.inline.InlineArea;
+import org.apache.fop.fo.flow.Wrapper;
+import org.apache.fop.layoutmgr.LayoutContext;
+
+/**
+ * This is the layout manager for the fo:wrapper formatting object.
+ */
+public class WrapperLayoutManager extends LeafNodeLayoutManager {
+
+ private Wrapper fobj;
+
+ /**
+ * Creates a new LM for fo:wrapper.
+ * @param node the fo:wrapper
+ */
+ public WrapperLayoutManager(Wrapper node) {
+ super(node);
+ fobj = node;
+ }
+
+ /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager */
+ public InlineArea get(LayoutContext context) {
+ //Create a zero-width, zero-height dummy area so this node can
+ //participate in the ID handling. Otherwise, addId() wouldn't
+ //be called.
+ InlineArea area = new InlineArea();
+ return area;
+ }
+
+ /** @see org.apache.fop.layoutmgr.inline.LeafNodeLayoutManager#addId() */
+ protected void addId() {
+ getPSLM().addIDToPage(fobj.getId());
+ }
+
+}
diff --git a/src/java/org/apache/fop/layoutmgr/inline/package.html b/src/java/org/apache/fop/layoutmgr/inline/package.html index 619dfbd61..9a894795b 100644 --- a/src/java/org/apache/fop/layoutmgr/inline/package.html +++ b/src/java/org/apache/fop/layoutmgr/inline/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java index 5704ae99d..709106dbc 100644 --- a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java index d894a0aeb..6e647353e 100644 --- a/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/list/ListItemContentLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java index 4c7fedea7..6bcbf4de0 100644 --- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/list/package.html b/src/java/org/apache/fop/layoutmgr/list/package.html index 8eef94d25..1f70f4bef 100644 --- a/src/java/org/apache/fop/layoutmgr/list/package.html +++ b/src/java/org/apache/fop/layoutmgr/list/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/layoutmgr/package.html b/src/java/org/apache/fop/layoutmgr/package.html index 80afd4979..90de46bd8 100644 --- a/src/java/org/apache/fop/layoutmgr/package.html +++ b/src/java/org/apache/fop/layoutmgr/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java index 8e3f40fac..0807bf7ae 100644 --- a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java +++ b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModel.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java index d63ba8d48..e1f573162 100644 --- a/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java +++ b/src/java/org/apache/fop/layoutmgr/table/CollapsingBorderModelEyeCatching.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java index 7b5db7df0..be72722af 100644 --- a/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java +++ b/src/java/org/apache/fop/layoutmgr/table/ColumnSetup.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/EffRow.java b/src/java/org/apache/fop/layoutmgr/table/EffRow.java index 1e0befa99..982ba8c45 100644 --- a/src/java/org/apache/fop/layoutmgr/table/EffRow.java +++ b/src/java/org/apache/fop/layoutmgr/table/EffRow.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java b/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java index 8d17420d8..274c752fc 100644 --- a/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/EmptyGridUnit.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/GridUnit.java b/src/java/org/apache/fop/layoutmgr/table/GridUnit.java index a187a0745..2716f13f3 100644 --- a/src/java/org/apache/fop/layoutmgr/table/GridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/GridUnit.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java index 94fa3322a..73f5e5acb 100644 --- a/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java +++ b/src/java/org/apache/fop/layoutmgr/table/PrimaryGridUnit.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java index e48531c2c..1ad7c1b26 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java index b0efad7cd..04746920a 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCaptionLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java index 61d2d3701..440a2a75e 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java index 3c6b7c6f2..27f3da0c9 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java index 2810401ae..7b353edd2 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java index 72c285700..0e193c3ff 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableRowIterator.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java index 03c04e188..e4191732b 100644 --- a/src/java/org/apache/fop/layoutmgr/table/TableStepper.java +++ b/src/java/org/apache/fop/layoutmgr/table/TableStepper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/layoutmgr/table/package.html b/src/java/org/apache/fop/layoutmgr/table/package.html index fd5c180ec..1d3093e7f 100644 --- a/src/java/org/apache/fop/layoutmgr/table/package.html +++ b/src/java/org/apache/fop/layoutmgr/table/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/pdf/ASCII85Filter.java b/src/java/org/apache/fop/pdf/ASCII85Filter.java index debb278fb..32c7257e8 100644 --- a/src/java/org/apache/fop/pdf/ASCII85Filter.java +++ b/src/java/org/apache/fop/pdf/ASCII85Filter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/ASCIIHexFilter.java b/src/java/org/apache/fop/pdf/ASCIIHexFilter.java index 72153397d..23a19afbc 100644 --- a/src/java/org/apache/fop/pdf/ASCIIHexFilter.java +++ b/src/java/org/apache/fop/pdf/ASCIIHexFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/AbstractPDFStream.java b/src/java/org/apache/fop/pdf/AbstractPDFStream.java index 93c798236..0901ce196 100644 --- a/src/java/org/apache/fop/pdf/AbstractPDFStream.java +++ b/src/java/org/apache/fop/pdf/AbstractPDFStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/BitmapImage.java b/src/java/org/apache/fop/pdf/BitmapImage.java index c9ecc6f97..4752a78bf 100644 --- a/src/java/org/apache/fop/pdf/BitmapImage.java +++ b/src/java/org/apache/fop/pdf/BitmapImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/CCFFilter.java b/src/java/org/apache/fop/pdf/CCFFilter.java index ed8960ca0..cc82d983f 100644 --- a/src/java/org/apache/fop/pdf/CCFFilter.java +++ b/src/java/org/apache/fop/pdf/CCFFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/DCTFilter.java b/src/java/org/apache/fop/pdf/DCTFilter.java index cf3d9529c..08eca9738 100644 --- a/src/java/org/apache/fop/pdf/DCTFilter.java +++ b/src/java/org/apache/fop/pdf/DCTFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/FlateFilter.java b/src/java/org/apache/fop/pdf/FlateFilter.java index e9e2d4327..f9fc3705c 100644 --- a/src/java/org/apache/fop/pdf/FlateFilter.java +++ b/src/java/org/apache/fop/pdf/FlateFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/InMemoryStreamCache.java b/src/java/org/apache/fop/pdf/InMemoryStreamCache.java index 2acf0c594..8ad88e3b7 100644 --- a/src/java/org/apache/fop/pdf/InMemoryStreamCache.java +++ b/src/java/org/apache/fop/pdf/InMemoryStreamCache.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/NullFilter.java b/src/java/org/apache/fop/pdf/NullFilter.java index 6b0e0810f..4b1506da2 100644 --- a/src/java/org/apache/fop/pdf/NullFilter.java +++ b/src/java/org/apache/fop/pdf/NullFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFAMode.java b/src/java/org/apache/fop/pdf/PDFAMode.java index e78eaf72b..fef8140dc 100644 --- a/src/java/org/apache/fop/pdf/PDFAMode.java +++ b/src/java/org/apache/fop/pdf/PDFAMode.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFAction.java b/src/java/org/apache/fop/pdf/PDFAction.java index a812f361c..7d10276ae 100644 --- a/src/java/org/apache/fop/pdf/PDFAction.java +++ b/src/java/org/apache/fop/pdf/PDFAction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFAnnotList.java b/src/java/org/apache/fop/pdf/PDFAnnotList.java index 408dee8cf..a1196060a 100644 --- a/src/java/org/apache/fop/pdf/PDFAnnotList.java +++ b/src/java/org/apache/fop/pdf/PDFAnnotList.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFArray.java b/src/java/org/apache/fop/pdf/PDFArray.java index a63ce42a5..2dcbd5224 100644 --- a/src/java/org/apache/fop/pdf/PDFArray.java +++ b/src/java/org/apache/fop/pdf/PDFArray.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFCIDFont.java b/src/java/org/apache/fop/pdf/PDFCIDFont.java index 7aa3a0ae2..ec091c8a7 100644 --- a/src/java/org/apache/fop/pdf/PDFCIDFont.java +++ b/src/java/org/apache/fop/pdf/PDFCIDFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java b/src/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java index 7452591e0..101709613 100644 --- a/src/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java +++ b/src/java/org/apache/fop/pdf/PDFCIDFontDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFCIDSystemInfo.java b/src/java/org/apache/fop/pdf/PDFCIDSystemInfo.java index df0a0556c..33d77d9e8 100644 --- a/src/java/org/apache/fop/pdf/PDFCIDSystemInfo.java +++ b/src/java/org/apache/fop/pdf/PDFCIDSystemInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFCMap.java b/src/java/org/apache/fop/pdf/PDFCMap.java index 8e2189567..84d9f8359 100644 --- a/src/java/org/apache/fop/pdf/PDFCMap.java +++ b/src/java/org/apache/fop/pdf/PDFCMap.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFCharProcs.java b/src/java/org/apache/fop/pdf/PDFCharProcs.java index c7524315d..a9eb06fca 100644 --- a/src/java/org/apache/fop/pdf/PDFCharProcs.java +++ b/src/java/org/apache/fop/pdf/PDFCharProcs.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFColor.java b/src/java/org/apache/fop/pdf/PDFColor.java index dfa096b5c..2892f8e0d 100644 --- a/src/java/org/apache/fop/pdf/PDFColor.java +++ b/src/java/org/apache/fop/pdf/PDFColor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFColorSpace.java b/src/java/org/apache/fop/pdf/PDFColorSpace.java index 8ddda27a2..4b67a8422 100644 --- a/src/java/org/apache/fop/pdf/PDFColorSpace.java +++ b/src/java/org/apache/fop/pdf/PDFColorSpace.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFConformanceException.java b/src/java/org/apache/fop/pdf/PDFConformanceException.java index b8f8e3015..119f1f02d 100644 --- a/src/java/org/apache/fop/pdf/PDFConformanceException.java +++ b/src/java/org/apache/fop/pdf/PDFConformanceException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java b/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java index 1cdec346a..db0fa57ec 100644 --- a/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java +++ b/src/java/org/apache/fop/pdf/PDFDeviceColorSpace.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFDocument.java b/src/java/org/apache/fop/pdf/PDFDocument.java index a55252924..4ce82fab9 100644 --- a/src/java/org/apache/fop/pdf/PDFDocument.java +++ b/src/java/org/apache/fop/pdf/PDFDocument.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFEncoding.java b/src/java/org/apache/fop/pdf/PDFEncoding.java index f7dd92ad4..a334445fc 100644 --- a/src/java/org/apache/fop/pdf/PDFEncoding.java +++ b/src/java/org/apache/fop/pdf/PDFEncoding.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFEncryption.java b/src/java/org/apache/fop/pdf/PDFEncryption.java index 0a9bc2c7b..5063ffa44 100644 --- a/src/java/org/apache/fop/pdf/PDFEncryption.java +++ b/src/java/org/apache/fop/pdf/PDFEncryption.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java b/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java index 66bf5dd45..22085deac 100644 --- a/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java +++ b/src/java/org/apache/fop/pdf/PDFEncryptionJCE.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFEncryptionManager.java b/src/java/org/apache/fop/pdf/PDFEncryptionManager.java index 25169662b..6856cc37c 100644 --- a/src/java/org/apache/fop/pdf/PDFEncryptionManager.java +++ b/src/java/org/apache/fop/pdf/PDFEncryptionManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFEncryptionParams.java b/src/java/org/apache/fop/pdf/PDFEncryptionParams.java index cc30fed8d..d3287849d 100644 --- a/src/java/org/apache/fop/pdf/PDFEncryptionParams.java +++ b/src/java/org/apache/fop/pdf/PDFEncryptionParams.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFactory.java b/src/java/org/apache/fop/pdf/PDFFactory.java index ef65e4c11..77c25bc89 100644 --- a/src/java/org/apache/fop/pdf/PDFFactory.java +++ b/src/java/org/apache/fop/pdf/PDFFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFileSpec.java b/src/java/org/apache/fop/pdf/PDFFileSpec.java index 76f448ad1..587f3a849 100644 --- a/src/java/org/apache/fop/pdf/PDFFileSpec.java +++ b/src/java/org/apache/fop/pdf/PDFFileSpec.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFilter.java b/src/java/org/apache/fop/pdf/PDFFilter.java index b5e9f20a6..82efc4c46 100644 --- a/src/java/org/apache/fop/pdf/PDFFilter.java +++ b/src/java/org/apache/fop/pdf/PDFFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFilterException.java b/src/java/org/apache/fop/pdf/PDFFilterException.java index 1863df8ad..83fbf7c4d 100644 --- a/src/java/org/apache/fop/pdf/PDFFilterException.java +++ b/src/java/org/apache/fop/pdf/PDFFilterException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFilterList.java b/src/java/org/apache/fop/pdf/PDFFilterList.java index c26185b37..3ab0b8419 100644 --- a/src/java/org/apache/fop/pdf/PDFFilterList.java +++ b/src/java/org/apache/fop/pdf/PDFFilterList.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFont.java b/src/java/org/apache/fop/pdf/PDFFont.java index 9d2977298..181636c65 100644 --- a/src/java/org/apache/fop/pdf/PDFFont.java +++ b/src/java/org/apache/fop/pdf/PDFFont.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFontDescriptor.java b/src/java/org/apache/fop/pdf/PDFFontDescriptor.java index 51883a015..db1e73ec0 100644 --- a/src/java/org/apache/fop/pdf/PDFFontDescriptor.java +++ b/src/java/org/apache/fop/pdf/PDFFontDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFontNonBase14.java b/src/java/org/apache/fop/pdf/PDFFontNonBase14.java index cbdc9390f..e479e9222 100644 --- a/src/java/org/apache/fop/pdf/PDFFontNonBase14.java +++ b/src/java/org/apache/fop/pdf/PDFFontNonBase14.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFontTrueType.java b/src/java/org/apache/fop/pdf/PDFFontTrueType.java index 4d545112f..eb3a94a27 100644 --- a/src/java/org/apache/fop/pdf/PDFFontTrueType.java +++ b/src/java/org/apache/fop/pdf/PDFFontTrueType.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFontType0.java b/src/java/org/apache/fop/pdf/PDFFontType0.java index 752b312a7..5467f12a5 100644 --- a/src/java/org/apache/fop/pdf/PDFFontType0.java +++ b/src/java/org/apache/fop/pdf/PDFFontType0.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFontType1.java b/src/java/org/apache/fop/pdf/PDFFontType1.java index 130a82d15..8c9a7dc4d 100644 --- a/src/java/org/apache/fop/pdf/PDFFontType1.java +++ b/src/java/org/apache/fop/pdf/PDFFontType1.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFontType3.java b/src/java/org/apache/fop/pdf/PDFFontType3.java index 214acada7..78238d1b8 100644 --- a/src/java/org/apache/fop/pdf/PDFFontType3.java +++ b/src/java/org/apache/fop/pdf/PDFFontType3.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFormXObject.java b/src/java/org/apache/fop/pdf/PDFFormXObject.java index 60ac39d2b..c399456a5 100644 --- a/src/java/org/apache/fop/pdf/PDFFormXObject.java +++ b/src/java/org/apache/fop/pdf/PDFFormXObject.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFFunction.java b/src/java/org/apache/fop/pdf/PDFFunction.java index c8f9024b4..fdf419a2b 100644 --- a/src/java/org/apache/fop/pdf/PDFFunction.java +++ b/src/java/org/apache/fop/pdf/PDFFunction.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFGState.java b/src/java/org/apache/fop/pdf/PDFGState.java index 4185ecc55..3ed86c7b7 100644 --- a/src/java/org/apache/fop/pdf/PDFGState.java +++ b/src/java/org/apache/fop/pdf/PDFGState.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFGoTo.java b/src/java/org/apache/fop/pdf/PDFGoTo.java index 948d4e1e7..a493a9f32 100644 --- a/src/java/org/apache/fop/pdf/PDFGoTo.java +++ b/src/java/org/apache/fop/pdf/PDFGoTo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFGoToRemote.java b/src/java/org/apache/fop/pdf/PDFGoToRemote.java index 830886a05..b852899de 100644 --- a/src/java/org/apache/fop/pdf/PDFGoToRemote.java +++ b/src/java/org/apache/fop/pdf/PDFGoToRemote.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java index 1e2e25810..cd6df5284 100644 --- a/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java +++ b/src/java/org/apache/fop/pdf/PDFICCBasedColorSpace.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFICCStream.java b/src/java/org/apache/fop/pdf/PDFICCStream.java index 2d7ca4674..788a3a1a3 100644 --- a/src/java/org/apache/fop/pdf/PDFICCStream.java +++ b/src/java/org/apache/fop/pdf/PDFICCStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFImage.java b/src/java/org/apache/fop/pdf/PDFImage.java index 7c81dc512..db233d1d4 100644 --- a/src/java/org/apache/fop/pdf/PDFImage.java +++ b/src/java/org/apache/fop/pdf/PDFImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFInfo.java b/src/java/org/apache/fop/pdf/PDFInfo.java index 8920bf619..57b4f01a5 100644 --- a/src/java/org/apache/fop/pdf/PDFInfo.java +++ b/src/java/org/apache/fop/pdf/PDFInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFInternalLink.java b/src/java/org/apache/fop/pdf/PDFInternalLink.java index 41a04be5d..884fcde0d 100644 --- a/src/java/org/apache/fop/pdf/PDFInternalLink.java +++ b/src/java/org/apache/fop/pdf/PDFInternalLink.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFLink.java b/src/java/org/apache/fop/pdf/PDFLink.java index 377f4e592..e800f3b67 100644 --- a/src/java/org/apache/fop/pdf/PDFLink.java +++ b/src/java/org/apache/fop/pdf/PDFLink.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFMetadata.java b/src/java/org/apache/fop/pdf/PDFMetadata.java index e767cbf1b..d2edea87b 100644 --- a/src/java/org/apache/fop/pdf/PDFMetadata.java +++ b/src/java/org/apache/fop/pdf/PDFMetadata.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFNumber.java b/src/java/org/apache/fop/pdf/PDFNumber.java index 2a528123b..6fa649ffa 100644 --- a/src/java/org/apache/fop/pdf/PDFNumber.java +++ b/src/java/org/apache/fop/pdf/PDFNumber.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFObject.java b/src/java/org/apache/fop/pdf/PDFObject.java index 9ccd59bfc..b1e8e1245 100644 --- a/src/java/org/apache/fop/pdf/PDFObject.java +++ b/src/java/org/apache/fop/pdf/PDFObject.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFOutline.java b/src/java/org/apache/fop/pdf/PDFOutline.java index 3bba94a35..17ca2ade1 100644 --- a/src/java/org/apache/fop/pdf/PDFOutline.java +++ b/src/java/org/apache/fop/pdf/PDFOutline.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFOutputIntent.java b/src/java/org/apache/fop/pdf/PDFOutputIntent.java index 4d509e24a..0db1fc306 100644 --- a/src/java/org/apache/fop/pdf/PDFOutputIntent.java +++ b/src/java/org/apache/fop/pdf/PDFOutputIntent.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFPage.java b/src/java/org/apache/fop/pdf/PDFPage.java index 6fdbc74ad..49eb0c278 100644 --- a/src/java/org/apache/fop/pdf/PDFPage.java +++ b/src/java/org/apache/fop/pdf/PDFPage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFPages.java b/src/java/org/apache/fop/pdf/PDFPages.java index 6ce4830e1..d84342fe0 100644 --- a/src/java/org/apache/fop/pdf/PDFPages.java +++ b/src/java/org/apache/fop/pdf/PDFPages.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFPathPaint.java b/src/java/org/apache/fop/pdf/PDFPathPaint.java index f4134b81a..0bcb19a7e 100644 --- a/src/java/org/apache/fop/pdf/PDFPathPaint.java +++ b/src/java/org/apache/fop/pdf/PDFPathPaint.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFPattern.java b/src/java/org/apache/fop/pdf/PDFPattern.java index 972fe1e40..611ff5bbd 100644 --- a/src/java/org/apache/fop/pdf/PDFPattern.java +++ b/src/java/org/apache/fop/pdf/PDFPattern.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFProfile.java b/src/java/org/apache/fop/pdf/PDFProfile.java index 30319d4d3..3458d72a4 100644 --- a/src/java/org/apache/fop/pdf/PDFProfile.java +++ b/src/java/org/apache/fop/pdf/PDFProfile.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFRectangle.java b/src/java/org/apache/fop/pdf/PDFRectangle.java index 81a75e1b0..def6d9a2b 100644 --- a/src/java/org/apache/fop/pdf/PDFRectangle.java +++ b/src/java/org/apache/fop/pdf/PDFRectangle.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFResourceContext.java b/src/java/org/apache/fop/pdf/PDFResourceContext.java index 0573cfccd..aa72f1bbe 100644 --- a/src/java/org/apache/fop/pdf/PDFResourceContext.java +++ b/src/java/org/apache/fop/pdf/PDFResourceContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFResources.java b/src/java/org/apache/fop/pdf/PDFResources.java index 80147b0d7..232001001 100644 --- a/src/java/org/apache/fop/pdf/PDFResources.java +++ b/src/java/org/apache/fop/pdf/PDFResources.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFRoot.java b/src/java/org/apache/fop/pdf/PDFRoot.java index 9ac4e1b0f..ffe9611ba 100644 --- a/src/java/org/apache/fop/pdf/PDFRoot.java +++ b/src/java/org/apache/fop/pdf/PDFRoot.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFShading.java b/src/java/org/apache/fop/pdf/PDFShading.java index 62b4cc438..a782eaf36 100644 --- a/src/java/org/apache/fop/pdf/PDFShading.java +++ b/src/java/org/apache/fop/pdf/PDFShading.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFState.java b/src/java/org/apache/fop/pdf/PDFState.java index ddd1eb498..3946f0c02 100644 --- a/src/java/org/apache/fop/pdf/PDFState.java +++ b/src/java/org/apache/fop/pdf/PDFState.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFStream.java b/src/java/org/apache/fop/pdf/PDFStream.java index 07e134283..ea7748576 100644 --- a/src/java/org/apache/fop/pdf/PDFStream.java +++ b/src/java/org/apache/fop/pdf/PDFStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFT1Stream.java b/src/java/org/apache/fop/pdf/PDFT1Stream.java index 63fc6a0d5..58cbdf758 100644 --- a/src/java/org/apache/fop/pdf/PDFT1Stream.java +++ b/src/java/org/apache/fop/pdf/PDFT1Stream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFTTFStream.java b/src/java/org/apache/fop/pdf/PDFTTFStream.java index 7371b9327..a184f46c6 100644 --- a/src/java/org/apache/fop/pdf/PDFTTFStream.java +++ b/src/java/org/apache/fop/pdf/PDFTTFStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFText.java b/src/java/org/apache/fop/pdf/PDFText.java index bcf628d0e..a172bedf6 100644 --- a/src/java/org/apache/fop/pdf/PDFText.java +++ b/src/java/org/apache/fop/pdf/PDFText.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFUri.java b/src/java/org/apache/fop/pdf/PDFUri.java index 12bf2e5ec..b01b50834 100644 --- a/src/java/org/apache/fop/pdf/PDFUri.java +++ b/src/java/org/apache/fop/pdf/PDFUri.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFWArray.java b/src/java/org/apache/fop/pdf/PDFWArray.java index 2dbbe1bd7..04351c77d 100644 --- a/src/java/org/apache/fop/pdf/PDFWArray.java +++ b/src/java/org/apache/fop/pdf/PDFWArray.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFXMode.java b/src/java/org/apache/fop/pdf/PDFXMode.java index bfaa4aa39..971ce0523 100644 --- a/src/java/org/apache/fop/pdf/PDFXMode.java +++ b/src/java/org/apache/fop/pdf/PDFXMode.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/PDFXObject.java b/src/java/org/apache/fop/pdf/PDFXObject.java index 66c6fecc5..c0306e2bf 100644 --- a/src/java/org/apache/fop/pdf/PDFXObject.java +++ b/src/java/org/apache/fop/pdf/PDFXObject.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/StreamCache.java b/src/java/org/apache/fop/pdf/StreamCache.java index 7234d1b4e..8ac6e13e1 100644 --- a/src/java/org/apache/fop/pdf/StreamCache.java +++ b/src/java/org/apache/fop/pdf/StreamCache.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/StreamCacheFactory.java b/src/java/org/apache/fop/pdf/StreamCacheFactory.java index fdfe826e9..00cfe933e 100644 --- a/src/java/org/apache/fop/pdf/StreamCacheFactory.java +++ b/src/java/org/apache/fop/pdf/StreamCacheFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/TempFileStreamCache.java b/src/java/org/apache/fop/pdf/TempFileStreamCache.java index 116f4e08c..c5f09ed81 100644 --- a/src/java/org/apache/fop/pdf/TempFileStreamCache.java +++ b/src/java/org/apache/fop/pdf/TempFileStreamCache.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/pdf/TransitionDictionary.java b/src/java/org/apache/fop/pdf/TransitionDictionary.java index 75103bbac..bd115bee4 100644 --- a/src/java/org/apache/fop/pdf/TransitionDictionary.java +++ b/src/java/org/apache/fop/pdf/TransitionDictionary.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java b/src/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java index f18be7dfa..ffa76dff4 100644 --- a/src/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java +++ b/src/java/org/apache/fop/render/AbstractFOEventHandlerMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java index a54f6b9b8..350ed3350 100644 --- a/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java +++ b/src/java/org/apache/fop/render/AbstractGenericSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java b/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java index e025f0c5e..b51b71d61 100644 --- a/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/AbstractGraphics2DAdapter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java index 54accb5b8..443d33bdb 100644 --- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java +++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/AbstractRenderer.java b/src/java/org/apache/fop/render/AbstractRenderer.java index 8d1b2016a..562666bdc 100644 --- a/src/java/org/apache/fop/render/AbstractRenderer.java +++ b/src/java/org/apache/fop/render/AbstractRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/AbstractRendererMaker.java b/src/java/org/apache/fop/render/AbstractRendererMaker.java index 3aa63b48c..0c6bea631 100644 --- a/src/java/org/apache/fop/render/AbstractRendererMaker.java +++ b/src/java/org/apache/fop/render/AbstractRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/DefaultFontResolver.java b/src/java/org/apache/fop/render/DefaultFontResolver.java index eb8a9010e..27d8a2356 100644 --- a/src/java/org/apache/fop/render/DefaultFontResolver.java +++ b/src/java/org/apache/fop/render/DefaultFontResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/Graphics2DAdapter.java b/src/java/org/apache/fop/render/Graphics2DAdapter.java index e5b98e21c..2509b3864 100644 --- a/src/java/org/apache/fop/render/Graphics2DAdapter.java +++ b/src/java/org/apache/fop/render/Graphics2DAdapter.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/Graphics2DImagePainter.java b/src/java/org/apache/fop/render/Graphics2DImagePainter.java index 3d946b624..3039a72a7 100644 --- a/src/java/org/apache/fop/render/Graphics2DImagePainter.java +++ b/src/java/org/apache/fop/render/Graphics2DImagePainter.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/ImageAdapter.java b/src/java/org/apache/fop/render/ImageAdapter.java index e49741d05..93d6856d7 100644 --- a/src/java/org/apache/fop/render/ImageAdapter.java +++ b/src/java/org/apache/fop/render/ImageAdapter.java @@ -1,9 +1,10 @@ /*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/PrintRenderer.java b/src/java/org/apache/fop/render/PrintRenderer.java index 4e0718a72..ddb335564 100644 --- a/src/java/org/apache/fop/render/PrintRenderer.java +++ b/src/java/org/apache/fop/render/PrintRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/Renderer.java b/src/java/org/apache/fop/render/Renderer.java index e71f33001..0b763b996 100644 --- a/src/java/org/apache/fop/render/Renderer.java +++ b/src/java/org/apache/fop/render/Renderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/RendererContext.java b/src/java/org/apache/fop/render/RendererContext.java index 15e857675..49f53b327 100644 --- a/src/java/org/apache/fop/render/RendererContext.java +++ b/src/java/org/apache/fop/render/RendererContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/RendererContextConstants.java b/src/java/org/apache/fop/render/RendererContextConstants.java index 742d56f68..ff7f1f6af 100644 --- a/src/java/org/apache/fop/render/RendererContextConstants.java +++ b/src/java/org/apache/fop/render/RendererContextConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/RendererFactory.java b/src/java/org/apache/fop/render/RendererFactory.java index f2c052317..8c35ec65a 100644 --- a/src/java/org/apache/fop/render/RendererFactory.java +++ b/src/java/org/apache/fop/render/RendererFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/XMLHandler.java b/src/java/org/apache/fop/render/XMLHandler.java index f1740594a..7966b3b06 100644 --- a/src/java/org/apache/fop/render/XMLHandler.java +++ b/src/java/org/apache/fop/render/XMLHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/XMLHandlerRegistry.java b/src/java/org/apache/fop/render/XMLHandlerRegistry.java index c972f0322..0a105262f 100644 --- a/src/java/org/apache/fop/render/XMLHandlerRegistry.java +++ b/src/java/org/apache/fop/render/XMLHandlerRegistry.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/afp/AFPFontAttributes.java b/src/java/org/apache/fop/render/afp/AFPFontAttributes.java index 2bb446c3a..9a4c0599f 100644 --- a/src/java/org/apache/fop/render/afp/AFPFontAttributes.java +++ b/src/java/org/apache/fop/render/afp/AFPFontAttributes.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java b/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java index 5b1611ddc..d86de33a3 100644 --- a/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/afp/AFPGraphics2DAdapter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/AFPRenderer.java b/src/java/org/apache/fop/render/afp/AFPRenderer.java index 7afab78a3..8f1636b18 100644 --- a/src/java/org/apache/fop/render/afp/AFPRenderer.java +++ b/src/java/org/apache/fop/render/afp/AFPRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/AFPRendererContextConstants.java b/src/java/org/apache/fop/render/afp/AFPRendererContextConstants.java index 2d10f71e6..88cb73547 100644 --- a/src/java/org/apache/fop/render/afp/AFPRendererContextConstants.java +++ b/src/java/org/apache/fop/render/afp/AFPRendererContextConstants.java @@ -1,9 +1,10 @@ /*
- * Copyright 2006 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/afp/AFPRendererMaker.java b/src/java/org/apache/fop/render/afp/AFPRendererMaker.java index 54715f288..2d6d5711d 100644 --- a/src/java/org/apache/fop/render/afp/AFPRendererMaker.java +++ b/src/java/org/apache/fop/render/afp/AFPRendererMaker.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java index 8640486ce..e04169d9a 100644 --- a/src/java/org/apache/fop/render/afp/AFPSVGHandler.java +++ b/src/java/org/apache/fop/render/afp/AFPSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java b/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java index ea692b1dd..a54e4ad67 100644 --- a/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java +++ b/src/java/org/apache/fop/render/afp/exceptions/FontRuntimeException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java b/src/java/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java index 3e8c1d947..0554dd90a 100644 --- a/src/java/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java +++ b/src/java/org/apache/fop/render/afp/exceptions/NestedRuntimeException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java b/src/java/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java index d04247196..3cec455a0 100644 --- a/src/java/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java +++ b/src/java/org/apache/fop/render/afp/exceptions/RendererRuntimeException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java b/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java index 421408902..2b5666e26 100755 --- a/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPAttribute.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPElement.java b/src/java/org/apache/fop/render/afp/extensions/AFPElement.java index 32868fd3c..8ee8cca42 100755 --- a/src/java/org/apache/fop/render/afp/extensions/AFPElement.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java b/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java index 53421021e..eb7a5158f 100755 --- a/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java index a3984d2be..415d1656b 100644 --- a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetup.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java index cbdde917e..3dc5860ab 100644 --- a/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java +++ b/src/java/org/apache/fop/render/afp/extensions/AFPPageSetupElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java b/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java index b8dc7c740..54bdc9fb0 100644 --- a/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java +++ b/src/java/org/apache/fop/render/afp/extensions/AbstractAFPExtensionObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/AFPFont.java b/src/java/org/apache/fop/render/afp/fonts/AFPFont.java index b7f27d65e..cca5e4d74 100644 --- a/src/java/org/apache/fop/render/afp/fonts/AFPFont.java +++ b/src/java/org/apache/fop/render/afp/fonts/AFPFont.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java b/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java index ce08d4131..42f333a66 100644 --- a/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java +++ b/src/java/org/apache/fop/render/afp/fonts/AFPFontInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java b/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java index cb8718d8f..ad3a04d06 100644 --- a/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java +++ b/src/java/org/apache/fop/render/afp/fonts/AFPFontReader.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java b/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java index ac39eff85..75e56ea5e 100644 --- a/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java +++ b/src/java/org/apache/fop/render/afp/fonts/CharacterSet.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java b/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java index 084edfb5e..6389b1387 100644 --- a/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java +++ b/src/java/org/apache/fop/render/afp/fonts/CharacterSetOrientation.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java b/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java index ff8f9240e..67cd5b266 100644 --- a/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java +++ b/src/java/org/apache/fop/render/afp/fonts/FopCharacterSet.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java b/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java index eabd3f631..3cb91b6b5 100644 --- a/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java +++ b/src/java/org/apache/fop/render/afp/fonts/OutlineFont.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/fonts/RasterFont.java b/src/java/org/apache/fop/render/afp/fonts/RasterFont.java index cec80c59c..879f35769 100644 --- a/src/java/org/apache/fop/render/afp/fonts/RasterFont.java +++ b/src/java/org/apache/fop/render/afp/fonts/RasterFont.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/AFPConstants.java b/src/java/org/apache/fop/render/afp/modca/AFPConstants.java index 9c23e3fbd..fc79c8bc6 100644 --- a/src/java/org/apache/fop/render/afp/modca/AFPConstants.java +++ b/src/java/org/apache/fop/render/afp/modca/AFPConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java b/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java index 0babc927a..238c2021e 100644 --- a/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java +++ b/src/java/org/apache/fop/render/afp/modca/AFPDataStream.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java b/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java index c7905ea76..1720229d2 100644 --- a/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java +++ b/src/java/org/apache/fop/render/afp/modca/AbstractAFPObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java b/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java index 68301f40b..b4e4022a7 100644 --- a/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java +++ b/src/java/org/apache/fop/render/afp/modca/AbstractNamedAFPObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java b/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java index cc880c09f..90c92e4f0 100644 --- a/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java +++ b/src/java/org/apache/fop/render/afp/modca/AbstractPageObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java b/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java index 3fb7ac224..067997776 100644 --- a/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java +++ b/src/java/org/apache/fop/render/afp/modca/ActiveEnvironmentGroup.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/Document.java b/src/java/org/apache/fop/render/afp/modca/Document.java index 10e5a4b31..b409e5567 100644 --- a/src/java/org/apache/fop/render/afp/modca/Document.java +++ b/src/java/org/apache/fop/render/afp/modca/Document.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/EndPageGroup.java b/src/java/org/apache/fop/render/afp/modca/EndPageGroup.java index afa720d71..295bb2667 100644 --- a/src/java/org/apache/fop/render/afp/modca/EndPageGroup.java +++ b/src/java/org/apache/fop/render/afp/modca/EndPageGroup.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/IMImageObject.java b/src/java/org/apache/fop/render/afp/modca/IMImageObject.java index 9a6e195d1..b848a1e2e 100644 --- a/src/java/org/apache/fop/render/afp/modca/IMImageObject.java +++ b/src/java/org/apache/fop/render/afp/modca/IMImageObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageCellPosition.java b/src/java/org/apache/fop/render/afp/modca/ImageCellPosition.java index aa97e585c..db0b2e2f4 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageCellPosition.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageCellPosition.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageContent.java b/src/java/org/apache/fop/render/afp/modca/ImageContent.java index 9479f4742..3c242c7de 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageContent.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageContent.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java b/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java index 25f06c717..9250f0c7f 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageDataDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageInputDescriptor.java b/src/java/org/apache/fop/render/afp/modca/ImageInputDescriptor.java index eeef6b712..071cdcee9 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageInputDescriptor.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageInputDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageObject.java b/src/java/org/apache/fop/render/afp/modca/ImageObject.java index fc027b8af..ffb036380 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageObject.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageOutputControl.java b/src/java/org/apache/fop/render/afp/modca/ImageOutputControl.java index 8a2aaaede..19d8d1768 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageOutputControl.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageOutputControl.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageRasterData.java b/src/java/org/apache/fop/render/afp/modca/ImageRasterData.java index 9c815cb6f..014231e51 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageRasterData.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageRasterData.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageRasterPattern.java b/src/java/org/apache/fop/render/afp/modca/ImageRasterPattern.java index 673f04cad..422eeb33d 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageRasterPattern.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageRasterPattern.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageSegment.java b/src/java/org/apache/fop/render/afp/modca/ImageSegment.java index 9a27b79f7..435a70e1b 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageSegment.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageSegment.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ImageSizeParameter.java b/src/java/org/apache/fop/render/afp/modca/ImageSizeParameter.java index 46e93181e..bce7fa6e4 100644 --- a/src/java/org/apache/fop/render/afp/modca/ImageSizeParameter.java +++ b/src/java/org/apache/fop/render/afp/modca/ImageSizeParameter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/IncludeObject.java b/src/java/org/apache/fop/render/afp/modca/IncludeObject.java index 257cf1ee1..c829c6548 100644 --- a/src/java/org/apache/fop/render/afp/modca/IncludeObject.java +++ b/src/java/org/apache/fop/render/afp/modca/IncludeObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/IncludePageOverlay.java b/src/java/org/apache/fop/render/afp/modca/IncludePageOverlay.java index 4fb8b9cfe..cc4c0a4c6 100644 --- a/src/java/org/apache/fop/render/afp/modca/IncludePageOverlay.java +++ b/src/java/org/apache/fop/render/afp/modca/IncludePageOverlay.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/IncludePageSegment.java b/src/java/org/apache/fop/render/afp/modca/IncludePageSegment.java index 5db736d57..4ca8b0832 100644 --- a/src/java/org/apache/fop/render/afp/modca/IncludePageSegment.java +++ b/src/java/org/apache/fop/render/afp/modca/IncludePageSegment.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/InvokeMediumMap.java b/src/java/org/apache/fop/render/afp/modca/InvokeMediumMap.java index 14570ec27..c866ab1e2 100644 --- a/src/java/org/apache/fop/render/afp/modca/InvokeMediumMap.java +++ b/src/java/org/apache/fop/render/afp/modca/InvokeMediumMap.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java b/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java index 9290dfcdd..81b2b2598 100644 --- a/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java +++ b/src/java/org/apache/fop/render/afp/modca/MapCodedFont.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java b/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java index b2821b650..f5f7a3074 100644 --- a/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java +++ b/src/java/org/apache/fop/render/afp/modca/MapPageOverlay.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java b/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java index add47a00f..988ca01eb 100644 --- a/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java +++ b/src/java/org/apache/fop/render/afp/modca/MaximumSizeExceededException.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java b/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java index fbefef066..45335e3e0 100644 --- a/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java +++ b/src/java/org/apache/fop/render/afp/modca/ObjectAreaDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java b/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java index 7089a4103..e500c1269 100644 --- a/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java +++ b/src/java/org/apache/fop/render/afp/modca/ObjectAreaPosition.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java b/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java index 91d697e83..dea3baab7 100644 --- a/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java +++ b/src/java/org/apache/fop/render/afp/modca/ObjectEnvironmentGroup.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/Overlay.java b/src/java/org/apache/fop/render/afp/modca/Overlay.java index 85d8b2abb..c6a7679e5 100644 --- a/src/java/org/apache/fop/render/afp/modca/Overlay.java +++ b/src/java/org/apache/fop/render/afp/modca/Overlay.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java b/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java index 3132f1778..e92099276 100644 --- a/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java +++ b/src/java/org/apache/fop/render/afp/modca/PageDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/PageGroup.java b/src/java/org/apache/fop/render/afp/modca/PageGroup.java index ea78d7677..84e7149bc 100644 --- a/src/java/org/apache/fop/render/afp/modca/PageGroup.java +++ b/src/java/org/apache/fop/render/afp/modca/PageGroup.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/PageObject.java b/src/java/org/apache/fop/render/afp/modca/PageObject.java index 102d7380e..a85194f3b 100644 --- a/src/java/org/apache/fop/render/afp/modca/PageObject.java +++ b/src/java/org/apache/fop/render/afp/modca/PageObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java b/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java index bd659c59d..98beb96f7 100644 --- a/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java +++ b/src/java/org/apache/fop/render/afp/modca/PresentationTextData.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java b/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java index a205f026f..a093dc680 100644 --- a/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java +++ b/src/java/org/apache/fop/render/afp/modca/PresentationTextDescriptor.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java b/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java index eb7d5c1cd..00931ad2c 100644 --- a/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java +++ b/src/java/org/apache/fop/render/afp/modca/PresentationTextObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java b/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java index 0cfb53870..0a0b66301 100644 --- a/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java +++ b/src/java/org/apache/fop/render/afp/modca/ResourceGroup.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java b/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java index ca28154e6..779e64511 100644 --- a/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java +++ b/src/java/org/apache/fop/render/afp/modca/TagLogicalElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java b/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java index 1784dfebd..8e6e79914 100644 --- a/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java +++ b/src/java/org/apache/fop/render/afp/modca/TagLogicalElementBean.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java b/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java index 4dead37ac..5ac7ad9a3 100644 --- a/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java +++ b/src/java/org/apache/fop/render/afp/tools/BinaryUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java b/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java index ffdab85e4..73e2c29f0 100644 --- a/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java +++ b/src/java/org/apache/fop/render/afp/tools/DTDEntityResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/tools/StringUtils.java b/src/java/org/apache/fop/render/afp/tools/StringUtils.java index 67b578446..c49509aa0 100644 --- a/src/java/org/apache/fop/render/afp/tools/StringUtils.java +++ b/src/java/org/apache/fop/render/afp/tools/StringUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java b/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java index 4c1a52f3e..4871c9528 100644 --- a/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java +++ b/src/java/org/apache/fop/render/afp/tools/StructuredFieldReader.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/AWTRenderer.java b/src/java/org/apache/fop/render/awt/AWTRenderer.java index 802be2409..6a50c0294 100644 --- a/src/java/org/apache/fop/render/awt/AWTRenderer.java +++ b/src/java/org/apache/fop/render/awt/AWTRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/AWTRendererMaker.java b/src/java/org/apache/fop/render/awt/AWTRendererMaker.java index c094d32ed..8b74a8bfa 100644 --- a/src/java/org/apache/fop/render/awt/AWTRendererMaker.java +++ b/src/java/org/apache/fop/render/awt/AWTRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/awt/package.html b/src/java/org/apache/fop/render/awt/package.html index 72f92746d..0b65a5e90 100644 --- a/src/java/org/apache/fop/render/awt/package.html +++ b/src/java/org/apache/fop/render/awt/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/awt/viewer/Command.java b/src/java/org/apache/fop/render/awt/viewer/Command.java index 66ff5c21b..b7872a1ed 100644 --- a/src/java/org/apache/fop/render/awt/viewer/Command.java +++ b/src/java/org/apache/fop/render/awt/viewer/Command.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java b/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java index 809168561..376280159 100644 --- a/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java +++ b/src/java/org/apache/fop/render/awt/viewer/GoToPageDialog.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java b/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java index e9933b137..cc00244fc 100644 --- a/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java +++ b/src/java/org/apache/fop/render/awt/viewer/ImageProxyPanel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java b/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java index 4851cd8c5..55ebfc702 100644 --- a/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java +++ b/src/java/org/apache/fop/render/awt/viewer/PreviewDialog.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/PreviewDialogAboutBox.java b/src/java/org/apache/fop/render/awt/viewer/PreviewDialogAboutBox.java index 1c64194c4..f6e8028aa 100644 --- a/src/java/org/apache/fop/render/awt/viewer/PreviewDialogAboutBox.java +++ b/src/java/org/apache/fop/render/awt/viewer/PreviewDialogAboutBox.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java b/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java index abd053811..1512f4eb9 100644 --- a/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java +++ b/src/java/org/apache/fop/render/awt/viewer/PreviewPanel.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/Renderable.java b/src/java/org/apache/fop/render/awt/viewer/Renderable.java index 9b069a231..5324ff8d7 100644 --- a/src/java/org/apache/fop/render/awt/viewer/Renderable.java +++ b/src/java/org/apache/fop/render/awt/viewer/Renderable.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/StatusListener.java b/src/java/org/apache/fop/render/awt/viewer/StatusListener.java index 4aeb1f73f..6a7cf7d9b 100644 --- a/src/java/org/apache/fop/render/awt/viewer/StatusListener.java +++ b/src/java/org/apache/fop/render/awt/viewer/StatusListener.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/Translator.java b/src/java/org/apache/fop/render/awt/viewer/Translator.java index b9498fcc3..6ae76be5b 100644 --- a/src/java/org/apache/fop/render/awt/viewer/Translator.java +++ b/src/java/org/apache/fop/render/awt/viewer/Translator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer.properties b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer.properties index ae11efac5..27ee88a14 100644 --- a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer.properties +++ b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer.properties @@ -1,9 +1,10 @@ # -# Copyright 1999-2005 The Apache Software Foundation. -# -# Licensed 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 +# 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 # diff --git a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties index a61116dc5..0da9426c1 100644 --- a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties +++ b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_de.properties @@ -1,9 +1,10 @@ # -# Copyright 1999-2005 The Apache Software Foundation. -# -# Licensed 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 +# 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 # diff --git a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties index cd0030595..d19f36c00 100644 --- a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties +++ b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_fr.properties @@ -1,9 +1,10 @@ # -# Copyright 1999-2005 The Apache Software Foundation. -# -# Licensed 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 +# 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 # diff --git a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties index 8f593bce7..471449cb9 100644 --- a/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties +++ b/src/java/org/apache/fop/render/awt/viewer/resources/Viewer_it.properties @@ -1,9 +1,10 @@ # -# Copyright 1999-2005 The Apache Software Foundation. -# -# Licensed 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 +# 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 # diff --git a/src/java/org/apache/fop/render/bitmap/PNGRenderer.java b/src/java/org/apache/fop/render/bitmap/PNGRenderer.java index e89275484..42d7c2840 100644 --- a/src/java/org/apache/fop/render/bitmap/PNGRenderer.java +++ b/src/java/org/apache/fop/render/bitmap/PNGRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java b/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java index bb21c496c..5fe35b667 100644 --- a/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java +++ b/src/java/org/apache/fop/render/bitmap/PNGRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java b/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java index 1426d0cbe..e02c015ae 100644 --- a/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java +++ b/src/java/org/apache/fop/render/bitmap/PNGRenderer_onthefly.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java b/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java index 5379e6998..428ed6ccc 100644 --- a/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java +++ b/src/java/org/apache/fop/render/bitmap/TIFFRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java b/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java index 3aaa01414..ee2ba75fd 100644 --- a/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java +++ b/src/java/org/apache/fop/render/bitmap/TIFFRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/bitmap/package.html b/src/java/org/apache/fop/render/bitmap/package.html index 3fbc7722e..c5fe901bd 100644 --- a/src/java/org/apache/fop/render/bitmap/package.html +++ b/src/java/org/apache/fop/render/bitmap/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java b/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java index 6890300e9..249b1d832 100644 --- a/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java +++ b/src/java/org/apache/fop/render/java2d/FontMetricsMapper.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/FontSetup.java b/src/java/org/apache/fop/render/java2d/FontSetup.java index 3265edfa1..ceda8f16c 100644 --- a/src/java/org/apache/fop/render/java2d/FontSetup.java +++ b/src/java/org/apache/fop/render/java2d/FontSetup.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java b/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java index 0ddc44bbf..64e329c62 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java +++ b/src/java/org/apache/fop/render/java2d/Java2DFontMetrics.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java b/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java index 2f89632fe..050a249fd 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/java2d/Java2DGraphics2DAdapter.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java b/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java index aa3acdb23..a24bdfbde 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java +++ b/src/java/org/apache/fop/render/java2d/Java2DGraphicsState.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/Java2DRenderer.java b/src/java/org/apache/fop/render/java2d/Java2DRenderer.java index 3405c3ae4..6a8e34187 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DRenderer.java +++ b/src/java/org/apache/fop/render/java2d/Java2DRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java b/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java index 9480c1520..0fd87f910 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java +++ b/src/java/org/apache/fop/render/java2d/Java2DRendererContextConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java index ec351ae9b..f5b5c1670 100644 --- a/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java +++ b/src/java/org/apache/fop/render/java2d/Java2DSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/java2d/package.html b/src/java/org/apache/fop/render/java2d/package.html index 8cb4d714a..7b3fc921c 100644 --- a/src/java/org/apache/fop/render/java2d/package.html +++ b/src/java/org/apache/fop/render/java2d/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java b/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java index 43580446f..ee46706c4 100644 --- a/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java +++ b/src/java/org/apache/fop/render/pcl/DefaultMonochromeBitmapConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java b/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java index 4818b2b1d..ff3fb0b74 100644 --- a/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java +++ b/src/java/org/apache/fop/render/pcl/JAIMonochromeBitmapConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java b/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java index f2db9d798..aae0b90ce 100644 --- a/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java +++ b/src/java/org/apache/fop/render/pcl/MonochromeBitmapConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLGenerator.java b/src/java/org/apache/fop/render/pcl/PCLGenerator.java index 29b9fd76e..3eb8ec425 100644 --- a/src/java/org/apache/fop/render/pcl/PCLGenerator.java +++ b/src/java/org/apache/fop/render/pcl/PCLGenerator.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java b/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java index 0e27a8d29..825a29bd3 100644 --- a/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java +++ b/src/java/org/apache/fop/render/pcl/PCLGraphics2D.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLGraphics2DAdapter.java b/src/java/org/apache/fop/render/pcl/PCLGraphics2DAdapter.java index d2e91f8e6..106417ab9 100644 --- a/src/java/org/apache/fop/render/pcl/PCLGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/pcl/PCLGraphics2DAdapter.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLPageDefinition.java b/src/java/org/apache/fop/render/pcl/PCLPageDefinition.java index 43978e954..dc5d5fd32 100644 --- a/src/java/org/apache/fop/render/pcl/PCLPageDefinition.java +++ b/src/java/org/apache/fop/render/pcl/PCLPageDefinition.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLRenderer.java b/src/java/org/apache/fop/render/pcl/PCLRenderer.java index 36031f7ec..5b198a8fd 100644 --- a/src/java/org/apache/fop/render/pcl/PCLRenderer.java +++ b/src/java/org/apache/fop/render/pcl/PCLRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLRendererContext.java b/src/java/org/apache/fop/render/pcl/PCLRendererContext.java index ae5646db8..32510137b 100644 --- a/src/java/org/apache/fop/render/pcl/PCLRendererContext.java +++ b/src/java/org/apache/fop/render/pcl/PCLRendererContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/PCLRendererMaker.java b/src/java/org/apache/fop/render/pcl/PCLRendererMaker.java index 2e39d355a..aa0bc292b 100644 --- a/src/java/org/apache/fop/render/pcl/PCLRendererMaker.java +++ b/src/java/org/apache/fop/render/pcl/PCLRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java b/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java index 7c1a45a0d..7a7d0b6d4 100644 --- a/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java +++ b/src/java/org/apache/fop/render/pcl/PCLSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java b/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java index b25ab9321..9a7916b65 100644 --- a/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java +++ b/src/java/org/apache/fop/render/pcl/extensions/PCLElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pcl/package.html b/src/java/org/apache/fop/render/pcl/package.html index ba47bd289..e5bf81ed9 100644 --- a/src/java/org/apache/fop/render/pcl/package.html +++ b/src/java/org/apache/fop/render/pcl/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/pdf/CTMHelper.java b/src/java/org/apache/fop/render/pdf/CTMHelper.java index 1dafa4d8b..002ee857d 100644 --- a/src/java/org/apache/fop/render/pdf/CTMHelper.java +++ b/src/java/org/apache/fop/render/pdf/CTMHelper.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pdf/FopPDFImage.java b/src/java/org/apache/fop/render/pdf/FopPDFImage.java index d5c1150e4..e78ecbdba 100644 --- a/src/java/org/apache/fop/render/pdf/FopPDFImage.java +++ b/src/java/org/apache/fop/render/pdf/FopPDFImage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java b/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java index 9598037b9..8c96d5c23 100644 --- a/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/pdf/PDFGraphics2DAdapter.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/pdf/PDFRenderer.java b/src/java/org/apache/fop/render/pdf/PDFRenderer.java index bce566996..0e3ff63e5 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRenderer.java +++ b/src/java/org/apache/fop/render/pdf/PDFRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pdf/PDFRendererContextConstants.java b/src/java/org/apache/fop/render/pdf/PDFRendererContextConstants.java index f2144dfe3..d3efa9667 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRendererContextConstants.java +++ b/src/java/org/apache/fop/render/pdf/PDFRendererContextConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pdf/PDFRendererMaker.java b/src/java/org/apache/fop/render/pdf/PDFRendererMaker.java index cbab95260..0f8d8bc14 100644 --- a/src/java/org/apache/fop/render/pdf/PDFRendererMaker.java +++ b/src/java/org/apache/fop/render/pdf/PDFRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java b/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java index ad306a7ae..bf90191b2 100644 --- a/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java +++ b/src/java/org/apache/fop/render/pdf/PDFSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/pdf/package.html b/src/java/org/apache/fop/render/pdf/package.html index 699697837..8b33b16e3 100644 --- a/src/java/org/apache/fop/render/pdf/package.html +++ b/src/java/org/apache/fop/render/pdf/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/print/PrintRenderer.java b/src/java/org/apache/fop/render/print/PrintRenderer.java index 5faee2dd3..20d46ee4a 100644 --- a/src/java/org/apache/fop/render/print/PrintRenderer.java +++ b/src/java/org/apache/fop/render/print/PrintRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/print/PrintRendererMaker.java b/src/java/org/apache/fop/render/print/PrintRendererMaker.java index 39e7fa921..046427682 100644 --- a/src/java/org/apache/fop/render/print/PrintRendererMaker.java +++ b/src/java/org/apache/fop/render/print/PrintRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/print/package.html b/src/java/org/apache/fop/render/print/package.html index d7fc5efc8..7a93d488b 100644 --- a/src/java/org/apache/fop/render/print/package.html +++ b/src/java/org/apache/fop/render/print/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java b/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java index bf960185d..9795bd54a 100644 --- a/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java +++ b/src/java/org/apache/fop/render/ps/AbstractPSTranscoder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/EPSTranscoder.java b/src/java/org/apache/fop/render/ps/EPSTranscoder.java index 8ca7c9b5b..a6d6c12a2 100644 --- a/src/java/org/apache/fop/render/ps/EPSTranscoder.java +++ b/src/java/org/apache/fop/render/ps/EPSTranscoder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/NativeTextHandler.java b/src/java/org/apache/fop/render/ps/NativeTextHandler.java index 2578b4c78..47f7fb0b8 100644 --- a/src/java/org/apache/fop/render/ps/NativeTextHandler.java +++ b/src/java/org/apache/fop/render/ps/NativeTextHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSFontUtils.java b/src/java/org/apache/fop/render/ps/PSFontUtils.java index f56e18bb9..5ece1fae9 100644 --- a/src/java/org/apache/fop/render/ps/PSFontUtils.java +++ b/src/java/org/apache/fop/render/ps/PSFontUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2001-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java b/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java index 1464f4463..fa94d9a24 100644 --- a/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java +++ b/src/java/org/apache/fop/render/ps/PSGraphics2DAdapter.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005-2006 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/ps/PSImageUtils.java b/src/java/org/apache/fop/render/ps/PSImageUtils.java index 9d6314f9d..a5b6675e3 100644 --- a/src/java/org/apache/fop/render/ps/PSImageUtils.java +++ b/src/java/org/apache/fop/render/ps/PSImageUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSRenderer.java b/src/java/org/apache/fop/render/ps/PSRenderer.java index e37e3734c..75c3817f1 100644 --- a/src/java/org/apache/fop/render/ps/PSRenderer.java +++ b/src/java/org/apache/fop/render/ps/PSRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java b/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java index 210c1b9a1..f5a5cc89f 100644 --- a/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java +++ b/src/java/org/apache/fop/render/ps/PSRendererContextConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSRendererMaker.java b/src/java/org/apache/fop/render/ps/PSRendererMaker.java index 077e45d72..45f7663aa 100644 --- a/src/java/org/apache/fop/render/ps/PSRendererMaker.java +++ b/src/java/org/apache/fop/render/ps/PSRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/ps/PSSVGHandler.java b/src/java/org/apache/fop/render/ps/PSSVGHandler.java index e0ea029ad..191fee5d9 100644 --- a/src/java/org/apache/fop/render/ps/PSSVGHandler.java +++ b/src/java/org/apache/fop/render/ps/PSSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java index a86acc3d1..0f41ca525 100644 --- a/src/java/org/apache/fop/render/ps/PSTextElementBridge.java +++ b/src/java/org/apache/fop/render/ps/PSTextElementBridge.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -32,7 +33,7 @@ import org.w3c.dom.Node; * for the element is simple. * * @author <a href="mailto:fop-dev@xml.apache.org">Apache XML FOP Development Team</a> - * @version $Id: PSTextElementBridge.java,v 1.2 2003/03/07 09:46:30 jeremias Exp $ + * @version $Id$ */ public class PSTextElementBridge extends SVGTextElementBridge { diff --git a/src/java/org/apache/fop/render/ps/PSTextPainter.java b/src/java/org/apache/fop/render/ps/PSTextPainter.java index c42f3647b..78efd56b9 100644 --- a/src/java/org/apache/fop/render/ps/PSTextPainter.java +++ b/src/java/org/apache/fop/render/ps/PSTextPainter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/PSTranscoder.java b/src/java/org/apache/fop/render/ps/PSTranscoder.java index 5289f8272..bc33bae87 100644 --- a/src/java/org/apache/fop/render/ps/PSTranscoder.java +++ b/src/java/org/apache/fop/render/ps/PSTranscoder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java b/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java index 491af6b50..c583672de 100644 --- a/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java +++ b/src/java/org/apache/fop/render/ps/extensions/AbstractPSExtensionObject.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java b/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java index 3903d7bcb..44b22284d 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSExtensionElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java b/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java index 401202dc0..cd9f6b67d 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandlerFactory.java b/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandlerFactory.java index e2b85adbf..f268a4940 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandlerFactory.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSExtensionHandlerFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java b/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java index 7b334c122..4c7d7122c 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSPageSetupCodeElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java b/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java index 49cb22979..d18403974 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSSetupCode.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java b/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java index 1fa00eaa0..69158625f 100644 --- a/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java +++ b/src/java/org/apache/fop/render/ps/extensions/PSSetupCodeElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/ps/extensions/package.html b/src/java/org/apache/fop/render/ps/extensions/package.html index 38c7f9526..b52d4d46a 100644 --- a/src/java/org/apache/fop/render/ps/extensions/package.html +++ b/src/java/org/apache/fop/render/ps/extensions/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/ps/package.html b/src/java/org/apache/fop/render/ps/package.html index da6e40da9..53554c38d 100644 --- a/src/java/org/apache/fop/render/ps/package.html +++ b/src/java/org/apache/fop/render/ps/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java b/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java index 7517f86d0..5d6a7f64e 100644 --- a/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/BorderAttributesConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java b/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java index 8322fd42f..9c8fe1cf5 100755 --- a/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java +++ b/src/java/org/apache/fop/render/rtf/FOPRtfAttributes.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java b/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java index 0f90b1b9a..8a7e2612b 100644 --- a/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java +++ b/src/java/org/apache/fop/render/rtf/FoUnitsConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java index 03307c700..4131b814d 100644 --- a/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/ListAttributesConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java index 2b1af81fd..50355e145 100644 --- a/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/PageAttributesConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java b/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java index 118e33640..5d3be985d 100644 --- a/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java +++ b/src/java/org/apache/fop/render/rtf/RTFFOEventHandlerMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/rtf/RTFHandler.java b/src/java/org/apache/fop/render/rtf/RTFHandler.java index d50cd7a61..c751a424e 100644 --- a/src/java/org/apache/fop/render/rtf/RTFHandler.java +++ b/src/java/org/apache/fop/render/rtf/RTFHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/SVGConverter.java b/src/java/org/apache/fop/render/rtf/SVGConverter.java index e608c6f1d..11ba8dc82 100644 --- a/src/java/org/apache/fop/render/rtf/SVGConverter.java +++ b/src/java/org/apache/fop/render/rtf/SVGConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java index 24d5e1825..7b8abee67 100644 --- a/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TableAttributesConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java index 94707ac07..d85a634b8 100644 --- a/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java +++ b/src/java/org/apache/fop/render/rtf/TextAttributesConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/package.html b/src/java/org/apache/fop/render/rtf/package.html index 886af8fd5..84be02e97 100644 --- a/src/java/org/apache/fop/render/rtf/package.html +++ b/src/java/org/apache/fop/render/rtf/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java index 6c2ca80ec..d1fd0192e 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java index c2a8ef487..f3502b4aa 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/exceptions/RtfStructureException.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java index 3e86019ef..89cd45efc 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IBorderAttributes.java @@ -1,9 +1,10 @@ /*
- * Copyright 1999-2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java index 51bda2258..6afba3ba1 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfAfterContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java index 31f9907a1..7966010b6 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBeforeContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java index 7b286dbe5..afbbba04b 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfBookmarkContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java index c755f6d1e..568c33996 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfExternalGraphicContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java index b8161fa3e..9bc096e7a 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfHyperLinkContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java index 105377639..d341f80fe 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfJforCmdContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java index 07e365ff7..7e2936ea8 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfListContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java index 7fd353562..e620ff996 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfOptions.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java index d12c00894..6c49e7c08 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageBreakContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java index e3bc82096..a7cca6dcf 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java index d0427c240..16f4a4af3 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberCitationContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java index 8d7630bb0..1aa5820fb 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfPageNumberContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java index 3507f1224..f2c9b0aa6 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java index a99447732..74a50b8b5 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfParagraphKeepTogetherContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java index 7806a676d..a61edf803 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTableContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java index 0e9a37c99..1545df320 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java index 7d8eed6c3..58ca07196 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IRtfTextrunContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java index 56f916bd0..3493d9ba4 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableAttributes.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -14,7 +15,7 @@ * limitations under the License. */ -/* $Id:$ */ +/* $Id$ */ package org.apache.fop.render.rtf.rtflib.rtfdoc; diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java index 2f624fa7d..d94563c69 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ITableColumnsInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java index 7dd4a6bc4..5a8b6a5b9 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/IrtfTemplateContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java index 4861af924..79171cb47 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/ParagraphKeeptogetherContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java index 64ed14698..75abb5fbb 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java index 2c1234592..f71075d96 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAfterBeforeBase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java index 86909401c..92d6a5655 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfAttributes.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java index 05c6a1a36..c48d50ec9 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBefore.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java index 302a853ef..23883f672 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmark.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java index 7122a5cfd..986e79c0c 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfBookmarkContainerImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java index ac3146f9f..641202c99 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfColorTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java index 57564b36d..a3db213c4 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfContainer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java index 885499415..3e37ec9d7 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfDocumentArea.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java index 0c48f3264..3e64a0f7d 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java index f73709e5c..eccac81c1 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExternalGraphic.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java index b75321cc1..73f5cfa37 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfExtraRowSet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java index e7574e25d..fa0728533 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFile.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java index 8288fe7cd..26c95e200 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontManager.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java index 6bc4c1b5d..33a8169f8 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFontTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java index f23b1d88c..d91a63c0e 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfFootnote.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java index 9f061cc9a..bc3fae7b0 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfGenerator.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java index 5d66e5a8f..7e75e97f5 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHeader.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java index 9973f56d7..4924e6829 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfHyperLink.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java index c30a24030..d018e52a0 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfJforCmd.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java index d46294e40..cce3d8697 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfLineBreak.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java index 9dbb9ef1a..a559c4c61 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfList.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java index 574c6625d..3638dc11f 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListItem.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java index a4e85f684..7ae121c3f 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyle.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java index 02a79e841..c39797924 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleBullet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java index 7d08ae85f..874d909fe 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleNumber.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java index 6091d58f8..a637ec4b7 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListStyleText.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java index a9df180b1..2f4988a20 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfListTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java index a8341bc6e..6f8b6afc3 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfNull.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java index 5f03bdabc..788eef147 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfOptions.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java index 6906e28e4..bd2e9e62d 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPage.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java index 6ae232900..488a49a30 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageArea.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java index ee676f263..7335e8a81 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageBreak.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java index 4e5e6801a..7a9641ee8 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumber.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java index ee07bf038..c7f455c70 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfPageNumberCitation.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java index 5d62788fb..8cf71d68e 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraph.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java index 86eeac41b..1fa6166d9 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfParagraphKeepTogether.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java index 86043fd3b..88c7e599b 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSection.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java index f7340842b..2983f9ca7 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java index d42d4a5d1..19db4dc6a 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfSpaceSplitter.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java index 8657315d7..a9b531ca3 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfString.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java index abbd8b485..04275fd72 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStringConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java index 583545e44..fdbe94cfc 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfStyleSheetTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java index d33ebdad4..b8bb4b032 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java index ceaaf24ad..b71a473f1 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableCell.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java index 25e14d3e9..2182f94ec 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTableRow.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java index 6644c3956..fa4cf3978 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTemplate.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java index 17cf10c4c..3dc2e59e0 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfText.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java index 55d4ffd40..05a97ffd4 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/RtfTextrun.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java index 77227e55f..c690a287b 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/rtfdoc/WhitespaceCollapser.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java index 257d4a506..8684e91ef 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/BuilderContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -14,7 +15,7 @@ * limitations under the License. */ -/* $Id: BuilderContext.java 227252 2005-08-03 19:30:55Z jeremias $ */ +/* $Id$ */ package org.apache.fop.render.rtf.rtflib.tools; diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java index 47b3b716e..274ad53f5 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java index 20dbfca1b..93bb991e8 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/ImageUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java b/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java index 176e173de..826be58e7 100644 --- a/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java +++ b/src/java/org/apache/fop/render/rtf/rtflib/tools/TableContext.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/Helper.java b/src/java/org/apache/fop/render/txt/Helper.java index fe44e4ec1..e00e930c2 100644 --- a/src/java/org/apache/fop/render/txt/Helper.java +++ b/src/java/org/apache/fop/render/txt/Helper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/TXTFOEventHandlerMaker.java b/src/java/org/apache/fop/render/txt/TXTFOEventHandlerMaker.java index ddc981a40..20f76956c 100644 --- a/src/java/org/apache/fop/render/txt/TXTFOEventHandlerMaker.java +++ b/src/java/org/apache/fop/render/txt/TXTFOEventHandlerMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/txt/TXTHandler.java b/src/java/org/apache/fop/render/txt/TXTHandler.java index 671f8aa58..0aea450a1 100644 --- a/src/java/org/apache/fop/render/txt/TXTHandler.java +++ b/src/java/org/apache/fop/render/txt/TXTHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/TXTRenderer.java b/src/java/org/apache/fop/render/txt/TXTRenderer.java index a45199242..85d3dd797 100644 --- a/src/java/org/apache/fop/render/txt/TXTRenderer.java +++ b/src/java/org/apache/fop/render/txt/TXTRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/TXTRendererMaker.java b/src/java/org/apache/fop/render/txt/TXTRendererMaker.java index 026c7996c..5c1b812b6 100644 --- a/src/java/org/apache/fop/render/txt/TXTRendererMaker.java +++ b/src/java/org/apache/fop/render/txt/TXTRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/txt/TXTState.java b/src/java/org/apache/fop/render/txt/TXTState.java index b63f04922..172b5eb9c 100644 --- a/src/java/org/apache/fop/render/txt/TXTState.java +++ b/src/java/org/apache/fop/render/txt/TXTState.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/TXTStream.java b/src/java/org/apache/fop/render/txt/TXTStream.java index 617acd2a7..57797eb86 100644 --- a/src/java/org/apache/fop/render/txt/TXTStream.java +++ b/src/java/org/apache/fop/render/txt/TXTStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java b/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java index d02a8da1b..80f8dc01c 100644 --- a/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java +++ b/src/java/org/apache/fop/render/txt/border/AbstractBorderElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/border/BorderManager.java b/src/java/org/apache/fop/render/txt/border/BorderManager.java index 2e20d0cd3..4a470a37f 100644 --- a/src/java/org/apache/fop/render/txt/border/BorderManager.java +++ b/src/java/org/apache/fop/render/txt/border/BorderManager.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java b/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java index 7e7aa7acd..97c98388a 100644 --- a/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java +++ b/src/java/org/apache/fop/render/txt/border/DashedBorderElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java b/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java index 8e693974b..b3871658c 100644 --- a/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java +++ b/src/java/org/apache/fop/render/txt/border/DottedBorderElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java b/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java index 72ca9d2dc..f41ca092f 100644 --- a/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java +++ b/src/java/org/apache/fop/render/txt/border/SolidAndDoubleBorderElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/txt/border/package.html b/src/java/org/apache/fop/render/txt/border/package.html index 198b2dfe7..495563755 100644 --- a/src/java/org/apache/fop/render/txt/border/package.html +++ b/src/java/org/apache/fop/render/txt/border/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/txt/package.html b/src/java/org/apache/fop/render/txt/package.html index 37f2908b0..af1dc76fe 100644 --- a/src/java/org/apache/fop/render/txt/package.html +++ b/src/java/org/apache/fop/render/txt/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/render/xml/XMLRenderer.java b/src/java/org/apache/fop/render/xml/XMLRenderer.java index b14f92198..fe2fdd2c5 100644 --- a/src/java/org/apache/fop/render/xml/XMLRenderer.java +++ b/src/java/org/apache/fop/render/xml/XMLRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/xml/XMLRendererMaker.java b/src/java/org/apache/fop/render/xml/XMLRendererMaker.java index 639a63993..1be56f39a 100644 --- a/src/java/org/apache/fop/render/xml/XMLRendererMaker.java +++ b/src/java/org/apache/fop/render/xml/XMLRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/java/org/apache/fop/render/xml/XMLXMLHandler.java b/src/java/org/apache/fop/render/xml/XMLXMLHandler.java index 91553bbd8..50815966d 100644 --- a/src/java/org/apache/fop/render/xml/XMLXMLHandler.java +++ b/src/java/org/apache/fop/render/xml/XMLXMLHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/render/xml/package.html b/src/java/org/apache/fop/render/xml/package.html index 77e035e7a..297d1af24 100644 --- a/src/java/org/apache/fop/render/xml/package.html +++ b/src/java/org/apache/fop/render/xml/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/servlet/FopPrintServlet.java b/src/java/org/apache/fop/servlet/FopPrintServlet.java index 6b3268572..096975c30 100644 --- a/src/java/org/apache/fop/servlet/FopPrintServlet.java +++ b/src/java/org/apache/fop/servlet/FopPrintServlet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/servlet/FopServlet.java b/src/java/org/apache/fop/servlet/FopServlet.java index 241c99319..69d1a1547 100644 --- a/src/java/org/apache/fop/servlet/FopServlet.java +++ b/src/java/org/apache/fop/servlet/FopServlet.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/servlet/ServletContextURIResolver.java b/src/java/org/apache/fop/servlet/ServletContextURIResolver.java index 8dd555e6e..57f716d35 100644 --- a/src/java/org/apache/fop/servlet/ServletContextURIResolver.java +++ b/src/java/org/apache/fop/servlet/ServletContextURIResolver.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/ACIUtils.java b/src/java/org/apache/fop/svg/ACIUtils.java index 92e8a9c43..984b63f25 100644 --- a/src/java/org/apache/fop/svg/ACIUtils.java +++ b/src/java/org/apache/fop/svg/ACIUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2003,2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java b/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java index 2a5661ebd..b11615853 100644 --- a/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java +++ b/src/java/org/apache/fop/svg/AbstractFOPTranscoder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java b/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java index f98d25364..8efb858b2 100644 --- a/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java +++ b/src/java/org/apache/fop/svg/FOPSAXSVGDocumentFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFAElementBridge.java b/src/java/org/apache/fop/svg/PDFAElementBridge.java index 9488957eb..56576afa5 100644 --- a/src/java/org/apache/fop/svg/PDFAElementBridge.java +++ b/src/java/org/apache/fop/svg/PDFAElementBridge.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFANode.java b/src/java/org/apache/fop/svg/PDFANode.java index f3ef9e6dc..84c8b9e42 100644 --- a/src/java/org/apache/fop/svg/PDFANode.java +++ b/src/java/org/apache/fop/svg/PDFANode.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFBridgeContext.java b/src/java/org/apache/fop/svg/PDFBridgeContext.java index 354fec690..3d5fc4e6d 100644 --- a/src/java/org/apache/fop/svg/PDFBridgeContext.java +++ b/src/java/org/apache/fop/svg/PDFBridgeContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFContext.java b/src/java/org/apache/fop/svg/PDFContext.java index 0c1bd8f08..7f96fb060 100644 --- a/src/java/org/apache/fop/svg/PDFContext.java +++ b/src/java/org/apache/fop/svg/PDFContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java b/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java index e4891020a..4d7ac826c 100644 --- a/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFDocumentGraphics2D.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFGraphics2D.java b/src/java/org/apache/fop/svg/PDFGraphics2D.java index f3bf3037c..af0a0cfaa 100644 --- a/src/java/org/apache/fop/svg/PDFGraphics2D.java +++ b/src/java/org/apache/fop/svg/PDFGraphics2D.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java b/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java index 488e99f0e..20c2c5c89 100644 --- a/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java +++ b/src/java/org/apache/fop/svg/PDFGraphicsConfiguration.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFGraphicsDevice.java b/src/java/org/apache/fop/svg/PDFGraphicsDevice.java index 7a47ca8d0..360a725b7 100644 --- a/src/java/org/apache/fop/svg/PDFGraphicsDevice.java +++ b/src/java/org/apache/fop/svg/PDFGraphicsDevice.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFImageElementBridge.java b/src/java/org/apache/fop/svg/PDFImageElementBridge.java index be69185a8..bb314495c 100644 --- a/src/java/org/apache/fop/svg/PDFImageElementBridge.java +++ b/src/java/org/apache/fop/svg/PDFImageElementBridge.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFTextElementBridge.java b/src/java/org/apache/fop/svg/PDFTextElementBridge.java index 398260d35..cf9b7b7bd 100644 --- a/src/java/org/apache/fop/svg/PDFTextElementBridge.java +++ b/src/java/org/apache/fop/svg/PDFTextElementBridge.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFTextPainter.java b/src/java/org/apache/fop/svg/PDFTextPainter.java index 6747b8409..eddd89d09 100644 --- a/src/java/org/apache/fop/svg/PDFTextPainter.java +++ b/src/java/org/apache/fop/svg/PDFTextPainter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004,2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/PDFTranscoder.java b/src/java/org/apache/fop/svg/PDFTranscoder.java index 080926de5..a90765a31 100644 --- a/src/java/org/apache/fop/svg/PDFTranscoder.java +++ b/src/java/org/apache/fop/svg/PDFTranscoder.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/svg/SVGUserAgent.java b/src/java/org/apache/fop/svg/SVGUserAgent.java index 6905a7cc1..540f490de 100644 --- a/src/java/org/apache/fop/svg/SVGUserAgent.java +++ b/src/java/org/apache/fop/svg/SVGUserAgent.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * @@ -14,7 +15,7 @@ * limitations under the License. */ -/* $Id: SVGUserAgent.java,v 1.2 2004/02/27 17:43:22 jeremias Exp $ */ +/* $Id$ */ package org.apache.fop.svg; diff --git a/src/java/org/apache/fop/svg/SVGUtilities.java b/src/java/org/apache/fop/svg/SVGUtilities.java index df06a7604..1ea11465b 100644 --- a/src/java/org/apache/fop/svg/SVGUtilities.java +++ b/src/java/org/apache/fop/svg/SVGUtilities.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/tools/TestConverter.java b/src/java/org/apache/fop/tools/TestConverter.java index ff0da6eec..145f88187 100644 --- a/src/java/org/apache/fop/tools/TestConverter.java +++ b/src/java/org/apache/fop/tools/TestConverter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/tools/anttasks/FileCompare.java b/src/java/org/apache/fop/tools/anttasks/FileCompare.java index 53cdf555b..5deaa7da2 100644 --- a/src/java/org/apache/fop/tools/anttasks/FileCompare.java +++ b/src/java/org/apache/fop/tools/anttasks/FileCompare.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/tools/anttasks/Fop.java b/src/java/org/apache/fop/tools/anttasks/Fop.java index 0634c0407..7514a790f 100644 --- a/src/java/org/apache/fop/tools/anttasks/Fop.java +++ b/src/java/org/apache/fop/tools/anttasks/Fop.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/tools/anttasks/RunTest.java b/src/java/org/apache/fop/tools/anttasks/RunTest.java index b13619563..91d217f7b 100644 --- a/src/java/org/apache/fop/tools/anttasks/RunTest.java +++ b/src/java/org/apache/fop/tools/anttasks/RunTest.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java b/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java index e99c0f7c9..b0877eaf6 100644 --- a/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java +++ b/src/java/org/apache/fop/tools/anttasks/SerializeHyphPattern.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/tools/anttasks/package.html b/src/java/org/apache/fop/tools/anttasks/package.html index 74dbfb55f..56d04d745 100644 --- a/src/java/org/apache/fop/tools/anttasks/package.html +++ b/src/java/org/apache/fop/tools/anttasks/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/tools/package.html b/src/java/org/apache/fop/tools/package.html index aa89f94b1..ec17cacd7 100644 --- a/src/java/org/apache/fop/tools/package.html +++ b/src/java/org/apache/fop/tools/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/traits/BlockProps.java b/src/java/org/apache/fop/traits/BlockProps.java index fa478d5d2..27417d897 100644 --- a/src/java/org/apache/fop/traits/BlockProps.java +++ b/src/java/org/apache/fop/traits/BlockProps.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/traits/BorderProps.java b/src/java/org/apache/fop/traits/BorderProps.java index 9946ad444..2a00920eb 100644 --- a/src/java/org/apache/fop/traits/BorderProps.java +++ b/src/java/org/apache/fop/traits/BorderProps.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/traits/InlineProps.java b/src/java/org/apache/fop/traits/InlineProps.java index dd0c42677..735ebc0ca 100644 --- a/src/java/org/apache/fop/traits/InlineProps.java +++ b/src/java/org/apache/fop/traits/InlineProps.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/traits/LayoutProps.java b/src/java/org/apache/fop/traits/LayoutProps.java index b0129f632..f93470720 100644 --- a/src/java/org/apache/fop/traits/LayoutProps.java +++ b/src/java/org/apache/fop/traits/LayoutProps.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/traits/MinOptMax.java b/src/java/org/apache/fop/traits/MinOptMax.java index 981abfbf4..835e39cfe 100644 --- a/src/java/org/apache/fop/traits/MinOptMax.java +++ b/src/java/org/apache/fop/traits/MinOptMax.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/traits/SpaceVal.java b/src/java/org/apache/fop/traits/SpaceVal.java index d3743c88d..0dae92193 100644 --- a/src/java/org/apache/fop/traits/SpaceVal.java +++ b/src/java/org/apache/fop/traits/SpaceVal.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/traits/package.html b/src/java/org/apache/fop/traits/package.html index 5a4d44222..0dabf9930 100644 --- a/src/java/org/apache/fop/traits/package.html +++ b/src/java/org/apache/fop/traits/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/java/org/apache/fop/util/CMYKColorSpace.java b/src/java/org/apache/fop/util/CMYKColorSpace.java index 139a01c40..00a3f32a2 100644 --- a/src/java/org/apache/fop/util/CMYKColorSpace.java +++ b/src/java/org/apache/fop/util/CMYKColorSpace.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/CharUtilities.java b/src/java/org/apache/fop/util/CharUtilities.java index 985c25df7..dc2d987f3 100644 --- a/src/java/org/apache/fop/util/CharUtilities.java +++ b/src/java/org/apache/fop/util/CharUtilities.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/CloseBlockerOutputStream.java b/src/java/org/apache/fop/util/CloseBlockerOutputStream.java index 8417d7eaa..5bf057c26 100644 --- a/src/java/org/apache/fop/util/CloseBlockerOutputStream.java +++ b/src/java/org/apache/fop/util/CloseBlockerOutputStream.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/ColorProfileUtil.java b/src/java/org/apache/fop/util/ColorProfileUtil.java index 8c0e7794f..6a849a031 100644 --- a/src/java/org/apache/fop/util/ColorProfileUtil.java +++ b/src/java/org/apache/fop/util/ColorProfileUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/ColorUtil.java b/src/java/org/apache/fop/util/ColorUtil.java index dedaf0f5c..652924025 100644 --- a/src/java/org/apache/fop/util/ColorUtil.java +++ b/src/java/org/apache/fop/util/ColorUtil.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/CommandLineLogger.java b/src/java/org/apache/fop/util/CommandLineLogger.java index 20ba4e9f1..d42eadf57 100644 --- a/src/java/org/apache/fop/util/CommandLineLogger.java +++ b/src/java/org/apache/fop/util/CommandLineLogger.java @@ -1,8 +1,9 @@ -/* Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 +/* 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 * diff --git a/src/java/org/apache/fop/util/ContentHandlerFactory.java b/src/java/org/apache/fop/util/ContentHandlerFactory.java index a17d7a60f..30ab2374a 100644 --- a/src/java/org/apache/fop/util/ContentHandlerFactory.java +++ b/src/java/org/apache/fop/util/ContentHandlerFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java b/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java index 3d95d91a3..3d8ef8296 100644 --- a/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java +++ b/src/java/org/apache/fop/util/ContentHandlerFactoryRegistry.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/DOM2SAX.java b/src/java/org/apache/fop/util/DOM2SAX.java index 6c5142157..15f371b45 100644 --- a/src/java/org/apache/fop/util/DOM2SAX.java +++ b/src/java/org/apache/fop/util/DOM2SAX.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java b/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java index 5b5dd3b48..11ac96da8 100644 --- a/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java +++ b/src/java/org/apache/fop/util/DOMBuilderContentHandlerFactory.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/DefaultErrorListener.java b/src/java/org/apache/fop/util/DefaultErrorListener.java index 5e1a9cc37..cc9d24c6e 100644 --- a/src/java/org/apache/fop/util/DefaultErrorListener.java +++ b/src/java/org/apache/fop/util/DefaultErrorListener.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/DelegatingContentHandler.java b/src/java/org/apache/fop/util/DelegatingContentHandler.java index 86cfb1e41..75e82124e 100644 --- a/src/java/org/apache/fop/util/DelegatingContentHandler.java +++ b/src/java/org/apache/fop/util/DelegatingContentHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/QName.java b/src/java/org/apache/fop/util/QName.java index 91c9ab812..9a0a947b9 100644 --- a/src/java/org/apache/fop/util/QName.java +++ b/src/java/org/apache/fop/util/QName.java @@ -1,137 +1,138 @@ -/* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/* $Id$ */ - -package org.apache.fop.util; - -import java.io.Serializable; - -/** - * Represents a qualified name of an XML element or an XML attribute. - * <p> - * Note: This class allows to carry a namespace prefix but it is not used in the equals() and - * hashCode() methods. - */ -public class QName implements Serializable { - - private static final long serialVersionUID = -5225376740044770690L; - - private String namespaceURI; - private String localName; - private String prefix; - private int hashCode; - - /** - * Main constructor. - * @param namespaceURI the namespace URI - * @param prefix the namespace prefix, may be null - * @param localName the local name - */ - public QName(String namespaceURI, String prefix, String localName) { - if (localName == null) { - throw new NullPointerException("Parameter localName must not be null"); - } - if (localName.length() == 0) { - throw new IllegalArgumentException("Parameter localName must not be empty"); - } - this.namespaceURI = namespaceURI; - this.prefix = prefix; - this.localName = localName; - this.hashCode = toHashString().hashCode(); - } - - /** - * Main constructor. - * @param namespaceURI the namespace URI - * @param qName the qualified name - */ - public QName(String namespaceURI, String qName) { - if (qName == null) { - throw new NullPointerException("Parameter localName must not be null"); - } - if (qName.length() == 0) { - throw new IllegalArgumentException("Parameter localName must not be empty"); - } - this.namespaceURI = namespaceURI; - int p = qName.indexOf(':'); - if (p > 0) { - this.prefix = qName.substring(0, p); - this.localName = qName.substring(p + 1); - } else { - this.prefix = null; - this.localName = qName; - } - this.hashCode = toHashString().hashCode(); - } - - /** @return the namespace URI */ - public String getNamespaceURI() { - return this.namespaceURI; - } - - /** @return the namespace prefix */ - public String getPrefix() { - return this.prefix; - } - - /** @return the local name */ - public String getLocalName() { - return this.localName; - } - - /** @return the fully qualified name */ - public String getQName() { - return getPrefix() != null ? getPrefix() + ':' + getLocalName() : getLocalName(); - } - - /** @see java.lang.Object#hashCode() */ - public int hashCode() { - return this.hashCode; - } - - /** @see java.lang.Object#equals(java.lang.Object) */ - public boolean equals(Object obj) { - if (obj == null) { - return false; - } else if (obj == this) { - return true; - } else { - if (obj instanceof QName) { - QName other = (QName)obj; - if ((getNamespaceURI() == null && other.getNamespaceURI() == null) - || getNamespaceURI().equals(other.getNamespaceURI())) { - return getLocalName().equals(other.getLocalName()); - } - } - } - return false; - } - - /** @see java.lang.Object#toString() */ - public String toString() { - return prefix != null - ? (prefix + ":" + localName) - : toHashString(); - } - - private String toHashString() { - return (namespaceURI != null - ? ("{" + namespaceURI + "}" + localName) - : localName); - } - -} +/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/* $Id$ */
+
+package org.apache.fop.util;
+
+import java.io.Serializable;
+
+/**
+ * Represents a qualified name of an XML element or an XML attribute.
+ * <p>
+ * Note: This class allows to carry a namespace prefix but it is not used in the equals() and
+ * hashCode() methods.
+ */
+public class QName implements Serializable {
+
+ private static final long serialVersionUID = -5225376740044770690L;
+
+ private String namespaceURI;
+ private String localName;
+ private String prefix;
+ private int hashCode;
+
+ /**
+ * Main constructor.
+ * @param namespaceURI the namespace URI
+ * @param prefix the namespace prefix, may be null
+ * @param localName the local name
+ */
+ public QName(String namespaceURI, String prefix, String localName) {
+ if (localName == null) {
+ throw new NullPointerException("Parameter localName must not be null");
+ }
+ if (localName.length() == 0) {
+ throw new IllegalArgumentException("Parameter localName must not be empty");
+ }
+ this.namespaceURI = namespaceURI;
+ this.prefix = prefix;
+ this.localName = localName;
+ this.hashCode = toHashString().hashCode();
+ }
+
+ /**
+ * Main constructor.
+ * @param namespaceURI the namespace URI
+ * @param qName the qualified name
+ */
+ public QName(String namespaceURI, String qName) {
+ if (qName == null) {
+ throw new NullPointerException("Parameter localName must not be null");
+ }
+ if (qName.length() == 0) {
+ throw new IllegalArgumentException("Parameter localName must not be empty");
+ }
+ this.namespaceURI = namespaceURI;
+ int p = qName.indexOf(':');
+ if (p > 0) {
+ this.prefix = qName.substring(0, p);
+ this.localName = qName.substring(p + 1);
+ } else {
+ this.prefix = null;
+ this.localName = qName;
+ }
+ this.hashCode = toHashString().hashCode();
+ }
+
+ /** @return the namespace URI */
+ public String getNamespaceURI() {
+ return this.namespaceURI;
+ }
+
+ /** @return the namespace prefix */
+ public String getPrefix() {
+ return this.prefix;
+ }
+
+ /** @return the local name */
+ public String getLocalName() {
+ return this.localName;
+ }
+
+ /** @return the fully qualified name */
+ public String getQName() {
+ return getPrefix() != null ? getPrefix() + ':' + getLocalName() : getLocalName();
+ }
+
+ /** @see java.lang.Object#hashCode() */
+ public int hashCode() {
+ return this.hashCode;
+ }
+
+ /** @see java.lang.Object#equals(java.lang.Object) */
+ public boolean equals(Object obj) {
+ if (obj == null) {
+ return false;
+ } else if (obj == this) {
+ return true;
+ } else {
+ if (obj instanceof QName) {
+ QName other = (QName)obj;
+ if ((getNamespaceURI() == null && other.getNamespaceURI() == null)
+ || getNamespaceURI().equals(other.getNamespaceURI())) {
+ return getLocalName().equals(other.getLocalName());
+ }
+ }
+ }
+ return false;
+ }
+
+ /** @see java.lang.Object#toString() */
+ public String toString() {
+ return prefix != null
+ ? (prefix + ":" + localName)
+ : toHashString();
+ }
+
+ private String toHashString() {
+ return (namespaceURI != null
+ ? ("{" + namespaceURI + "}" + localName)
+ : localName);
+ }
+
+}
diff --git a/src/java/org/apache/fop/util/UnitConv.java b/src/java/org/apache/fop/util/UnitConv.java index 939db056b..0eebb8cda 100644 --- a/src/java/org/apache/fop/util/UnitConv.java +++ b/src/java/org/apache/fop/util/UnitConv.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/XMLizable.java b/src/java/org/apache/fop/util/XMLizable.java index ea02963ef..c1213638b 100644 --- a/src/java/org/apache/fop/util/XMLizable.java +++ b/src/java/org/apache/fop/util/XMLizable.java @@ -1,9 +1,10 @@ /* - * Copyright 2002-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/java/org/apache/fop/util/package.html b/src/java/org/apache/fop/util/package.html index 94de448c5..fb73364ec 100644 --- a/src/java/org/apache/fop/util/package.html +++ b/src/java/org/apache/fop/util/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/sandbox/org/apache/fop/render/mif/MIFElement.java b/src/sandbox/org/apache/fop/render/mif/MIFElement.java index 9f046a0c4..d7757cc3b 100644 --- a/src/sandbox/org/apache/fop/render/mif/MIFElement.java +++ b/src/sandbox/org/apache/fop/render/mif/MIFElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java b/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java index 96bde2600..b841e61c5 100644 --- a/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java +++ b/src/sandbox/org/apache/fop/render/mif/MIFFOEventHandlerMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/sandbox/org/apache/fop/render/mif/MIFFile.java b/src/sandbox/org/apache/fop/render/mif/MIFFile.java index b554ead33..eccb1df54 100644 --- a/src/sandbox/org/apache/fop/render/mif/MIFFile.java +++ b/src/sandbox/org/apache/fop/render/mif/MIFFile.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/mif/MIFHandler.java b/src/sandbox/org/apache/fop/render/mif/MIFHandler.java index 52d99c1fc..2ab140c33 100644 --- a/src/sandbox/org/apache/fop/render/mif/MIFHandler.java +++ b/src/sandbox/org/apache/fop/render/mif/MIFHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/mif/PGFElement.java b/src/sandbox/org/apache/fop/render/mif/PGFElement.java index 8bbb2c18d..b273f36b3 100644 --- a/src/sandbox/org/apache/fop/render/mif/PGFElement.java +++ b/src/sandbox/org/apache/fop/render/mif/PGFElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/mif/RefElement.java b/src/sandbox/org/apache/fop/render/mif/RefElement.java index 9c6b16242..1d59a6139 100644 --- a/src/sandbox/org/apache/fop/render/mif/RefElement.java +++ b/src/sandbox/org/apache/fop/render/mif/RefElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/mif/RulingElement.java b/src/sandbox/org/apache/fop/render/mif/RulingElement.java index 4dda86c8e..476df0687 100644 --- a/src/sandbox/org/apache/fop/render/mif/RulingElement.java +++ b/src/sandbox/org/apache/fop/render/mif/RulingElement.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/mif/package.html b/src/sandbox/org/apache/fop/render/mif/package.html index b3e97fc5d..6a8e3054d 100644 --- a/src/sandbox/org/apache/fop/render/mif/package.html +++ b/src/sandbox/org/apache/fop/render/mif/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java b/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java index ac05532df..36ff7ab58 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGRenderer.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/svg/SVGRendererContextConstants.java b/src/sandbox/org/apache/fop/render/svg/SVGRendererContextConstants.java index c86afb9ff..789db898e 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGRendererContextConstants.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGRendererContextConstants.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java b/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java index 5dfcd3d03..0aa5d185a 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGRendererMaker.java @@ -1,9 +1,10 @@ /*
- * Copyright 2005 The Apache Software Foundation.
- *
- * Licensed 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
+ * 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
*
diff --git a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java index 47e1b8767..876abc47a 100644 --- a/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java +++ b/src/sandbox/org/apache/fop/render/svg/SVGSVGHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/src/sandbox/org/apache/fop/render/svg/package.html b/src/sandbox/org/apache/fop/render/svg/package.html index 7edba8c85..977c7d183 100644 --- a/src/sandbox/org/apache/fop/render/svg/package.html +++ b/src/sandbox/org/apache/fop/render/svg/package.html @@ -1,9 +1,10 @@ <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/status.xml b/status.xml index e25419563..1948a8c14 100644 --- a/status.xml +++ b/status.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/disabled-testcases.xml b/test/fotree/disabled-testcases.xml index a574d39f5..bcf065667 100755 --- a/test/fotree/disabled-testcases.xml +++ b/test/fotree/disabled-testcases.xml @@ -1,40 +1,41 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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: $ --> -<disabled-testcases> - <testcase> - <name>demo test failure</name> - <file>demo-test-failure.fo</file> - <description></description> - </testcase> - <testcase> - <name>Negative values on block-progression-dimension</name> - <file>block-progression-dimension_negative.fo</file> - <description>The code currently doesn't set negative values to 0mpt as mandated by the spec.</description> - </testcase> - <testcase> - <name>Negative values on inline-progression-dimension</name> - <file>inline-progression-dimension_negative.fo</file> - <description>The code currently doesn't set negative values to 0mpt as mandated by the spec.</description> - </testcase> - <testcase> - <name>Markers and core function evaluation</name> - <file>from-table-column_marker.fo</file> - <description>The code currently evaluates this function according to the column in which the - marker appearsin the source document, rather than the column it is retrieved in.</description> - </testcase> -</disabled-testcases> +<?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: $ -->
+<disabled-testcases>
+ <testcase>
+ <name>demo test failure</name>
+ <file>demo-test-failure.fo</file>
+ <description></description>
+ </testcase>
+ <testcase>
+ <name>Negative values on block-progression-dimension</name>
+ <file>block-progression-dimension_negative.fo</file>
+ <description>The code currently doesn't set negative values to 0mpt as mandated by the spec.</description>
+ </testcase>
+ <testcase>
+ <name>Negative values on inline-progression-dimension</name>
+ <file>inline-progression-dimension_negative.fo</file>
+ <description>The code currently doesn't set negative values to 0mpt as mandated by the spec.</description>
+ </testcase>
+ <testcase>
+ <name>Markers and core function evaluation</name>
+ <file>from-table-column_marker.fo</file>
+ <description>The code currently evaluates this function according to the column in which the
+ marker appearsin the source document, rather than the column it is retrieved in.</description>
+ </testcase>
+</disabled-testcases>
diff --git a/test/fotree/testcases/background-position-shorthand-test.fo b/test/fotree/testcases/background-position-shorthand-test.fo index 943a29a8f..6ef374544 100644 --- a/test/fotree/testcases/background-position-shorthand-test.fo +++ b/test/fotree/testcases/background-position-shorthand-test.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/color-functions.fo b/test/fotree/testcases/color-functions.fo index 9f87a1994..2abc7fd3d 100644 --- a/test/fotree/testcases/color-functions.fo +++ b/test/fotree/testcases/color-functions.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/column-number_cells_body.fo b/test/fotree/testcases/column-number_cells_body.fo index f6012f838..48066c0a1 100644 --- a/test/fotree/testcases/column-number_cells_body.fo +++ b/test/fotree/testcases/column-number_cells_body.fo @@ -1,161 +1,162 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" - margin="20pt"> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <!-- table with explicit columns --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="1" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(2)"> - <test:assert property="column-number" expected="2" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="3" /> - </fo:table-column> - <fo:table-header> - <fo:table-cell number-columns-spanned="3" starts-row="true" ends-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>header cell</fo:block> - </fo:table-cell> - </fo:table-header> - <fo:table-footer> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>footer cell 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>footer cell 2</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>footer cell 3</fo:block> - </fo:table-cell> - </fo:table-footer> - <fo:table-body> - <fo:table-cell number-columns-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - <!-- table with implicit columns. --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-header> - <fo:table-cell number-columns-spanned="3" starts-row="true" ends-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>header cell</fo:block> - </fo:table-cell> - </fo:table-header> - <fo:table-footer> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>footer cell 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>footer cell 2</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>footer cell 3</fo:block> - </fo:table-cell> - </fo:table-footer> - <fo:table-body> - <fo:table-cell number-columns-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- table with explicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(2)">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-header>
+ <fo:table-cell number-columns-spanned="3" starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell number-columns-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ <!-- table with implicit columns. -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-header>
+ <fo:table-cell number-columns-spanned="3" starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell number-columns-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_cells_body2.fo b/test/fotree/testcases/column-number_cells_body2.fo index 4bd71fe7d..d5d1e2e44 100644 --- a/test/fotree/testcases/column-number_cells_body2.fo +++ b/test/fotree/testcases/column-number_cells_body2.fo @@ -1,105 +1,106 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-column column-width="2in"> - <test:assert property="column-number" expected="1" /> - </fo:table-column> - <fo:table-column column-width="1in"> - <test:assert property="column-number" expected="2" /> - </fo:table-column> - <fo:table-column column-width="1in"> - <test:assert property="column-number" expected="3" /> - </fo:table-column> - <fo:table-column column-width="1in"> - <test:assert property="column-number" expected="4" /> - </fo:table-column> - <fo:table-body> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>cell1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell2</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell3</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="4" /> - <fo:block>cell4</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell5</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="6" /> - <fo:block>cell5b</fo:block> - </fo:table-cell> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell6</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell7</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell8</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>cell9</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell10</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell11</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="4" /> - <fo:block>cell12</fo:block> - </fo:table-cell> - <fo:table-cell starts-row="true" ends-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell13</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell14</fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="2in">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="1in">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-column column-width="1in">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-column column-width="1in">
+ <test:assert property="column-number" expected="4" />
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="6" />
+ <fo:block>cell5b</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell7</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell8</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell9</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell10</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell11</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell12</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell13</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell14</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_cells_out-of-order.fo b/test/fotree/testcases/column-number_cells_out-of-order.fo index 39ecd2a5d..1238dd1cf 100644 --- a/test/fotree/testcases/column-number_cells_out-of-order.fo +++ b/test/fotree/testcases/column-number_cells_out-of-order.fo @@ -1,216 +1,217 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" - margin="20pt"> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <!-- table with explicit columns --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-column column-width="proportional-column-width(1)" - number-columns-repeated="5"> - <test:assert property="column-number" expected="1" /> - </fo:table-column> - <fo:table-header> - <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>header cell</fo:block> - </fo:table-cell> - </fo:table-header> - <fo:table-footer> - <fo:table-cell starts-row="true" column-number="4"> - <test:assert property="column-number" expected="4" /> - <fo:block>footer cell 4</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>footer cell 5</fo:block> - </fo:table-cell> - <fo:table-cell column-number="1"> - <test:assert property="column-number" expected="1" /> - <fo:block>footer cell 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>footer cell 2</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>footer cell 3</fo:block> - </fo:table-cell> - </fo:table-footer> - <fo:table-body> - <fo:table-cell number-columns-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell column-number="4"> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell column-number="3"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="3" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="2" - number-columns-spanned="2" - starts-row="true"> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - <!-- table with implicit columns --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-header> - <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>header cell</fo:block> - </fo:table-cell> - </fo:table-header> - <fo:table-footer> - <fo:table-cell starts-row="true" column-number="4"> - <test:assert property="column-number" expected="4" /> - <fo:block>footer cell 4</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>footer cell 5</fo:block> - </fo:table-cell> - <fo:table-cell column-number="1"> - <test:assert property="column-number" expected="1" /> - <fo:block>footer cell 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>footer cell 2</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="3" /> - <fo:block>footer cell 3</fo:block> - </fo:table-cell> - </fo:table-footer> - <fo:table-body> - <fo:table-cell number-columns-spanned="2" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell column-number="4"> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell column-number="3"> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="3" starts-row="true"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell number-rows-spanned="2" - number-columns-spanned="2" - starts-row="true"> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell starts-row="true"> - <test:assert property="column-number" expected="4" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell ends-row="true"> - <test:assert property="column-number" expected="5" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- table with explicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(1)"
+ number-columns-repeated="5">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-header>
+ <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true" column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>footer cell 4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>footer cell 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="1">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell number-columns-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="3">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="3" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2"
+ number-columns-spanned="2"
+ starts-row="true">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ <!-- table with implicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-header>
+ <fo:table-cell number-columns-spanned="5" starts-row="true" ends-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-cell starts-row="true" column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>footer cell 4</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>footer cell 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="1">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-cell number-columns-spanned="2" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="4">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="3">
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="3" starts-row="true">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell number-rows-spanned="2"
+ number-columns-spanned="2"
+ starts-row="true">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell starts-row="true">
+ <test:assert property="column-number" expected="4" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell ends-row="true">
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_cells_rows.fo b/test/fotree/testcases/column-number_cells_rows.fo index ad453b3cd..c6946f653 100644 --- a/test/fotree/testcases/column-number_cells_rows.fo +++ b/test/fotree/testcases/column-number_cells_rows.fo @@ -1,185 +1,186 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" - margin="20pt"> - <fo:region-body background-color="yellow"/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <!-- table with explicit columns --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="1" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(2)"> - <test:assert property="column-number" expected="2" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="3" /> - </fo:table-column> - <fo:table-header> - <fo:table-row> - <fo:table-cell number-columns-spanned="3"> - <test:assert property="column-number" expected="1" /> - <fo:block>header cell</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-footer> - <fo:table-row> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>footer cell 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>footer cell 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>footer cell 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-footer> - <fo:table-body> - <fo:table-row> - <fo:table-cell number-columns-spanned="2"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell number-rows-spanned="2"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell number-rows-spanned="2"> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <!-- table with implicit columns --> - <fo:table table-layout="fixed" border-collapse="separate"> - <fo:table-header> - <fo:table-row> - <fo:table-cell number-columns-spanned="3"> - <test:assert property="column-number" expected="1" /> - <fo:block>header cell</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-footer> - <fo:table-row> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>footer cell 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>footer cell 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>footer cell 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-footer> - <fo:table-body> - <fo:table-row> - <fo:table-cell number-columns-spanned="2"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell number-rows-spanned="2"> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell number-rows-spanned="2"> - <test:assert property="column-number" expected="2" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell-content</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body background-color="yellow"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- table with explicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(2)">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="3">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <!-- table with implicit columns -->
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="3">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>header cell</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>footer cell 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>footer cell 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>footer cell 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell number-rows-spanned="2">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell-content</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_columns_special.fo b/test/fotree/testcases/column-number_columns_special.fo index 035864a34..116524ede 100644 --- a/test/fotree/testcases/column-number_columns_special.fo +++ b/test/fotree/testcases/column-number_columns_special.fo @@ -1,88 +1,89 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" - margin="20pt"> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <fo:table table-layout="fixed" border-collapse="separate"> - <!-- 6 columns, of which one repeated, and one unused column-number (= 4) --> - <fo:table-column column-width="proportional-column-width(1)" - number-columns-repeated="2"> - <test:assert property="column-number" expected="1" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="3" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(1)" - column-number="5"> - <test:assert property="column-number" expected="5" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="6" /> - </fo:table-column> - <fo:table-column column-width="proportional-column-width(1)"> - <test:assert property="column-number" expected="7" /> - </fo:table-column> - <fo:table-body> - <fo:table-row> - <fo:table-cell number-columns-spanned="5"> - <test:assert property="column-number" expected="1" /> - <fo:block>This cell should span columns 1, 2, 3, 5, 6</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="7" /> - <fo:block>cell for column 7</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <test:assert property="column-number" expected="1" /> - <fo:block>cell for column 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="2" /> - <fo:block>cell for column 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="3" /> - <fo:block>cell for column 3</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="5" /> - <fo:block>cell for column 5</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="6" /> - <fo:block>cell for column 6</fo:block> - </fo:table-cell> - <fo:table-cell> - <test:assert property="column-number" expected="7" /> - <fo:block>cell for column 7</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" border-collapse="separate">
+ <!-- 6 columns, of which one repeated, and one unused column-number (= 4) -->
+ <fo:table-column column-width="proportional-column-width(1)"
+ number-columns-repeated="2">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="3" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)"
+ column-number="5">
+ <test:assert property="column-number" expected="5" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="6" />
+ </fo:table-column>
+ <fo:table-column column-width="proportional-column-width(1)">
+ <test:assert property="column-number" expected="7" />
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell number-columns-spanned="5">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>This cell should span columns 1, 2, 3, 5, 6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="7" />
+ <fo:block>cell for column 7</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="1" />
+ <fo:block>cell for column 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="2" />
+ <fo:block>cell for column 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="3" />
+ <fo:block>cell for column 3</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="5" />
+ <fo:block>cell for column 5</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="6" />
+ <fo:block>cell for column 6</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <test:assert property="column-number" expected="7" />
+ <fo:block>cell for column 7</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/column-number_negative-or-zero.fo b/test/fotree/testcases/column-number_negative-or-zero.fo index 98294efb4..bbc6ce1d1 100644 --- a/test/fotree/testcases/column-number_negative-or-zero.fo +++ b/test/fotree/testcases/column-number_negative-or-zero.fo @@ -1,53 +1,54 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in" - margin="20pt"> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <!-- testcase for specified negative or zero values --> - <fo:table border-collapse="separate" table-layout="fixed" width="7.5in"> - <fo:table-column column-width="60pt" column-number="0"> - <test:assert property="column-number" expected="1" /> - </fo:table-column> - <fo:table-column column-width="7in" column-number="-1"> - <test:assert property="column-number" expected="2" /> - </fo:table-column> - <fo:table-body> - <fo:table-row> - <fo:table-cell column-number="-3"> - <test:assert property="column-number" expected="1" /> - <fo:block>Cell1</fo:block> - </fo:table-cell> - <fo:table-cell column-number="0"> - <test:assert property="column-number" expected="2" /> - <fo:block>Cell2 - </fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> - +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="2in"
+ margin="20pt">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <!-- testcase for specified negative or zero values -->
+ <fo:table border-collapse="separate" table-layout="fixed" width="7.5in">
+ <fo:table-column column-width="60pt" column-number="0">
+ <test:assert property="column-number" expected="1" />
+ </fo:table-column>
+ <fo:table-column column-width="7in" column-number="-1">
+ <test:assert property="column-number" expected="2" />
+ </fo:table-column>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell column-number="-3">
+ <test:assert property="column-number" expected="1" />
+ <fo:block>Cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="0">
+ <test:assert property="column-number" expected="2" />
+ <fo:block>Cell2
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
diff --git a/test/fotree/testcases/font-shorthand-test.fo b/test/fotree/testcases/font-shorthand-test.fo index e940e08d7..19093038c 100644 --- a/test/fotree/testcases/font-shorthand-test.fo +++ b/test/fotree/testcases/font-shorthand-test.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/fotree/testcases/from-table-column_marker.fo b/test/fotree/testcases/from-table-column_marker.fo index 8b80292eb..fc19c424e 100644 --- a/test/fotree/testcases/from-table-column_marker.fo +++ b/test/fotree/testcases/from-table-column_marker.fo @@ -1,101 +1,102 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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$ --> -<!-- This test serves to demonstrate an error when evaluating the function - for a descendant of a retrieved marker. --> - -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - <fo:region-before/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:static-content flow-name="xsl-region-before"> - <fo:table border-collapse="separate" table-layout="fixed" width="100%"> - <fo:table-column column-width="proportional-column-width(1)" - text-align="start" /> - <fo:table-column column-width="proportional-column-width(1)" - text-align="center" /> - <fo:table-column column-width="proportional-column-width(1)" - text-align="end" /> - <fo:table-body> - <fo:table-cell starts-row="true"> - <fo:block text-align="from-table-column()"> - <test:assert property="text-align" expected="START" /> - Start-aligned - </fo:block> - </fo:table-cell> - <fo:table-cell text-align="from-table-column()" column-number="3"> - <test:assert property="text-align" expected="END" /> - <fo:block> - <test:assert property="text-align" expected="END" /> - End-aligned - </fo:block> - </fo:table-cell> - <fo:table-cell column-number="2"> - <fo:block> - <fo:retrieve-marker retrieve-class-name="test" retrieve-boundary="page" - retrieve-position="first-starting-within-page" /> - </fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:table border-collapse="separate" table-layout="fixed" width="100%"> - <fo:table-column column-width="proportional-column-width(1)" - text-align="start" /> - <fo:table-column column-width="proportional-column-width(1)" - text-align="center" /> - <fo:table-column column-width="proportional-column-width(1)" - text-align="end" /> - <fo:table-body> - <fo:table-cell starts-row="true"> - <fo:block> - <fo:marker marker-class-name="test"> - <fo:block text-align="from-table-column()"> - <test:assert property="text-align" expected="CENTER" /> - Center-aligned - </fo:block> - </fo:marker> - </fo:block> - <fo:block text-align="from-table-column()"> - <test:assert property="text-align" expected="START" /> - Start-aligned - </fo:block> - </fo:table-cell> - <fo:table-cell text-align="from-table-column()" column-number="3"> - <test:assert property="text-align" expected="END" /> - <fo:block> - <test:assert property="text-align" expected="END" /> - End-aligned - </fo:block> - </fo:table-cell> - <fo:table-cell column-number="2"> - <fo:block text-align="from-table-column()"> - <test:assert property="text-align" expected="CENTER" /> - Center-aligned - </fo:block> - </fo:table-cell> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> -</fo:root> - +<?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$ -->
+<!-- This test serves to demonstrate an error when evaluating the function
+ for a descendant of a retrieved marker. -->
+
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ <fo:region-before/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="start" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="center" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="end" />
+ <fo:table-body>
+ <fo:table-cell starts-row="true">
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="START" />
+ Start-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="from-table-column()" column-number="3">
+ <test:assert property="text-align" expected="END" />
+ <fo:block>
+ <test:assert property="text-align" expected="END" />
+ End-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="2">
+ <fo:block>
+ <fo:retrieve-marker retrieve-class-name="test" retrieve-boundary="page"
+ retrieve-position="first-starting-within-page" />
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table border-collapse="separate" table-layout="fixed" width="100%">
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="start" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="center" />
+ <fo:table-column column-width="proportional-column-width(1)"
+ text-align="end" />
+ <fo:table-body>
+ <fo:table-cell starts-row="true">
+ <fo:block>
+ <fo:marker marker-class-name="test">
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="CENTER" />
+ Center-aligned
+ </fo:block>
+ </fo:marker>
+ </fo:block>
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="START" />
+ Start-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell text-align="from-table-column()" column-number="3">
+ <test:assert property="text-align" expected="END" />
+ <fo:block>
+ <test:assert property="text-align" expected="END" />
+ End-aligned
+ </fo:block>
+ </fo:table-cell>
+ <fo:table-cell column-number="2">
+ <fo:block text-align="from-table-column()">
+ <test:assert property="text-align" expected="CENTER" />
+ Center-aligned
+ </fo:block>
+ </fo:table-cell>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+
diff --git a/test/fotree/testcases/indent-inheritance1.fo b/test/fotree/testcases/indent-inheritance1.fo index e797c9adf..7a7a36700 100644 --- a/test/fotree/testcases/indent-inheritance1.fo +++ b/test/fotree/testcases/indent-inheritance1.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/indent-inheritance2.fo b/test/fotree/testcases/indent-inheritance2.fo index 1b07cd110..8978744c8 100644 --- a/test/fotree/testcases/indent-inheritance2.fo +++ b/test/fotree/testcases/indent-inheritance2.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/indent-inheritance2a.fo b/test/fotree/testcases/indent-inheritance2a.fo index 924354288..6cd362695 100644 --- a/test/fotree/testcases/indent-inheritance2a.fo +++ b/test/fotree/testcases/indent-inheritance2a.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/indent-inheritance3a.fo b/test/fotree/testcases/indent-inheritance3a.fo index 6e613ed93..b1974fb3b 100644 --- a/test/fotree/testcases/indent-inheritance3a.fo +++ b/test/fotree/testcases/indent-inheritance3a.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/no_namespace_prefix.fo b/test/fotree/testcases/no_namespace_prefix.fo index ed054e3cb..6cae6e9c9 100644 --- a/test/fotree/testcases/no_namespace_prefix.fo +++ b/test/fotree/testcases/no_namespace_prefix.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/page-break_shorthand-expansion.fo b/test/fotree/testcases/page-break_shorthand-expansion.fo index 71743c208..db51f31fa 100644 --- a/test/fotree/testcases/page-break_shorthand-expansion.fo +++ b/test/fotree/testcases/page-break_shorthand-expansion.fo @@ -1,83 +1,84 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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$ --> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <fo:block page-break-before="avoid"> - <test:assert property="break-before" expected="AUTO" /> - <test:assert property="keep-with-previous.within-page" expected="ALWAYS" /> - Block 1: testing page-break-before="avoid" - </fo:block> - <fo:block page-break-before="always"> - <test:assert property="break-before" expected="PAGE" /> - <test:assert property="keep-with-previous.within-page" expected="AUTO" /> - Block 2: testing page-break-before="always" - </fo:block> - <fo:block page-break-before="left"> - <test:assert property="break-before" expected="EVEN_PAGE" /> - <test:assert property="keep-with-previous.within-page" expected="AUTO" /> - Block 3: testing page-break-before="left" - </fo:block> - <fo:block page-break-before="right"> - <test:assert property="break-before" expected="ODD_PAGE" /> - <test:assert property="keep-with-previous.within-page" expected="AUTO" /> - Block 4: testing page-break-before="right" - </fo:block> - <fo:block page-break-after="avoid"> - <test:assert property="break-after" expected="AUTO" /> - <test:assert property="keep-with-next.within-page" expected="ALWAYS" /> - Block 5: testing page-break-after="avoid" - </fo:block> - <fo:block page-break-after="always"> - <test:assert property="break-after" expected="PAGE" /> - <test:assert property="keep-with-next.within-page" expected="AUTO" /> - Block 6: testing page-break-after="always" - </fo:block> - <fo:block page-break-after="left"> - <test:assert property="break-after" expected="EVEN_PAGE" /> - <test:assert property="keep-with-next.within-page" expected="AUTO" /> - Block 7: testing page-break-after="left" - </fo:block> - <fo:block page-break-after="right"> - <test:assert property="break-after" expected="ODD_PAGE" /> - <test:assert property="keep-with-next.within-page" expected="AUTO" /> - Block 8: testing page-break-after="right" - </fo:block> - <fo:block page-break-inside="avoid"> - <test:assert property="keep-together.within-page" expected="ALWAYS" /> - Block 9: testing page-break-inside="avoid" - </fo:block> - <fo:block page-break-before="left" page-break-inside="avoid" - page-break-after="right"> - <test:assert property="break-before" expected="EVEN_PAGE" /> - <test:assert property="keep-with-previous.within-page" expected="AUTO" /> - <test:assert property="break-after" expected="ODD_PAGE" /> - <test:assert property="keep-with-next.within-page" expected="AUTO" /> - <test:assert property="keep-together.within-page" expected="ALWAYS" /> - Block 10: testing page-break-before="left", page-break-inside="avoid" - and page-break-after="right" - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - +<?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$ -->
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block page-break-before="avoid">
+ <test:assert property="break-before" expected="AUTO" />
+ <test:assert property="keep-with-previous.within-page" expected="ALWAYS" />
+ Block 1: testing page-break-before="avoid"
+ </fo:block>
+ <fo:block page-break-before="always">
+ <test:assert property="break-before" expected="PAGE" />
+ <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+ Block 2: testing page-break-before="always"
+ </fo:block>
+ <fo:block page-break-before="left">
+ <test:assert property="break-before" expected="EVEN_PAGE" />
+ <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+ Block 3: testing page-break-before="left"
+ </fo:block>
+ <fo:block page-break-before="right">
+ <test:assert property="break-before" expected="ODD_PAGE" />
+ <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+ Block 4: testing page-break-before="right"
+ </fo:block>
+ <fo:block page-break-after="avoid">
+ <test:assert property="break-after" expected="AUTO" />
+ <test:assert property="keep-with-next.within-page" expected="ALWAYS" />
+ Block 5: testing page-break-after="avoid"
+ </fo:block>
+ <fo:block page-break-after="always">
+ <test:assert property="break-after" expected="PAGE" />
+ <test:assert property="keep-with-next.within-page" expected="AUTO" />
+ Block 6: testing page-break-after="always"
+ </fo:block>
+ <fo:block page-break-after="left">
+ <test:assert property="break-after" expected="EVEN_PAGE" />
+ <test:assert property="keep-with-next.within-page" expected="AUTO" />
+ Block 7: testing page-break-after="left"
+ </fo:block>
+ <fo:block page-break-after="right">
+ <test:assert property="break-after" expected="ODD_PAGE" />
+ <test:assert property="keep-with-next.within-page" expected="AUTO" />
+ Block 8: testing page-break-after="right"
+ </fo:block>
+ <fo:block page-break-inside="avoid">
+ <test:assert property="keep-together.within-page" expected="ALWAYS" />
+ Block 9: testing page-break-inside="avoid"
+ </fo:block>
+ <fo:block page-break-before="left" page-break-inside="avoid"
+ page-break-after="right">
+ <test:assert property="break-before" expected="EVEN_PAGE" />
+ <test:assert property="keep-with-previous.within-page" expected="AUTO" />
+ <test:assert property="break-after" expected="ODD_PAGE" />
+ <test:assert property="keep-with-next.within-page" expected="AUTO" />
+ <test:assert property="keep-together.within-page" expected="ALWAYS" />
+ Block 10: testing page-break-before="left", page-break-inside="avoid"
+ and page-break-after="right"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+
diff --git a/test/fotree/testcases/page-dimension_auto_fallback.fo b/test/fotree/testcases/page-dimension_auto_fallback.fo index a0dcc7188..2e11f14f6 100644 --- a/test/fotree/testcases/page-dimension_auto_fallback.fo +++ b/test/fotree/testcases/page-dimension_auto_fallback.fo @@ -1,35 +1,36 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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:$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="auto" page-height="auto" - margin="20pt"> - <!-- page-width should properly fall back to 8.26 * 72000 --> - <test:assert property="page-width" expected="594720mpt" /> - <!-- page-height should properly fall back to 11 * 72000 --> - <test:assert property="page-height" expected="792000mpt" /> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>Testing page-height="auto" / page-width="auto"</fo:block> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="auto" page-height="auto"
+ margin="20pt">
+ <!-- page-width should properly fall back to 8.26 * 72000 -->
+ <test:assert property="page-width" expected="594720mpt" />
+ <!-- page-height should properly fall back to 11 * 72000 -->
+ <test:assert property="page-height" expected="792000mpt" />
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Testing page-height="auto" / page-width="auto"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/page-dimension_both_indefinite.fo b/test/fotree/testcases/page-dimension_both_indefinite.fo index 7a102636f..abc64b69b 100644 --- a/test/fotree/testcases/page-dimension_both_indefinite.fo +++ b/test/fotree/testcases/page-dimension_both_indefinite.fo @@ -1,74 +1,75 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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$ --> -<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" - xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="lr-tb-0" - page-width="indefinite" page-height="indefinite" - writing-mode="lr-tb" - margin="20pt"> - <!-- page-width should properly fall back to 8.26 * 72000 --> - <test:assert property="page-width" expected="594720mpt" /> - <fo:region-body /> - </fo:simple-page-master> - <fo:simple-page-master master-name="lr-tb-90" - page-width="indefinite" page-height="indefinite" - writing-mode="lr-tb" reference-orientation="90" - margin="20pt"> - <!-- page-height should properly fall back to 11 * 72000 --> - <test:assert property="page-height" expected="792000mpt" /> - <fo:region-body /> - </fo:simple-page-master> - <fo:simple-page-master master-name="tb-rl-0" - page-width="indefinite" page-height="indefinite" - writing-mode="tb-rl" reference-orientation="0" - margin="20pt"> - <!-- page-height should properly fall back to 11 * 72000 --> - <test:assert property="page-height" expected="792000mpt" /> - <fo:region-body /> - </fo:simple-page-master> - <fo:simple-page-master master-name="tb-rl-90" - page-width="indefinite" page-height="indefinite" - writing-mode="tb-rl" reference-orientation="90" - margin="20pt"> - <!-- page-width should properly fall back to 8.26 * 72000 --> - <test:assert property="page-width" expected="594720mpt" /> - <fo:region-body /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="lr-tb-0"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>Testing page-height and page-width both "indefinite"</fo:block> - </fo:flow> - </fo:page-sequence> - <fo:page-sequence master-reference="lr-tb-90"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>Testing page-height and page-width both "indefinite"</fo:block> - </fo:flow> - </fo:page-sequence> - <fo:page-sequence master-reference="tb-rl-0"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>Testing page-height and page-width both "indefinite"</fo:block> - </fo:flow> - </fo:page-sequence> - <fo:page-sequence master-reference="tb-rl-90"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>Testing page-height and page-width both "indefinite"</fo:block> - </fo:flow> - </fo:page-sequence> -</fo:root> +<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+ 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$ -->
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"
+ xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="lr-tb-0"
+ page-width="indefinite" page-height="indefinite"
+ writing-mode="lr-tb"
+ margin="20pt">
+ <!-- page-width should properly fall back to 8.26 * 72000 -->
+ <test:assert property="page-width" expected="594720mpt" />
+ <fo:region-body />
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="lr-tb-90"
+ page-width="indefinite" page-height="indefinite"
+ writing-mode="lr-tb" reference-orientation="90"
+ margin="20pt">
+ <!-- page-height should properly fall back to 11 * 72000 -->
+ <test:assert property="page-height" expected="792000mpt" />
+ <fo:region-body />
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="tb-rl-0"
+ page-width="indefinite" page-height="indefinite"
+ writing-mode="tb-rl" reference-orientation="0"
+ margin="20pt">
+ <!-- page-height should properly fall back to 11 * 72000 -->
+ <test:assert property="page-height" expected="792000mpt" />
+ <fo:region-body />
+ </fo:simple-page-master>
+ <fo:simple-page-master master-name="tb-rl-90"
+ page-width="indefinite" page-height="indefinite"
+ writing-mode="tb-rl" reference-orientation="90"
+ margin="20pt">
+ <!-- page-width should properly fall back to 8.26 * 72000 -->
+ <test:assert property="page-width" expected="594720mpt" />
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="lr-tb-0">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="lr-tb-90">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="tb-rl-0">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ <fo:page-sequence master-reference="tb-rl-90">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>Testing page-height and page-width both "indefinite"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
diff --git a/test/fotree/testcases/properties_omitted_propertyname.fo b/test/fotree/testcases/properties_omitted_propertyname.fo index b8bba4d7c..ab3808540 100644 --- a/test/fotree/testcases/properties_omitted_propertyname.fo +++ b/test/fotree/testcases/properties_omitted_propertyname.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/shorthand-prop-mix.fo b/test/fotree/testcases/shorthand-prop-mix.fo index 822d5c740..2f7ba10b3 100644 --- a/test/fotree/testcases/shorthand-prop-mix.fo +++ b/test/fotree/testcases/shorthand-prop-mix.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/table-border-separation2.fo b/test/fotree/testcases/table-border-separation2.fo index e1f102f48..94d93479c 100644 --- a/test/fotree/testcases/table-border-separation2.fo +++ b/test/fotree/testcases/table-border-separation2.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/table_border-separation.fo b/test/fotree/testcases/table_border-separation.fo index 5819255f2..f0af4fa8d 100644 --- a/test/fotree/testcases/table_border-separation.fo +++ b/test/fotree/testcases/table_border-separation.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/text-align.fo b/test/fotree/testcases/text-align.fo index 56e29e7dc..375cfd6b7 100644 --- a/test/fotree/testcases/text-align.fo +++ b/test/fotree/testcases/text-align.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/fotree/testcases/white-space_shorthand-expansion.fo b/test/fotree/testcases/white-space_shorthand-expansion.fo index 427d76637..f49b7146c 100644 --- a/test/fotree/testcases/white-space_shorthand-expansion.fo +++ b/test/fotree/testcases/white-space_shorthand-expansion.fo @@ -1,50 +1,51 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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$ --> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:flow flow-name="xsl-region-body"> - <fo:block white-space="normal"> - <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" /> - <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" /> - <test:assert property="white-space-collapse" expected="TRUE" /> - <test:assert property="wrap-option" expected="WRAP" /> - Block 1: testing white-space="normal" - </fo:block> - <fo:block white-space="pre"> - <test:assert property="linefeed-treatment" expected="PRESERVE" /> - <test:assert property="white-space-treatment" expected="PRESERVE" /> - <test:assert property="white-space-collapse" expected="FALSE" /> - <test:assert property="wrap-option" expected="NO_WRAP" /> - Block 2: testing white-space="pre" - </fo:block> - <fo:block white-space="nowrap"> - <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" /> - <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" /> - <test:assert property="white-space-collapse" expected="TRUE" /> - <test:assert property="wrap-option" expected="NO_WRAP" /> - Block 3: testing white-space="no-wrap" - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - +<?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$ -->
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:test="http://xmlgraphics.apache.org/fop/test">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block white-space="normal">
+ <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" />
+ <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" />
+ <test:assert property="white-space-collapse" expected="TRUE" />
+ <test:assert property="wrap-option" expected="WRAP" />
+ Block 1: testing white-space="normal"
+ </fo:block>
+ <fo:block white-space="pre">
+ <test:assert property="linefeed-treatment" expected="PRESERVE" />
+ <test:assert property="white-space-treatment" expected="PRESERVE" />
+ <test:assert property="white-space-collapse" expected="FALSE" />
+ <test:assert property="wrap-option" expected="NO_WRAP" />
+ Block 2: testing white-space="pre"
+ </fo:block>
+ <fo:block white-space="nowrap">
+ <test:assert property="linefeed-treatment" expected="TREAT_AS_SPACE" />
+ <test:assert property="white-space-treatment" expected="IGNORE_IF_SURROUNDING_LINEFEED" />
+ <test:assert property="white-space-collapse" expected="TRUE" />
+ <test:assert property="wrap-option" expected="NO_WRAP" />
+ Block 3: testing white-space="no-wrap"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+
diff --git a/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java b/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java index 084560798..a198518ac 100644 --- a/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java +++ b/test/java/org/apache/fop/AbstractBasicTranscoderTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/AbstractFOPTestCase.java b/test/java/org/apache/fop/AbstractFOPTestCase.java index 1fa960bb4..3df52fc4c 100644 --- a/test/java/org/apache/fop/AbstractFOPTestCase.java +++ b/test/java/org/apache/fop/AbstractFOPTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/BasicDriverTestCase.java b/test/java/org/apache/fop/BasicDriverTestCase.java index 33bfb1841..34f1002e0 100644 --- a/test/java/org/apache/fop/BasicDriverTestCase.java +++ b/test/java/org/apache/fop/BasicDriverTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/BasicDriverTestSuite.java b/test/java/org/apache/fop/BasicDriverTestSuite.java index 5da150649..62bd262a8 100644 --- a/test/java/org/apache/fop/BasicDriverTestSuite.java +++ b/test/java/org/apache/fop/BasicDriverTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java b/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java index 492e8982d..9dba9abdf 100644 --- a/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java +++ b/test/java/org/apache/fop/BasicPDFTranscoderTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/BasicPSTranscoderTestCase.java b/test/java/org/apache/fop/BasicPSTranscoderTestCase.java index e21283a7e..c66b31874 100644 --- a/test/java/org/apache/fop/BasicPSTranscoderTestCase.java +++ b/test/java/org/apache/fop/BasicPSTranscoderTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/BasicTranscoderTestSuite.java b/test/java/org/apache/fop/BasicTranscoderTestSuite.java index ec07b3a58..8c0103cdc 100644 --- a/test/java/org/apache/fop/BasicTranscoderTestSuite.java +++ b/test/java/org/apache/fop/BasicTranscoderTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/DebugHelper.java b/test/java/org/apache/fop/DebugHelper.java index bf95147c3..ee51b07b6 100644 --- a/test/java/org/apache/fop/DebugHelper.java +++ b/test/java/org/apache/fop/DebugHelper.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/DigestFilterTestCase.java b/test/java/org/apache/fop/DigestFilterTestCase.java index 2343b6560..b2296c49a 100644 --- a/test/java/org/apache/fop/DigestFilterTestCase.java +++ b/test/java/org/apache/fop/DigestFilterTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/GenericFOPTestCase.java b/test/java/org/apache/fop/GenericFOPTestCase.java index 25f18b819..f09ae2611 100644 --- a/test/java/org/apache/fop/GenericFOPTestCase.java +++ b/test/java/org/apache/fop/GenericFOPTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/KnuthAlgorithmTestCase.java b/test/java/org/apache/fop/KnuthAlgorithmTestCase.java index 1e78e2d69..44c8d1961 100644 --- a/test/java/org/apache/fop/KnuthAlgorithmTestCase.java +++ b/test/java/org/apache/fop/KnuthAlgorithmTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/StandardTestSuite.java b/test/java/org/apache/fop/StandardTestSuite.java index 28d960446..6518c7cfc 100644 --- a/test/java/org/apache/fop/StandardTestSuite.java +++ b/test/java/org/apache/fop/StandardTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/URIResolutionTestCase.java b/test/java/org/apache/fop/URIResolutionTestCase.java index 367275d8b..1277126bc 100644 --- a/test/java/org/apache/fop/URIResolutionTestCase.java +++ b/test/java/org/apache/fop/URIResolutionTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/UtilityCodeTestSuite.java b/test/java/org/apache/fop/UtilityCodeTestSuite.java index 09a2ef982..f84390518 100644 --- a/test/java/org/apache/fop/UtilityCodeTestSuite.java +++ b/test/java/org/apache/fop/UtilityCodeTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/DummyFOEventHandler.java b/test/java/org/apache/fop/fotreetest/DummyFOEventHandler.java index d6e97dbdc..fcb9cfe6e 100644 --- a/test/java/org/apache/fop/fotreetest/DummyFOEventHandler.java +++ b/test/java/org/apache/fop/fotreetest/DummyFOEventHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java b/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java index 0243b4493..0b46a5c66 100644 --- a/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java +++ b/test/java/org/apache/fop/fotreetest/FOTreeTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/FOTreeTester.java b/test/java/org/apache/fop/fotreetest/FOTreeTester.java index ef0deea4d..9c2a260bc 100644 --- a/test/java/org/apache/fop/fotreetest/FOTreeTester.java +++ b/test/java/org/apache/fop/fotreetest/FOTreeTester.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/ResultCollector.java b/test/java/org/apache/fop/fotreetest/ResultCollector.java index 9c85ec980..a1c7cee7c 100644 --- a/test/java/org/apache/fop/fotreetest/ResultCollector.java +++ b/test/java/org/apache/fop/fotreetest/ResultCollector.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/ext/AssertElement.java b/test/java/org/apache/fop/fotreetest/ext/AssertElement.java index 0a40b7604..3b678cdae 100644 --- a/test/java/org/apache/fop/fotreetest/ext/AssertElement.java +++ b/test/java/org/apache/fop/fotreetest/ext/AssertElement.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java b/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java index a17c6f0b2..f0b8ef2c8 100644 --- a/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java +++ b/test/java/org/apache/fop/fotreetest/ext/TestElementMapping.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/fotreetest/ext/TestObj.java b/test/java/org/apache/fop/fotreetest/ext/TestObj.java index f1ff71ab4..615062304 100644 --- a/test/java/org/apache/fop/fotreetest/ext/TestObj.java +++ b/test/java/org/apache/fop/fotreetest/ext/TestObj.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java b/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java index be7f73e13..7bc2a9fc5 100644 --- a/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java +++ b/test/java/org/apache/fop/intermediate/AreaTreeParserTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java b/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java index 77ade702c..f72b2da87 100644 --- a/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java +++ b/test/java/org/apache/fop/intermediate/IntermediateFormatTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/ElementListCheck.java b/test/java/org/apache/fop/layoutengine/ElementListCheck.java index 151dbd18d..14eba7b98 100644 --- a/test/java/org/apache/fop/layoutengine/ElementListCheck.java +++ b/test/java/org/apache/fop/layoutengine/ElementListCheck.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/ElementListCollector.java b/test/java/org/apache/fop/layoutengine/ElementListCollector.java index 3956434f3..3bad1de98 100644 --- a/test/java/org/apache/fop/layoutengine/ElementListCollector.java +++ b/test/java/org/apache/fop/layoutengine/ElementListCollector.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/EvalCheck.java b/test/java/org/apache/fop/layoutengine/EvalCheck.java index 497b324a9..bae98ee5f 100644 --- a/test/java/org/apache/fop/layoutengine/EvalCheck.java +++ b/test/java/org/apache/fop/layoutengine/EvalCheck.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java b/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java index d77186b2f..22741827a 100644 --- a/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java +++ b/test/java/org/apache/fop/layoutengine/LayoutEngineCheck.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java b/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java index 12e6834f8..a04fa8064 100644 --- a/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java +++ b/test/java/org/apache/fop/layoutengine/LayoutEngineTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java b/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java index f3262e881..a10bfa0e3 100644 --- a/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java +++ b/test/java/org/apache/fop/layoutengine/LayoutEngineTester.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/LayoutResult.java b/test/java/org/apache/fop/layoutengine/LayoutResult.java index e58bbb9a0..aa425c2ce 100644 --- a/test/java/org/apache/fop/layoutengine/LayoutResult.java +++ b/test/java/org/apache/fop/layoutengine/LayoutResult.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/ResultCheck.java b/test/java/org/apache/fop/layoutengine/ResultCheck.java index f2d7a52fe..d7a55691f 100644 --- a/test/java/org/apache/fop/layoutengine/ResultCheck.java +++ b/test/java/org/apache/fop/layoutengine/ResultCheck.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/layoutengine/TrueCheck.java b/test/java/org/apache/fop/layoutengine/TrueCheck.java index afb712c08..b4504f63e 100644 --- a/test/java/org/apache/fop/layoutengine/TrueCheck.java +++ b/test/java/org/apache/fop/layoutengine/TrueCheck.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/logging/LoggingElementListObserver.java b/test/java/org/apache/fop/logging/LoggingElementListObserver.java index 881a8c3ee..b408854c8 100644 --- a/test/java/org/apache/fop/logging/LoggingElementListObserver.java +++ b/test/java/org/apache/fop/logging/LoggingElementListObserver.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java b/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java index 9e5c6b421..ca647a4b6 100644 --- a/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java +++ b/test/java/org/apache/fop/render/pdf/PDFAConformanceTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java b/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java index 9c853735a..950bb2e8f 100644 --- a/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java +++ b/test/java/org/apache/fop/render/rtf/Bug39607TestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java b/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java index 5f90a403c..68189d8f5 100644 --- a/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java +++ b/test/java/org/apache/fop/render/rtf/RichTextFormatTestSuite.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java index bd3bc5490..01160f493 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/BasicLink.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java index 18c8225df..d7891e6a0 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/CreateTestDocuments.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java index 15a60f6f3..fab59b4ed 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/DummyTableColumnsInfo.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java index 4e7c45676..537770a84 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ExternalGraphic.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java index ac7910ad4..947bbd866 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ListInTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java index 480460bef..0a5fb73e0 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/MergedTableCells.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java index c21a73655..a9d005257 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/NestedTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java index ea28a415e..c9edea0a4 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/ParagraphAlignment.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java index 8921172f9..cae40ea66 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleDocument.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java index 1a958530f..ec9ef6878 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleLists.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java index f09d49bd3..5ef1102b0 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/SimpleTable.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java index db7b61805..f64ff548b 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TestDocument.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java index 8480e7a06..da69fb332 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/TextAttributes.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java index f82fc0352..4ef9ec6d5 100644 --- a/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java +++ b/test/java/org/apache/fop/render/rtf/rtflib/testdocs/Whitespace.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/threading/FOPTestbed.java b/test/java/org/apache/fop/threading/FOPTestbed.java index 85a4cff11..e5cdaaf74 100644 --- a/test/java/org/apache/fop/threading/FOPTestbed.java +++ b/test/java/org/apache/fop/threading/FOPTestbed.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/threading/FOProcessor.java b/test/java/org/apache/fop/threading/FOProcessor.java index 1f8cbd907..8149ab04a 100644 --- a/test/java/org/apache/fop/threading/FOProcessor.java +++ b/test/java/org/apache/fop/threading/FOProcessor.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/threading/FOProcessorImpl.java b/test/java/org/apache/fop/threading/FOProcessorImpl.java index 303cffd47..b5b2ff57d 100644 --- a/test/java/org/apache/fop/threading/FOProcessorImpl.java +++ b/test/java/org/apache/fop/threading/FOProcessorImpl.java @@ -1,9 +1,10 @@ /* - * Copyright 2004-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/threading/Main.java b/test/java/org/apache/fop/threading/Main.java index 565f5de39..ae3bf2ab1 100644 --- a/test/java/org/apache/fop/threading/Main.java +++ b/test/java/org/apache/fop/threading/Main.java @@ -1,9 +1,10 @@ /* - * Copyright 2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/traits/BorderPropsTestCase.java b/test/java/org/apache/fop/traits/BorderPropsTestCase.java index 8e12c43fd..e6988d423 100644 --- a/test/java/org/apache/fop/traits/BorderPropsTestCase.java +++ b/test/java/org/apache/fop/traits/BorderPropsTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/traits/TraitColorTestCase.java b/test/java/org/apache/fop/traits/TraitColorTestCase.java index daf012603..70c2fdd09 100644 --- a/test/java/org/apache/fop/traits/TraitColorTestCase.java +++ b/test/java/org/apache/fop/traits/TraitColorTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/util/DigestFilter.java b/test/java/org/apache/fop/util/DigestFilter.java index c6494073e..6c2f353d4 100644 --- a/test/java/org/apache/fop/util/DigestFilter.java +++ b/test/java/org/apache/fop/util/DigestFilter.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2004 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/util/PDFNumberTestCase.java b/test/java/org/apache/fop/util/PDFNumberTestCase.java index 3c32d48b4..0602e4842 100644 --- a/test/java/org/apache/fop/util/PDFNumberTestCase.java +++ b/test/java/org/apache/fop/util/PDFNumberTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/util/UnitConvTestCase.java b/test/java/org/apache/fop/util/UnitConvTestCase.java index 4379460e1..6e4432d15 100644 --- a/test/java/org/apache/fop/util/UnitConvTestCase.java +++ b/test/java/org/apache/fop/util/UnitConvTestCase.java @@ -1,9 +1,10 @@ /* - * Copyright 2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/AbstractBitmapProducer.java b/test/java/org/apache/fop/visual/AbstractBitmapProducer.java index e20bfb97b..4093f4d94 100644 --- a/test/java/org/apache/fop/visual/AbstractBitmapProducer.java +++ b/test/java/org/apache/fop/visual/AbstractBitmapProducer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java b/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java index f26b2f9d9..216a4466e 100644 --- a/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java +++ b/test/java/org/apache/fop/visual/AbstractPSPDFBitmapProducer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/AbstractRedirectorLineHandler.java b/test/java/org/apache/fop/visual/AbstractRedirectorLineHandler.java index 868efbeaa..5b397c5f9 100644 --- a/test/java/org/apache/fop/visual/AbstractRedirectorLineHandler.java +++ b/test/java/org/apache/fop/visual/AbstractRedirectorLineHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/BatchDiffer.java b/test/java/org/apache/fop/visual/BatchDiffer.java index 271f1a120..2fe836773 100644 --- a/test/java/org/apache/fop/visual/BatchDiffer.java +++ b/test/java/org/apache/fop/visual/BatchDiffer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/BitmapComparator.java b/test/java/org/apache/fop/visual/BitmapComparator.java index e92f67fd1..70a627d7e 100644 --- a/test/java/org/apache/fop/visual/BitmapComparator.java +++ b/test/java/org/apache/fop/visual/BitmapComparator.java @@ -1,9 +1,10 @@ /* - * Copyright 1999-2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/BitmapProducer.java b/test/java/org/apache/fop/visual/BitmapProducer.java index a83adad50..4a16bd276 100644 --- a/test/java/org/apache/fop/visual/BitmapProducer.java +++ b/test/java/org/apache/fop/visual/BitmapProducer.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/BitmapProducerJava2D.java b/test/java/org/apache/fop/visual/BitmapProducerJava2D.java index 060384447..c445fe078 100644 --- a/test/java/org/apache/fop/visual/BitmapProducerJava2D.java +++ b/test/java/org/apache/fop/visual/BitmapProducerJava2D.java @@ -1,9 +1,10 @@ /* - * Copyright 2005-2006 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/BitmapProducerPDF.java b/test/java/org/apache/fop/visual/BitmapProducerPDF.java index d5a7b1be8..a7f2f1849 100644 --- a/test/java/org/apache/fop/visual/BitmapProducerPDF.java +++ b/test/java/org/apache/fop/visual/BitmapProducerPDF.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/BitmapProducerPS.java b/test/java/org/apache/fop/visual/BitmapProducerPS.java index b4da31ba5..a60346254 100644 --- a/test/java/org/apache/fop/visual/BitmapProducerPS.java +++ b/test/java/org/apache/fop/visual/BitmapProducerPS.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/ConvertUtils.java b/test/java/org/apache/fop/visual/ConvertUtils.java index cb7958ecd..cdfa0efb1 100644 --- a/test/java/org/apache/fop/visual/ConvertUtils.java +++ b/test/java/org/apache/fop/visual/ConvertUtils.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/ProducerContext.java b/test/java/org/apache/fop/visual/ProducerContext.java index eda08e60d..11e103a73 100644 --- a/test/java/org/apache/fop/visual/ProducerContext.java +++ b/test/java/org/apache/fop/visual/ProducerContext.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/RedirectorLineHandler.java b/test/java/org/apache/fop/visual/RedirectorLineHandler.java index 2e37527a0..d77870397 100644 --- a/test/java/org/apache/fop/visual/RedirectorLineHandler.java +++ b/test/java/org/apache/fop/visual/RedirectorLineHandler.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java b/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java index 0daec6a46..1d03e0f95 100644 --- a/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java +++ b/test/java/org/apache/fop/visual/ReferenceBitmapLoader.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/java/org/apache/fop/visual/StreamRedirector.java b/test/java/org/apache/fop/visual/StreamRedirector.java index ba509b57b..c96cf6c42 100644 --- a/test/java/org/apache/fop/visual/StreamRedirector.java +++ b/test/java/org/apache/fop/visual/StreamRedirector.java @@ -1,9 +1,10 @@ /* - * Copyright 2005 The Apache Software Foundation. - * - * Licensed 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 + * 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 * diff --git a/test/layoutengine/disabled-testcase2filename.xsl b/test/layoutengine/disabled-testcase2filename.xsl index 2eb9ed880..68b9a7f47 100755 --- a/test/layoutengine/disabled-testcase2filename.xsl +++ b/test/layoutengine/disabled-testcase2filename.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/disabled-testcases.dtd b/test/layoutengine/disabled-testcases.dtd index d3db57974..ae53e2b40 100755 --- a/test/layoutengine/disabled-testcases.dtd +++ b/test/layoutengine/disabled-testcases.dtd @@ -1,9 +1,10 @@ <!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/disabled-testcases.xml b/test/layoutengine/disabled-testcases.xml index bc3a65a8f..f920caea4 100644 --- a/test/layoutengine/disabled-testcases.xml +++ b/test/layoutengine/disabled-testcases.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <?xml-stylesheet type="text/xsl" href="disabled-testcases.xsl"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/disabled-testcases.xsl b/test/layoutengine/disabled-testcases.xsl index 2a358697c..04a3a6d12 100644 --- a/test/layoutengine/disabled-testcases.xsl +++ b/test/layoutengine/disabled-testcases.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml b/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml index 3bcbdbeb5..af79c559b 100755 --- a/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml +++ b/test/layoutengine/hyphenation-testcases/block_hyphenation-ladder-count.xml @@ -1,354 +1,355 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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>
diff --git a/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml b/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml index 5ee6c9b68..f1f0cbd1e 100644 --- a/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml +++ b/test/layoutengine/hyphenation-testcases/block_hyphenation_kerning.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml b/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml index d131abb05..d1231892f 100644 --- a/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml +++ b/test/layoutengine/hyphenation-testcases/block_hyphenation_linefeed_preserve.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/hyphenation-testcases/block_hyphenation_no-wrap.xml b/test/layoutengine/hyphenation-testcases/block_hyphenation_no-wrap.xml index 61609509f..6dd5bd807 100644 --- a/test/layoutengine/hyphenation-testcases/block_hyphenation_no-wrap.xml +++ b/test/layoutengine/hyphenation-testcases/block_hyphenation_no-wrap.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/hyphenation-testcases/footnote_in_inline.xml b/test/layoutengine/hyphenation-testcases/footnote_in_inline.xml index 6f5a1a8c4..baf0ed73e 100644 --- a/test/layoutengine/hyphenation-testcases/footnote_in_inline.xml +++ b/test/layoutengine/hyphenation-testcases/footnote_in_inline.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml index d55fdc934..cf4c1818a 100755 --- a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml +++ b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate.xml @@ -1,399 +1,400 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:inlines with border and padding properties and hyphenation. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="start" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="end" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="justify" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" .conditionality="discard". - </fo:block> - - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="start" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="end" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="justify" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" .conditionality="retain". - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="261100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="39570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="261100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="39570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="262613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="268613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="39570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="222190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="100030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="104030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="265100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="345720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="45570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="265100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="345720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="45570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="259229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="269229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="45570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="226190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="299050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="309050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="111150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="121150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/> - </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>
+ This test checks fo:inlines with border and padding properties and hyphenation.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="start" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="end" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="justify" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" .conditionality="discard".
+ </fo:block>
+
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="start" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="end" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="justify" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" .conditionality="retain".
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="261100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="39570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="261100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="39570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="262613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="268613" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="39570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="222190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="310170" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="100030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="104030" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="265100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="345720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="45570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="265100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="345720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="45570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="259229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="269229" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="45570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="226190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="299050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="309050" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="111150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="121150" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml index 48750c06e..0e058d9e8 100755 --- a/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml +++ b/test/layoutengine/hyphenation-testcases/inline_border_padding_hyphenate_de.xml @@ -1,399 +1,400 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inlines with border and padding properties and hyphenation. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="de"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="start" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="end" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="justify" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="center" .conditionality="discard". - </fo:block> - - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="start" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="end" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="justify" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz - Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline> - text-align="center" .conditionality="retain". - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="250110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="256110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="91710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="95710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="250110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="256110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="91710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="95710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="250110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="256110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="91710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="95710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="238440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="244440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="131180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="135180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="250110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="260110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="336820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="346820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="103380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="113380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="250110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="260110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="336820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="346820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="103380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="113380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="250110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="260110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="103380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="113380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="238440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="248440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="320690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="330690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="131180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="141180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/> - </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>
+ This test checks inlines with border and padding properties and hyphenation.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="de">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="start" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="end" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="justify" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="center" .conditionality="discard".
+ </fo:block>
+
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="start" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="start" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="end" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="justify" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center" hyphenate="true">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">Rindfleischetikettierungsüberwachungsaufgabenübertragungsgesetz
+ Donaudampfschiffahrtselektrizitaetenhauptbetriebswerkbauunterbeamtengesellschaft</fo:inline>
+ text-align="center" .conditionality="retain".
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="250110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="256110" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="348490" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="91710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="95710" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="250110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="256110" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="348490" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="91710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="95710" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="250110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="256110" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="349999" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="91710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="95710" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="238440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="244440" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="320690" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="131180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="135180" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="250110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="260110" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="336820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="346820" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="103380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="113380" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="250110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="260110" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="336820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="346820" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="103380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="113380" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="250110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="260110" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="340000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="103380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="113380" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="238440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="248440" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="320690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="330690" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="131180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="141180" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/basic-link_background-image.xml b/test/layoutengine/standard-testcases/basic-link_background-image.xml index 7ec697ffa..88b5a4daf 100644 --- a/test/layoutengine/standard-testcases/basic-link_background-image.xml +++ b/test/layoutengine/standard-testcases/basic-link_background-image.xml @@ -1,48 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on a fo:basic-link. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Why is <fo:basic-link external-destination="http://xmlgraphics.apache.org/fop" font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:basic-link> so cool? - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/> - <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> - </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>
+ This test checks background image on a fo:basic-link.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Why is <fo:basic-link external-destination="http://xmlgraphics.apache.org/fop" font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:basic-link> so cool?
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/>
+ <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/basic-link_external-destination.xml b/test/layoutengine/standard-testcases/basic-link_external-destination.xml index 47ed6c323..6f7ba77d6 100644 --- a/test/layoutengine/standard-testcases/basic-link_external-destination.xml +++ b/test/layoutengine/standard-testcases/basic-link_external-destination.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/basic-link_external-destination_2.xml b/test/layoutengine/standard-testcases/basic-link_external-destination_2.xml index 3de152592..f804893ac 100644 --- a/test/layoutengine/standard-testcases/basic-link_external-destination_2.xml +++ b/test/layoutengine/standard-testcases/basic-link_external-destination_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position.xml b/test/layoutengine/standard-testcases/block-container_absolute-position.xml index 10e34f67c..50e850f9c 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position_border_padding.xml b/test/layoutengine/standard-testcases/block-container_absolute-position_border_padding.xml index cf9e88a06..147e1694d 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position_border_padding.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position_border_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position_display-align.xml b/test/layoutengine/standard-testcases/block-container_absolute-position_display-align.xml index 1d8c2300d..6fb1916c6 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position_display-align.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position_display-align.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position_fixed.xml b/test/layoutengine/standard-testcases/block-container_absolute-position_fixed.xml index 9c5850ccd..54db8dea7 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position_fixed.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position_fixed.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position_no-height.xml b/test/layoutengine/standard-testcases/block-container_absolute-position_no-height.xml index 931088f54..bbdf38e10 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position_no-height.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position_no-height.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position_overflow.xml b/test/layoutengine/standard-testcases/block-container_absolute-position_overflow.xml index d76bfc4b5..6e3d774f4 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position_overflow.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position_overflow.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_absolute-position_reference-orientation.xml b/test/layoutengine/standard-testcases/block-container_absolute-position_reference-orientation.xml index cbb478f85..d210359d4 100644 --- a/test/layoutengine/standard-testcases/block-container_absolute-position_reference-orientation.xml +++ b/test/layoutengine/standard-testcases/block-container_absolute-position_reference-orientation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml b/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml index ea09a97d6..41e8f6b4b 100644 --- a/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml +++ b/test/layoutengine/standard-testcases/block-container_background-image_background-position-relative.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml b/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml index 2ed43b0ce..6175b04ed 100644 --- a/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml +++ b/test/layoutengine/standard-testcases/block-container_background-image_background-repeat.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_borders.xml b/test/layoutengine/standard-testcases/block-container_borders.xml index d49de6c03..6a531844e 100644 --- a/test/layoutengine/standard-testcases/block-container_borders.xml +++ b/test/layoutengine/standard-testcases/block-container_borders.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_content_size_percentage.xml b/test/layoutengine/standard-testcases/block-container_content_size_percentage.xml index de4aaa083..b7e0505ab 100644 --- a/test/layoutengine/standard-testcases/block-container_content_size_percentage.xml +++ b/test/layoutengine/standard-testcases/block-container_content_size_percentage.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml b/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml index 58137ce56..7473fcc07 100644 --- a/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml +++ b/test/layoutengine/standard-testcases/block-container_display-align_distribute.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_display-align_space-before.xml b/test/layoutengine/standard-testcases/block-container_display-align_space-before.xml index b483edbd3..4e8829ece 100644 --- a/test/layoutengine/standard-testcases/block-container_display-align_space-before.xml +++ b/test/layoutengine/standard-testcases/block-container_display-align_space-before.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml b/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml index b34ef9a5e..3cdfda065 100644 --- a/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml +++ b/test/layoutengine/standard-testcases/block-container_element-list-handling-bug.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_overconstrained_ipd.xml b/test/layoutengine/standard-testcases/block-container_overconstrained_ipd.xml index 15c388575..5d80957df 100644 --- a/test/layoutengine/standard-testcases/block-container_overconstrained_ipd.xml +++ b/test/layoutengine/standard-testcases/block-container_overconstrained_ipd.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_overflow_1.xml b/test/layoutengine/standard-testcases/block-container_overflow_1.xml index eb3b7766d..b6b98c14c 100644 --- a/test/layoutengine/standard-testcases/block-container_overflow_1.xml +++ b/test/layoutengine/standard-testcases/block-container_overflow_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_padding_percentages.xml b/test/layoutengine/standard-testcases/block-container_padding_percentages.xml index ca76d9afe..4173b0c3c 100644 --- a/test/layoutengine/standard-testcases/block-container_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/block-container_padding_percentages.xml @@ -1,53 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative padding on block containers. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block-container width="2in" height="1in" background-color="yellow" padding="5%"> - <fo:block>margin not specified padding="5%" on this 2x1in yellow container</fo:block> - </fo:block-container> - <fo:block-container width="2in" height="1in" margin="0pt" background-color="blue" padding="5%"> - <fo:block>margin="0pt" padding="5%" on this 2x1in blue container</fo:block> - </fo:block-container> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/> - <eval expected="-18000" xpath="//flow/block[1]/@space-start"/> - <eval expected="-18000" xpath="//flow/block[1]/@space-end"/> - <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/> - <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/> - <eval expected="18000" xpath="//flow/block[2]/@start-indent"/> - <eval expected="18000" xpath="//flow/block[2]/@end-indent"/> - <eval expected="color=#0000ff" xpath="//flow/block[2]/@background"/> - </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>
+ This test checks relative padding on block containers.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block-container width="2in" height="1in" background-color="yellow" padding="5%">
+ <fo:block>margin not specified padding="5%" on this 2x1in yellow container</fo:block>
+ </fo:block-container>
+ <fo:block-container width="2in" height="1in" margin="0pt" background-color="blue" padding="5%">
+ <fo:block>margin="0pt" padding="5%" on this 2x1in blue container</fo:block>
+ </fo:block-container>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>
+ <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>
+ <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>
+ <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>
+ <eval expected="color=#0000ff" xpath="//flow/block[2]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block-container_page-breaking.xml b/test/layoutengine/standard-testcases/block-container_page-breaking.xml index bc6afe052..cad911441 100644 --- a/test/layoutengine/standard-testcases/block-container_page-breaking.xml +++ b/test/layoutengine/standard-testcases/block-container_page-breaking.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_reference-orientation.xml b/test/layoutengine/standard-testcases/block-container_reference-orientation.xml index c5ea1020e..aabedfbd7 100644 --- a/test/layoutengine/standard-testcases/block-container_reference-orientation.xml +++ b/test/layoutengine/standard-testcases/block-container_reference-orientation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml b/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml index 25a851391..615fb28e1 100644 --- a/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml +++ b/test/layoutengine/standard-testcases/block-container_reference-orientation_bug36391.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/block-container_space-before_space-after_1.xml b/test/layoutengine/standard-testcases/block-container_space-before_space-after_1.xml index 5397d516e..9f562b9b9 100644 --- a/test/layoutengine/standard-testcases/block-container_space-before_space-after_1.xml +++ b/test/layoutengine/standard-testcases/block-container_space-before_space-after_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_space-before_space-after_2.xml b/test/layoutengine/standard-testcases/block-container_space-before_space-after_2.xml index 8ed83492e..7178dea7e 100644 --- a/test/layoutengine/standard-testcases/block-container_space-before_space-after_2.xml +++ b/test/layoutengine/standard-testcases/block-container_space-before_space-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_space-before_space-after_3.xml b/test/layoutengine/standard-testcases/block-container_space-before_space-after_3.xml index 6e9d607d7..b5cad02f7 100644 --- a/test/layoutengine/standard-testcases/block-container_space-before_space-after_3.xml +++ b/test/layoutengine/standard-testcases/block-container_space-before_space-after_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_squeeze-content_1.xml b/test/layoutengine/standard-testcases/block-container_squeeze-content_1.xml index c3f652945..4b53d4927 100644 --- a/test/layoutengine/standard-testcases/block-container_squeeze-content_1.xml +++ b/test/layoutengine/standard-testcases/block-container_squeeze-content_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_start-indent.xml b/test/layoutengine/standard-testcases/block-container_start-indent.xml index 889d62b09..2a99e62fd 100644 --- a/test/layoutengine/standard-testcases/block-container_start-indent.xml +++ b/test/layoutengine/standard-testcases/block-container_start-indent.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-container_width_height.xml b/test/layoutengine/standard-testcases/block-container_width_height.xml index 2ec7f24fb..b69646f56 100644 --- a/test/layoutengine/standard-testcases/block-container_width_height.xml +++ b/test/layoutengine/standard-testcases/block-container_width_height.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block-level_id.xml b/test/layoutengine/standard-testcases/block-level_id.xml index 8d0a6bad2..5d42379e9 100644 --- a/test/layoutengine/standard-testcases/block-level_id.xml +++ b/test/layoutengine/standard-testcases/block-level_id.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_basic_1.xml b/test/layoutengine/standard-testcases/block_basic_1.xml index 4ef1e36cb..43308a1a9 100644 --- a/test/layoutengine/standard-testcases/block_basic_1.xml +++ b/test/layoutengine/standard-testcases/block_basic_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_basic_2.xml b/test/layoutengine/standard-testcases/block_basic_2.xml index d43cb0591..25e30c731 100644 --- a/test/layoutengine/standard-testcases/block_basic_2.xml +++ b/test/layoutengine/standard-testcases/block_basic_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_border-style.xml b/test/layoutengine/standard-testcases/block_border-style.xml index d16ea1308..8e81b136d 100644 --- a/test/layoutengine/standard-testcases/block_border-style.xml +++ b/test/layoutengine/standard-testcases/block_border-style.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_border.xml b/test/layoutengine/standard-testcases/block_border.xml index 7781cd908..e3cb58866 100644 --- a/test/layoutengine/standard-testcases/block_border.xml +++ b/test/layoutengine/standard-testcases/block_border.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_border_padding.xml b/test/layoutengine/standard-testcases/block_border_padding.xml index caf283542..24ade4802 100644 --- a/test/layoutengine/standard-testcases/block_border_padding.xml +++ b/test/layoutengine/standard-testcases/block_border_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_border_shorthands.xml b/test/layoutengine/standard-testcases/block_border_shorthands.xml index 9b32a423a..f0c912e6b 100644 --- a/test/layoutengine/standard-testcases/block_border_shorthands.xml +++ b/test/layoutengine/standard-testcases/block_border_shorthands.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_break-after.xml b/test/layoutengine/standard-testcases/block_break-after.xml index beab46358..9395c031e 100644 --- a/test/layoutengine/standard-testcases/block_break-after.xml +++ b/test/layoutengine/standard-testcases/block_break-after.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_break-after_2.xml b/test/layoutengine/standard-testcases/block_break-after_2.xml index 6c6e6acf0..cd259baab 100644 --- a/test/layoutengine/standard-testcases/block_break-after_2.xml +++ b/test/layoutengine/standard-testcases/block_break-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_break-before.xml b/test/layoutengine/standard-testcases/block_break-before.xml index 760e0697e..25bf686cd 100644 --- a/test/layoutengine/standard-testcases/block_break-before.xml +++ b/test/layoutengine/standard-testcases/block_break-before.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_break-before_bug37964.xml b/test/layoutengine/standard-testcases/block_break-before_bug37964.xml index dfcfdf8e4..509840a25 100644 --- a/test/layoutengine/standard-testcases/block_break-before_bug37964.xml +++ b/test/layoutengine/standard-testcases/block_break-before_bug37964.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_bug39414.xml b/test/layoutengine/standard-testcases/block_bug39414.xml index bf6a22362..e08011d14 100755 --- a/test/layoutengine/standard-testcases/block_bug39414.xml +++ b/test/layoutengine/standard-testcases/block_bug39414.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_font-family.xml b/test/layoutengine/standard-testcases/block_font-family.xml index 9cb9eee23..278d8ea57 100644 --- a/test/layoutengine/standard-testcases/block_font-family.xml +++ b/test/layoutengine/standard-testcases/block_font-family.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_font-size_absolute.xml b/test/layoutengine/standard-testcases/block_font-size_absolute.xml index d5af4c49d..cce189dce 100644 --- a/test/layoutengine/standard-testcases/block_font-size_absolute.xml +++ b/test/layoutengine/standard-testcases/block_font-size_absolute.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_font-size_percentage.xml b/test/layoutengine/standard-testcases/block_font-size_percentage.xml index dc906e249..ec256449d 100644 --- a/test/layoutengine/standard-testcases/block_font-size_percentage.xml +++ b/test/layoutengine/standard-testcases/block_font-size_percentage.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_font-size_relative.xml b/test/layoutengine/standard-testcases/block_font-size_relative.xml index d12ebfe07..25425b2d5 100644 --- a/test/layoutengine/standard-testcases/block_font-size_relative.xml +++ b/test/layoutengine/standard-testcases/block_font-size_relative.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_font-stretch.xml b/test/layoutengine/standard-testcases/block_font-stretch.xml index 07d7ab7cf..9f006d580 100644 --- a/test/layoutengine/standard-testcases/block_font-stretch.xml +++ b/test/layoutengine/standard-testcases/block_font-stretch.xml @@ -1,55 +1,56 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks font stretches. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block font-family="serif">font-family="serif" font-stretch not given</fo:block> - <fo:block font-family="serif" font-stretch="ultra-condensed">font-family="serif" font-stretch="ultra-condensed" - <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block> - </fo:block> - <fo:block font-family="serif" font-stretch="extra-condensed">font-family="serif" font-stretch="extra-condensed"</fo:block> - <fo:block font-family="serif" font-stretch="condensed">font-family="serif" font-stretch="condensed"</fo:block> - <fo:block font-family="serif" font-stretch="semi-condensed">font-family="serif" font-stretch="semi-condensed"</fo:block> - <fo:block font-family="serif" font-stretch="normal">font-family="serif" font-stretch="normal"</fo:block> - <fo:block font-family="serif" font-stretch="semi-expanded">font-family="serif" font-stretch="semi-expanded"</fo:block> - <fo:block font-family="serif" font-stretch="expanded">font-family="serif" font-stretch="expanded"</fo:block> - <fo:block font-family="serif" font-stretch="extra-expanded">font-family="serif" font-stretch="extra-expanded"</fo:block> - <fo:block font-family="serif" font-stretch="ultra-expanded">font-family="serif" font-stretch="ultra-expanded" - <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block> - </fo:block> - <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block> - <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - </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>
+ This test checks font stretches.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-family="serif">font-family="serif" font-stretch not given</fo:block>
+ <fo:block font-family="serif" font-stretch="ultra-condensed">font-family="serif" font-stretch="ultra-condensed"
+ <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
+ </fo:block>
+ <fo:block font-family="serif" font-stretch="extra-condensed">font-family="serif" font-stretch="extra-condensed"</fo:block>
+ <fo:block font-family="serif" font-stretch="condensed">font-family="serif" font-stretch="condensed"</fo:block>
+ <fo:block font-family="serif" font-stretch="semi-condensed">font-family="serif" font-stretch="semi-condensed"</fo:block>
+ <fo:block font-family="serif" font-stretch="normal">font-family="serif" font-stretch="normal"</fo:block>
+ <fo:block font-family="serif" font-stretch="semi-expanded">font-family="serif" font-stretch="semi-expanded"</fo:block>
+ <fo:block font-family="serif" font-stretch="expanded">font-family="serif" font-stretch="expanded"</fo:block>
+ <fo:block font-family="serif" font-stretch="extra-expanded">font-family="serif" font-stretch="extra-expanded"</fo:block>
+ <fo:block font-family="serif" font-stretch="ultra-expanded">font-family="serif" font-stretch="ultra-expanded"
+ <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
+ </fo:block>
+ <fo:block font-family="serif" font-stretch="narrower">font-family="serif" font-stretch="narrower"</fo:block>
+ <fo:block font-family="serif" font-stretch="wider">font-family="serif" font-stretch="wider"</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_font-style.xml b/test/layoutengine/standard-testcases/block_font-style.xml index 20eebf5c1..8e84674db 100644 --- a/test/layoutengine/standard-testcases/block_font-style.xml +++ b/test/layoutengine/standard-testcases/block_font-style.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_font-weight.xml b/test/layoutengine/standard-testcases/block_font-weight.xml index 70827a7a9..b9907ebc2 100644 --- a/test/layoutengine/standard-testcases/block_font-weight.xml +++ b/test/layoutengine/standard-testcases/block_font-weight.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_keep-together.xml b/test/layoutengine/standard-testcases/block_keep-together.xml index aa3c8085d..180215cb1 100644 --- a/test/layoutengine/standard-testcases/block_keep-together.xml +++ b/test/layoutengine/standard-testcases/block_keep-together.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_keep-with-next.xml b/test/layoutengine/standard-testcases/block_keep-with-next.xml index 120c2c806..29a446abf 100644 --- a/test/layoutengine/standard-testcases/block_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/block_keep-with-next.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_keep-with-next_nested.xml b/test/layoutengine/standard-testcases/block_keep-with-next_nested.xml index 42351f58f..5468d33fd 100644 --- a/test/layoutengine/standard-testcases/block_keep-with-next_nested.xml +++ b/test/layoutengine/standard-testcases/block_keep-with-next_nested.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_keep-with-previous.xml b/test/layoutengine/standard-testcases/block_keep-with-previous.xml index 8dd297802..6da18c4d4 100644 --- a/test/layoutengine/standard-testcases/block_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/block_keep-with-previous.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_keep-with-previous_nested.xml b/test/layoutengine/standard-testcases/block_keep-with-previous_nested.xml index 6784a061c..f70a91f4c 100644 --- a/test/layoutengine/standard-testcases/block_keep-with-previous_nested.xml +++ b/test/layoutengine/standard-testcases/block_keep-with-previous_nested.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_last-line-end-indent.xml b/test/layoutengine/standard-testcases/block_last-line-end-indent.xml index 156052de9..8cf450dd0 100644 --- a/test/layoutengine/standard-testcases/block_last-line-end-indent.xml +++ b/test/layoutengine/standard-testcases/block_last-line-end-indent.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_letter-spacing.xml b/test/layoutengine/standard-testcases/block_letter-spacing.xml index 37bece008..946571311 100644 --- a/test/layoutengine/standard-testcases/block_letter-spacing.xml +++ b/test/layoutengine/standard-testcases/block_letter-spacing.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_letter-spacing_text-align_justify.xml b/test/layoutengine/standard-testcases/block_letter-spacing_text-align_justify.xml index 90f8f1098..78064e535 100644 --- a/test/layoutengine/standard-testcases/block_letter-spacing_text-align_justify.xml +++ b/test/layoutengine/standard-testcases/block_letter-spacing_text-align_justify.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_line-height.xml b/test/layoutengine/standard-testcases/block_line-height.xml index 65a27ed61..10b8fcdc6 100644 --- a/test/layoutengine/standard-testcases/block_line-height.xml +++ b/test/layoutengine/standard-testcases/block_line-height.xml @@ -1,123 +1,124 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks line height and its special inheritance behaviour - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block line-height="normal" background-color="yellow">line-height="normal" - <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block> - <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block> - </fo:block> - <fo:block line-height="150%" background-color="yellow">line-height="150%" - <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block> - <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block> - </fo:block> - <fo:block line-height="20pt" background-color="yellow">line-height="20pt" - <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block> - <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block> - </fo:block> - <fo:block line-height="1.5" background-color="yellow">line-height="1.5" - <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block> - <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block> - </fo:block> - <fo:block line-height="150% - 5pt" background-color="yellow">line-height="150% - 5pt" - <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block> - <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpda"/> - <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-before"/> - <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-after"/> - <eval expected="13319" xpath="//flow/block[1]/block[1]/lineArea/@bpd"/> - <eval expected="17280" xpath="//flow/block[1]/block[1]/lineArea/@bpda"/> - <eval expected="1980" xpath="//flow/block[1]/block[1]/lineArea/@space-before"/> - <eval expected="1981" xpath="//flow/block[1]/block[1]/lineArea/@space-after"/> - <eval expected="9250" xpath="//flow/block[1]/block[2]/lineArea/@bpd"/> - <eval expected="12000" xpath="//flow/block[1]/block[2]/lineArea/@bpda"/> - <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-before"/> - <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-after"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="18000" xpath="//flow/block[2]/lineArea/@bpda"/> - <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-before"/> - <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-after"/> - <eval expected="13319" xpath="//flow/block[2]/block[1]/lineArea/@bpd"/> - <eval expected="18000" xpath="//flow/block[2]/block[1]/lineArea/@bpda"/> - <eval expected="2340" xpath="//flow/block[2]/block[1]/lineArea/@space-before"/> - <eval expected="2341" xpath="//flow/block[2]/block[1]/lineArea/@space-after"/> - <eval expected="9250" xpath="//flow/block[2]/block[2]/lineArea/@bpd"/> - <eval expected="18000" xpath="//flow/block[2]/block[2]/lineArea/@bpda"/> - <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-before"/> - <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-after"/> - - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="20000" xpath="//flow/block[3]/lineArea/@bpda"/> - <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-before"/> - <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-after"/> - <eval expected="13319" xpath="//flow/block[3]/block[1]/lineArea/@bpd"/> - <eval expected="20000" xpath="//flow/block[3]/block[1]/lineArea/@bpda"/> - <eval expected="3340" xpath="//flow/block[3]/block[1]/lineArea/@space-before"/> - <eval expected="3341" xpath="//flow/block[3]/block[1]/lineArea/@space-after"/> - <eval expected="9250" xpath="//flow/block[3]/block[2]/lineArea/@bpd"/> - <eval expected="20000" xpath="//flow/block[3]/block[2]/lineArea/@bpda"/> - <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-before"/> - <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-after"/> - - <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/> - <eval expected="18000" xpath="//flow/block[4]/lineArea/@bpda"/> - <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-before"/> - <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-after"/> - <eval expected="13319" xpath="//flow/block[4]/block[1]/lineArea/@bpd"/> - <eval expected="21600" xpath="//flow/block[4]/block[1]/lineArea/@bpda"/> - <eval expected="4140" xpath="//flow/block[4]/block[1]/lineArea/@space-before"/> - <eval expected="4141" xpath="//flow/block[4]/block[1]/lineArea/@space-after"/> - <eval expected="9250" xpath="//flow/block[4]/block[2]/lineArea/@bpd"/> - <eval expected="15000" xpath="//flow/block[4]/block[2]/lineArea/@bpda"/> - <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-before"/> - <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-after"/> - - <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/> - <eval expected="13000" xpath="//flow/block[5]/lineArea/@bpda"/> - <eval expected="950" xpath="//flow/block[5]/lineArea/@space-before"/> - <eval expected="950" xpath="//flow/block[5]/lineArea/@space-after"/> - <eval expected="13319" xpath="//flow/block[5]/block[1]/lineArea/@bpd"/> - <eval expected="13000" xpath="//flow/block[5]/block[1]/lineArea/@bpda"/> - <eval expected="-159" xpath="//flow/block[5]/block[1]/lineArea/@space-before"/> - <eval expected="-160" xpath="//flow/block[5]/block[1]/lineArea/@space-after"/> - <eval expected="9250" xpath="//flow/block[5]/block[2]/lineArea/@bpd"/> - <eval expected="13000" xpath="//flow/block[5]/block[2]/lineArea/@bpda"/> - <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-before"/> - <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-after"/> - </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>
+ This test checks line height and its special inheritance behaviour
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block line-height="normal" background-color="yellow">line-height="normal"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
+ </fo:block>
+ <fo:block line-height="150%" background-color="yellow">line-height="150%"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+ </fo:block>
+ <fo:block line-height="20pt" background-color="yellow">line-height="20pt"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+ </fo:block>
+ <fo:block line-height="1.5" background-color="yellow">line-height="1.5"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height grows</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height shrinks</fo:block>
+ </fo:block>
+ <fo:block line-height="150% - 5pt" background-color="yellow">line-height="150% - 5pt"
+ <fo:block font-size="larger" margin-left="10pt" background-color="blue">font-size="larger" - line height same as above</fo:block>
+ <fo:block font-size="smaller" margin-left="10pt" background-color="red">font-size="smaller" - line height same as above</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[1]/lineArea/@bpda"/>
+ <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-before"/>
+ <eval expected="1650" xpath="//flow/block[1]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[1]/block[1]/lineArea/@bpd"/>
+ <eval expected="17280" xpath="//flow/block[1]/block[1]/lineArea/@bpda"/>
+ <eval expected="1980" xpath="//flow/block[1]/block[1]/lineArea/@space-before"/>
+ <eval expected="1981" xpath="//flow/block[1]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[1]/block[2]/lineArea/@bpd"/>
+ <eval expected="12000" xpath="//flow/block[1]/block[2]/lineArea/@bpda"/>
+ <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[1]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[2]/lineArea/@bpda"/>
+ <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-before"/>
+ <eval expected="3450" xpath="//flow/block[2]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[2]/block[1]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[2]/block[1]/lineArea/@bpda"/>
+ <eval expected="2340" xpath="//flow/block[2]/block[1]/lineArea/@space-before"/>
+ <eval expected="2341" xpath="//flow/block[2]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[2]/block[2]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[2]/block[2]/lineArea/@bpda"/>
+ <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-before"/>
+ <eval expected="4375" xpath="//flow/block[2]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[3]/lineArea/@bpda"/>
+ <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-before"/>
+ <eval expected="4450" xpath="//flow/block[3]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[3]/block[1]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[3]/block[1]/lineArea/@bpda"/>
+ <eval expected="3340" xpath="//flow/block[3]/block[1]/lineArea/@space-before"/>
+ <eval expected="3341" xpath="//flow/block[3]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[3]/block[2]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[3]/block[2]/lineArea/@bpda"/>
+ <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-before"/>
+ <eval expected="5375" xpath="//flow/block[3]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="18000" xpath="//flow/block[4]/lineArea/@bpda"/>
+ <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-before"/>
+ <eval expected="3450" xpath="//flow/block[4]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[4]/block[1]/lineArea/@bpd"/>
+ <eval expected="21600" xpath="//flow/block[4]/block[1]/lineArea/@bpda"/>
+ <eval expected="4140" xpath="//flow/block[4]/block[1]/lineArea/@space-before"/>
+ <eval expected="4141" xpath="//flow/block[4]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[4]/block[2]/lineArea/@bpd"/>
+ <eval expected="15000" xpath="//flow/block[4]/block[2]/lineArea/@bpda"/>
+ <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-before"/>
+ <eval expected="2875" xpath="//flow/block[4]/block[2]/lineArea/@space-after"/>
+
+ <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="13000" xpath="//flow/block[5]/lineArea/@bpda"/>
+ <eval expected="950" xpath="//flow/block[5]/lineArea/@space-before"/>
+ <eval expected="950" xpath="//flow/block[5]/lineArea/@space-after"/>
+ <eval expected="13319" xpath="//flow/block[5]/block[1]/lineArea/@bpd"/>
+ <eval expected="13000" xpath="//flow/block[5]/block[1]/lineArea/@bpda"/>
+ <eval expected="-159" xpath="//flow/block[5]/block[1]/lineArea/@space-before"/>
+ <eval expected="-160" xpath="//flow/block[5]/block[1]/lineArea/@space-after"/>
+ <eval expected="9250" xpath="//flow/block[5]/block[2]/lineArea/@bpd"/>
+ <eval expected="13000" xpath="//flow/block[5]/block[2]/lineArea/@bpda"/>
+ <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-before"/>
+ <eval expected="1875" xpath="//flow/block[5]/block[2]/lineArea/@space-after"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml b/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml index 8de776c30..a29c974f9 100644 --- a/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml +++ b/test/layoutengine/standard-testcases/block_line-stacking-strategy_1.xml @@ -1,164 +1,165 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks line-stacking-strategy font-height against inlines of different sizes. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="20pt" - background-color="yellow">bigger - </fo:inline> - After - </fo:block> - <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="20pt" - border="solid 2pt red" - padding="3pt" - background-color="yellow">bigger with b & p - </fo:inline> - After - </fo:block> - <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="sub" - background-color="yellow">sub - <fo:inline font-size="8pt" - baseline-shift="sub" - background-color="red">sub - </fo:inline>sub - </fo:inline> - After - </fo:block> - <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="8pt" - baseline-shift="super" - background-color="red">super - </fo:inline>super - </fo:inline> - After - </fo:block> - <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="18pt" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="24pt" - baseline-shift="sub" - background-color="red">sub - <fo:inline font-size="30pt" - baseline-shift="super" - background-color="green">super - </fo:inline>sub - </fo:inline>super - </fo:inline> - After - </fo:block> - <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="18pt" - baseline-shift="sub" - background-color="yellow">sub - <fo:inline font-size="24pt" - baseline-shift="super" - background-color="red">super - <fo:inline font-size="36pt" - baseline-shift="sub" - background-color="green">sub - </fo:inline>super - </fo:inline>sub - </fo:inline> - After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks line-stacking-strategy font-height against inlines of different sizes.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="20pt"
+ background-color="yellow">bigger
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="20pt"
+ border="solid 2pt red"
+ padding="3pt"
+ background-color="yellow">bigger with b & p
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="8pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ </fo:inline>sub
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="8pt"
+ baseline-shift="super"
+ background-color="red">super
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="18pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="24pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ <fo:inline font-size="30pt"
+ baseline-shift="super"
+ background-color="green">super
+ </fo:inline>sub
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block line-stacking-strategy="font-height" background-color="silver" margin="5pt 0pt 5pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="18pt"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="24pt"
+ baseline-shift="super"
+ background-color="red">super
+ <fo:inline font-size="36pt"
+ baseline-shift="sub"
+ background-color="green">sub
+ </fo:inline>super
+ </fo:inline>sub
+ </fo:inline>
+ After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5487" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="3528" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-4450" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3794" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="-10194" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="1968" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="-16860" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1835" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-13722" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="798" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_linefeed-treatment.xml b/test/layoutengine/standard-testcases/block_linefeed-treatment.xml index 3dc540562..23686bb10 100644 --- a/test/layoutengine/standard-testcases/block_linefeed-treatment.xml +++ b/test/layoutengine/standard-testcases/block_linefeed-treatment.xml @@ -1,80 +1,81 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks white space handling for linefeed-treatment. - This currently fails because - a) Preserved linefeeds in fo:character are not handled correctly - b) ZWSP are not handled correctly - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block linefeed-treatment="treat-as-space" background-color="silver" margin="1pt 0pt 1pt 0pt"> -treat-as-space -all<fo:character character="
"/>linefeeds -</fo:block> - <fo:block linefeed-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt"> -ignore -all<fo:character character="
"/>linefeeds -</fo:block> - <fo:block linefeed-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt"> -preserve -all<fo:character character="
"/>linefeeds -</fo:block> - <fo:block linefeed-treatment="treat-as-zero-width-space" background-color="silver" margin="1pt 0pt 1pt 0pt"> -treat-as-zero-width-space -all<fo:character character="
"/>linefeeds -</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/char)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/> - <eval expected="0" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/> - - <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[1]/word)"/> - <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[1]/space)"/> - <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[2]/word)"/> - <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[2]/space)"/> - - <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/> - <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/> - - <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/> - - </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>
+ This test checks white space handling for linefeed-treatment.
+ This currently fails because
+ a) Preserved linefeeds in fo:character are not handled correctly
+ b) ZWSP are not handled correctly
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block linefeed-treatment="treat-as-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
+treat-as-space
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ <fo:block linefeed-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ignore
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ <fo:block linefeed-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+preserve
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ <fo:block linefeed-treatment="treat-as-zero-width-space" background-color="silver" margin="1pt 0pt 1pt 0pt">
+treat-as-zero-width-space
+all<fo:character character="
"/>linefeeds
+</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/char)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
+ <eval expected="0" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
+
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[1]/word)"/>
+ <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text[2]/word)"/>
+ <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text[2]/space)"/>
+
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[1]/text)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[4]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[4]/text/space)"/>
+
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_linefeed-treatment_2.xml b/test/layoutengine/standard-testcases/block_linefeed-treatment_2.xml index bb9587ec5..9632b0dec 100644 --- a/test/layoutengine/standard-testcases/block_linefeed-treatment_2.xml +++ b/test/layoutengine/standard-testcases/block_linefeed-treatment_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_margin.xml b/test/layoutengine/standard-testcases/block_margin.xml index 3723e5da0..81f8fad24 100644 --- a/test/layoutengine/standard-testcases/block_margin.xml +++ b/test/layoutengine/standard-testcases/block_margin.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_margin_inherit.xml b/test/layoutengine/standard-testcases/block_margin_inherit.xml index ea43a11cd..4466dbd34 100644 --- a/test/layoutengine/standard-testcases/block_margin_inherit.xml +++ b/test/layoutengine/standard-testcases/block_margin_inherit.xml @@ -1,76 +1,77 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks margin percentages on fo:block with explict inheritance. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block margin="5%" background-color="yellow"> - <fo:block margin="inherit" background-color="blue"> - margin="inherit" - should have the same margin as the enclosing block - </fo:block> - </fo:block> - <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <element-list category="breaker"> - <box w="0"/> - <penalty w="0" p="INF"/> - <glue w="18000" y="0" z="0"/> - <box w="14400"/> - <box w="14400"/> - <penalty w="0" p="INF"/> - <glue w="18000" y="0" z="0"/> - <penalty w="0" p="0"/> - <box w="14400"/> - <box w="14400"/> - <skip>3</skip> - </element-list> - - <true xpath="not(boolean(//flow/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules --> - <eval expected="324000" xpath="//flow/block[1]/@ipd"/> - <eval expected="18000" xpath="//flow/block[1]/@start-indent"/> - <eval expected="18000" xpath="//flow/block[1]/@end-indent"/> - <eval expected="18000" xpath="//flow/block[1]/@space-start"/> - <eval expected="18000" xpath="//flow/block[1]/@space-end"/> - - <eval expected="18000" xpath="//flow/block[1]/block[1]/@space-before"/> - <eval expected="288000" xpath="//flow/block[1]/block[1]/@ipd"/> - <eval expected="36000" xpath="//flow/block[1]/block[1]/@start-indent"/> - <eval expected="36000" xpath="//flow/block[1]/block[1]/@end-indent"/> - <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-start"/> - <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-end"/> - <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/> <!-- space collapsed under space resolution rules --> - <true xpath="not(boolean(//flow/block[1]/block[2]))"/> - - <eval expected="18000" xpath="//flow/block[1]/@space-after"/> - </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>
+ This test checks margin percentages on fo:block with explict inheritance.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block margin="5%" background-color="yellow">
+ <fo:block margin="inherit" background-color="blue">
+ margin="inherit" - should have the same margin as the enclosing block
+ </fo:block>
+ </fo:block>
+ <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="18000" y="0" z="0"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <penalty w="0" p="INF"/>
+ <glue w="18000" y="0" z="0"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+
+ <true xpath="not(boolean(//flow/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
+ <eval expected="324000" xpath="//flow/block[1]/@ipd"/>
+ <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>
+ <eval expected="18000" xpath="//flow/block[1]/@space-start"/>
+ <eval expected="18000" xpath="//flow/block[1]/@space-end"/>
+
+ <eval expected="18000" xpath="//flow/block[1]/block[1]/@space-before"/>
+ <eval expected="288000" xpath="//flow/block[1]/block[1]/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@start-indent"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@end-indent"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-start"/>
+ <eval expected="36000" xpath="//flow/block[1]/block[1]/@space-end"/>
+ <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/> <!-- space collapsed under space resolution rules -->
+ <true xpath="not(boolean(//flow/block[1]/block[2]))"/>
+
+ <eval expected="18000" xpath="//flow/block[1]/@space-after"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_margin_percentages.xml b/test/layoutengine/standard-testcases/block_margin_percentages.xml index c84a816c5..7f5e947b4 100644 --- a/test/layoutengine/standard-testcases/block_margin_percentages.xml +++ b/test/layoutengine/standard-testcases/block_margin_percentages.xml @@ -1,76 +1,77 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks margin percentages on fo:block. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block margin="5%" background-color="yellow"> - <fo:block margin="5%" background-color="blue"> - margin="5%" - should have the slightly smaller margin than the enclosing block - </fo:block> - </fo:block> - <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <element-list category="breaker"> - <box w="0"/> - <penalty w="0" p="INF"/> - <glue w="18000" y="0" z="0"/> - <box w="14400"/> - <box w="14400"/> - <penalty w="0" p="INF"/> - <glue w="18000" y="0" z="0"/> - <penalty w="0" p="0"/> - <box w="14400"/> - <box w="14400"/> - <skip>3</skip> - </element-list> - - <eval expected="18000" xpath="//flow/block[1]/@space-before"/> - <eval expected="324000" xpath="//flow/block[1]/@ipd"/> - <eval expected="18000" xpath="//flow/block[1]/@start-indent"/> - <eval expected="18000" xpath="//flow/block[1]/@end-indent"/> - <eval expected="18000" xpath="//flow/block[1]/@space-start"/> - <eval expected="18000" xpath="//flow/block[1]/@space-end"/> - - <true xpath="not(boolean(//flow/block[1]/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules --> - <eval expected="291600" xpath="//flow/block[1]/block[1]/@ipd"/> - <eval expected="34200" xpath="//flow/block[1]/block[1]/@start-indent"/> - <eval expected="34200" xpath="//flow/block[1]/block[1]/@end-indent"/> - <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-start"/> - <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-end"/> - <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/> <!-- space collapsed under space resolution rules --> - <true xpath="not(boolean(//flow/block[1]/block[2]))"/> - - <eval expected="18000" xpath="//flow/block[1]/@space-after"/> - </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>
+ This test checks margin percentages on fo:block.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block margin="5%" background-color="yellow">
+ <fo:block margin="5%" background-color="blue">
+ margin="5%" - should have the slightly smaller margin than the enclosing block
+ </fo:block>
+ </fo:block>
+ <fo:block>Yellow block has margin="5%" - 18pt margin based on 5in page width</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <element-list category="breaker">
+ <box w="0"/>
+ <penalty w="0" p="INF"/>
+ <glue w="18000" y="0" z="0"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <penalty w="0" p="INF"/>
+ <glue w="18000" y="0" z="0"/>
+ <penalty w="0" p="0"/>
+ <box w="14400"/>
+ <box w="14400"/>
+ <skip>3</skip>
+ </element-list>
+
+ <eval expected="18000" xpath="//flow/block[1]/@space-before"/>
+ <eval expected="324000" xpath="//flow/block[1]/@ipd"/>
+ <eval expected="18000" xpath="//flow/block[1]/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block[1]/@end-indent"/>
+ <eval expected="18000" xpath="//flow/block[1]/@space-start"/>
+ <eval expected="18000" xpath="//flow/block[1]/@space-end"/>
+
+ <true xpath="not(boolean(//flow/block[1]/block[1]/@space-before))"/> <!-- space collapsed under space resolution rules -->
+ <eval expected="291600" xpath="//flow/block[1]/block[1]/@ipd"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@start-indent"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@end-indent"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-start"/>
+ <eval expected="34200" xpath="//flow/block[1]/block[1]/@space-end"/>
+ <true xpath="not(boolean(//flow/block[1]/block[1]/@space-after))"/> <!-- space collapsed under space resolution rules -->
+ <true xpath="not(boolean(//flow/block[1]/block[2]))"/>
+
+ <eval expected="18000" xpath="//flow/block[1]/@space-after"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_margin_shorthands.xml b/test/layoutengine/standard-testcases/block_margin_shorthands.xml index 25ac7d553..c7c565f60 100644 --- a/test/layoutengine/standard-testcases/block_margin_shorthands.xml +++ b/test/layoutengine/standard-testcases/block_margin_shorthands.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_overconstrained_ipd.xml b/test/layoutengine/standard-testcases/block_overconstrained_ipd.xml index 5bf828175..bab4286ec 100644 --- a/test/layoutengine/standard-testcases/block_overconstrained_ipd.xml +++ b/test/layoutengine/standard-testcases/block_overconstrained_ipd.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_padding.xml b/test/layoutengine/standard-testcases/block_padding.xml index caac2429a..a7e8fdacb 100644 --- a/test/layoutengine/standard-testcases/block_padding.xml +++ b/test/layoutengine/standard-testcases/block_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_padding_2.xml b/test/layoutengine/standard-testcases/block_padding_2.xml index e3afae786..40e14dd80 100644 --- a/test/layoutengine/standard-testcases/block_padding_2.xml +++ b/test/layoutengine/standard-testcases/block_padding_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/block_padding_percentages.xml b/test/layoutengine/standard-testcases/block_padding_percentages.xml index 45856b7cf..326f2a744 100644 --- a/test/layoutengine/standard-testcases/block_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/block_padding_percentages.xml @@ -1,53 +1,54 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative padding on blocks. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="yellow" padding="5%"> - margin not specified padding="5%" - </fo:block> - <fo:block margin="0pt" background-color="yellow" padding="5%"> - margin="0pt" padding="5%" - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/> - <eval expected="-18000" xpath="//flow/block[1]/@space-start"/> - <eval expected="-18000" xpath="//flow/block[1]/@space-end"/> - <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/> - <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/> - <eval expected="18000" xpath="//flow/block[2]/@start-indent"/> - <eval expected="18000" xpath="//flow/block[2]/@end-indent"/> - <eval expected="color=#ffff00" xpath="//flow/block[2]/@background"/> - </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>
+ This test checks relative padding on blocks.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="yellow" padding="5%">
+ margin not specified padding="5%"
+ </fo:block>
+ <fo:block margin="0pt" background-color="yellow" padding="5%">
+ margin="0pt" padding="5%"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block[1]/@bap"/>
+ <eval expected="-18000" xpath="//flow/block[1]/@space-start"/>
+ <eval expected="-18000" xpath="//flow/block[1]/@space-end"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/@background"/>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block[2]/@bap"/>
+ <eval expected="18000" xpath="//flow/block[2]/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block[2]/@end-indent"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[2]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_padding_shorthands.xml b/test/layoutengine/standard-testcases/block_padding_shorthands.xml index 250b1938e..7d0557c6a 100644 --- a/test/layoutengine/standard-testcases/block_padding_shorthands.xml +++ b/test/layoutengine/standard-testcases/block_padding_shorthands.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_1.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_1.xml index 9c462b29c..9bec4f524 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_1.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_2.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_2.xml index 4b2d67212..dca3f3bc9 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_2.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml index 0c59ec68f..9c49df822 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_4.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_4.xml index d00e18cb4..c88faff9c 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_4.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_4.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_5.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_5.xml index 5a7beac8e..b569445b4 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_5.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_5.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_6.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_6.xml index b21963bed..45e705cb9 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_6.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_6.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_7.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_7.xml index 4387626f2..79a2e827c 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_7.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_7.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_8.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_8.xml index 6a960077f..f5f298df0 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_8.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_8.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_9.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_9.xml index 4df459117..f136c1a94 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_9.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_9.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml index 07f378368..bfcc6b35e 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_9a.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml b/test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml index b028c79e5..25cd6fb26 100644 --- a/test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml +++ b/test/layoutengine/standard-testcases/block_space-before_space-after_bug38102.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_start-indent_end-indent.xml b/test/layoutengine/standard-testcases/block_start-indent_end-indent.xml index db0e9fc11..9564b62a0 100644 --- a/test/layoutengine/standard-testcases/block_start-indent_end-indent.xml +++ b/test/layoutengine/standard-testcases/block_start-indent_end-indent.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_text-align_1.xml b/test/layoutengine/standard-testcases/block_text-align_1.xml index 563c83711..e91c997f1 100644 --- a/test/layoutengine/standard-testcases/block_text-align_1.xml +++ b/test/layoutengine/standard-testcases/block_text-align_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/block_text-align_2.xml b/test/layoutengine/standard-testcases/block_text-align_2.xml index e6fdd55cd..691f1ee87 100644 --- a/test/layoutengine/standard-testcases/block_text-align_2.xml +++ b/test/layoutengine/standard-testcases/block_text-align_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/block_text-align_3.xml b/test/layoutengine/standard-testcases/block_text-align_3.xml index e79e1218b..432e15072 100755 --- a/test/layoutengine/standard-testcases/block_text-align_3.xml +++ b/test/layoutengine/standard-testcases/block_text-align_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_text-indent.xml b/test/layoutengine/standard-testcases/block_text-indent.xml index 334606f18..12c25c9a6 100644 --- a/test/layoutengine/standard-testcases/block_text-indent.xml +++ b/test/layoutengine/standard-testcases/block_text-indent.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml b/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml index b12666096..600958f2f 100644 --- a/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml +++ b/test/layoutengine/standard-testcases/block_white-space-collapse_1.xml @@ -1,151 +1,152 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks basic white space handling for white-space-collapse="true". - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - spaces - before - and - after - each - word <fo:character character="
" /> -<fo:character character=" " /><fo:character character=" " /> and - linefeeds<fo:character character=" " /><fo:character character=" " /> - everywhere <fo:character character=" " /> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:block background-color="orange"> - nested block level - </fo:block> - <fo:block background-color="red"> - nested block level - </fo:block> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline background-color="orange"> - inline level - </fo:inline> - <fo:inline background-color="red"> - inline level - </fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - block level - <fo:inline background-color="orange"> - inline level - </fo:inline> - block - <fo:inline background-color="red"> - inline level - </fo:inline> - block level - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline background-color="orange"> - inline level - <fo:inline background-color="red"> - nested inline level - </fo:inline> - </fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline background-color="orange"> - <fo:inline background-color="red"> - nested inline level - </fo:inline> - inline level - </fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - block level - <fo:inline background-color="orange"> - <fo:inline background-color="red"> - nested inline level - </fo:inline> - inline level - </fo:inline> - block level - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/> - <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/> - <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/> - - <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/> - <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/> - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/> - <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/> - - <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/> - <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/> - <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/> - - <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/> - <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/> - <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/> - <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/> - <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/> - <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/> - <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/> - <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/> - <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/> - <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/> - <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/> - </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>
+ This test checks basic white space handling for white-space-collapse="true".
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ spaces
+ before
+ and
+ after
+ each
+ word <fo:character character="
" />
+<fo:character character=" " /><fo:character character=" " /> and
+ linefeeds<fo:character character=" " /><fo:character character=" " />
+ everywhere <fo:character character=" " />
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:block background-color="orange">
+ nested block level
+ </fo:block>
+ <fo:block background-color="red">
+ nested block level
+ </fo:block>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ inline level
+ </fo:inline>
+ <fo:inline background-color="red">
+ inline level
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ block level
+ <fo:inline background-color="orange">
+ inline level
+ </fo:inline>
+ block
+ <fo:inline background-color="red">
+ inline level
+ </fo:inline>
+ block level
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ inline level
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ inline level
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ block level
+ <fo:inline background-color="orange">
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ inline level
+ </fo:inline>
+ block level
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+ <eval expected="6" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text[2]/word)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[2]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[3]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[1]/text[4]/word)"/>
+
+ <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>
+ <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[2]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[3]/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>
+ <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="4" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/word)"/>
+ <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[2]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[2]/space)"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml b/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml index cf1bb7ac2..792e858ea 100644 --- a/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml +++ b/test/layoutengine/standard-testcases/block_white-space-collapse_2.xml @@ -1,141 +1,142 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks basic white space handling for white-space-collapse="false". - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="false"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - spaces - before - and - after - each - word <fo:character character="
" /> -<fo:character character=" " /><fo:character character=" " /> and - linefeeds<fo:character character=" " /><fo:character character=" " /> - everywhere<fo:character character=" " /> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:block background-color="orange"> - nested block level - </fo:block> - <fo:block background-color="red"> - nested block level - </fo:block> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline background-color="orange"> - inline level - </fo:inline> - <fo:inline background-color="red"> - inline level - </fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - block level - <fo:inline background-color="orange"> - inline level - </fo:inline> - block - <fo:inline background-color="red"> - inline level - </fo:inline> - block level - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline background-color="orange"> - inline level - <fo:inline background-color="red"> - nested inline level - </fo:inline> - </fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline background-color="orange"> - <fo:inline background-color="red"> - nested inline level - </fo:inline> - inline level - </fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - block level - <fo:inline background-color="orange"> - <fo:inline background-color="red"> - nested inline level - </fo:inline> - inline level - </fo:inline> - block level - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="5" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/> - <eval expected="60" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text[1]/word)"/> - <eval expected="2" xpath="count(//flow/block[1]/lineArea[2]/text[1]/space)"/> - - <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/> - <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/> - <eval expected="13" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/> - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/> - <eval expected="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/> - <eval expected="16" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="31" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/> - <eval expected="13" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/> - - <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="18" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/> - <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/> - <eval expected="17" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/> - - <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/> - <eval expected="19" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/> - <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/> - <eval expected="16" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/> - <eval expected="14" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/> - <eval expected="15" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/> - <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/> - <eval expected="36" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/> - </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>
+ This test checks basic white space handling for white-space-collapse="false".
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="false">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ spaces
+ before
+ and
+ after
+ each
+ word <fo:character character="
" />
+<fo:character character=" " /><fo:character character=" " /> and
+ linefeeds<fo:character character=" " /><fo:character character=" " />
+ everywhere<fo:character character=" " />
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:block background-color="orange">
+ nested block level
+ </fo:block>
+ <fo:block background-color="red">
+ nested block level
+ </fo:block>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ inline level
+ </fo:inline>
+ <fo:inline background-color="red">
+ inline level
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ block level
+ <fo:inline background-color="orange">
+ inline level
+ </fo:inline>
+ block
+ <fo:inline background-color="red">
+ inline level
+ </fo:inline>
+ block level
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ inline level
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline background-color="orange">
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ inline level
+ </fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ block level
+ <fo:inline background-color="orange">
+ <fo:inline background-color="red">
+ nested inline level
+ </fo:inline>
+ inline level
+ </fo:inline>
+ block level
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="5" xpath="count(//flow/block[1]/lineArea[1]/text[1]/word)"/>
+ <eval expected="60" xpath="count(//flow/block[1]/lineArea[1]/text[1]/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text[1]/word)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[2]/text[1]/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[2]/block[1]/lineArea[1]/text/space)"/>
+ <eval expected="3" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[2]/block[2]/lineArea[1]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="13" xpath="count(//flow/block[3]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/word)"/>
+ <eval expected="16" xpath="count(//flow/block[3]/lineArea[1]/inlineparent[2]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text[1]/word)"/>
+ <eval expected="16" xpath="count(//flow/block[4]/lineArea[1]/text[1]/space)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="31" xpath="count(//flow/block[4]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[1]/text[2]/word)"/>
+ <eval expected="13" xpath="count(//flow/block[4]/lineArea[1]/text[2]/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="18" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/text/space)"/>
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="17" xpath="count(//flow/block[5]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="19" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+ <eval expected="2" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/word)"/>
+ <eval expected="16" xpath="count(//flow/block[6]/lineArea[1]/inlineparent[1]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[7]/lineArea[1]/text[1]/word)"/>
+ <eval expected="14" xpath="count(//flow/block[7]/lineArea[1]/text[1]/space)"/>
+ <eval expected="15" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/text[1]/space)"/>
+ <eval expected="3" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/word)"/>
+ <eval expected="36" xpath="count(//flow/block[7]/lineArea[1]/inlineparent[1]/inlineparent[1]/text/space)"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml b/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml index ddc2bcadd..d81c61ddb 100644 --- a/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml +++ b/test/layoutengine/standard-testcases/block_white-space-treatment_1.xml @@ -1,80 +1,81 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks white space handling for white-space-treatment - with white-space-collapse="true". - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore-if-surrounding-linefeed - all - spaces -</fo:block> - <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore - all - spaces -</fo:block> - <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt"> - preserve - all - spaces -</fo:block> - <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore-if-before-linefeed - all - spaces -</fo:block> - <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore-if-after-linefeed - all - spaces -</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="3" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/> - <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/> - - <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/> - - <eval expected="3" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/> - <eval expected="4" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/> - - <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/> - <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/> - - <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/> - <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/> - - </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>
+ This test checks white space handling for white-space-treatment
+ with white-space-collapse="true".
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore-if-surrounding-linefeed
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ preserve
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore-if-before-linefeed
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore-if-after-linefeed
+ all
+ spaces
+</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="3" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
+ <eval expected="4" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
+ <eval expected="3" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
+
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml b/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml index 4efd89209..1fd3b409a 100644 --- a/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml +++ b/test/layoutengine/standard-testcases/block_white-space-treatment_2.xml @@ -1,95 +1,96 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks white space handling for white-space-treatment - with white-space-collapse="false". - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="false"> - <fo:flow flow-name="xsl-region-body"> - <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore-if-surrounding-linefeed - all - spaces -</fo:block> - <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore - all - spaces -</fo:block> - <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt"> - preserve - all - spaces -</fo:block> - <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore-if-before-linefeed - all - spaces -</fo:block> - <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt"> - ignore-if-after-linefeed - all - spaces -</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/> - <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/> - <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/> - - <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/> - <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/> - <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/> - - <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/> - <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/> - <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/> - <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/> - <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/> - <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/> - <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/> - <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/> - <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/> - - <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/> - <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/> - <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/> - <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/> - <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/space)"/> - - </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>
+ This test checks white space handling for white-space-treatment
+ with white-space-collapse="false".
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="false">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block white-space-treatment="ignore-if-surrounding-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore-if-surrounding-linefeed
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="ignore" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="preserve" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ preserve
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="ignore-if-before-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore-if-before-linefeed
+ all
+ spaces
+</fo:block>
+ <fo:block white-space-treatment="ignore-if-after-linefeed" background-color="silver" margin="1pt 0pt 1pt 0pt">
+ ignore-if-after-linefeed
+ all
+ spaces
+</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[1]/lineArea[1]/text/word)"/>
+ <eval expected="50" xpath="count(//flow/block[1]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[1]/lineArea[2]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[1]/lineArea[2]/text/space)"/>
+
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea)"/>
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea[1]/text/word)"/>
+ <eval expected="0" xpath="count(//flow/block[2]/lineArea[1]/text/space)"/>
+
+ <eval expected="3" xpath="count(//flow/block[3]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[3]/lineArea[1]/text/word)"/>
+ <eval expected="90" xpath="count(//flow/block[3]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[3]/lineArea[2]/text/word)"/>
+ <eval expected="96" xpath="count(//flow/block[3]/lineArea[2]/text/space)"/>
+ <eval expected="0" xpath="count(//flow/block[3]/lineArea[3]/text/word)"/>
+ <eval expected="38" xpath="count(//flow/block[3]/lineArea[3]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[4]/lineArea[1]/text/word)"/>
+ <eval expected="58" xpath="count(//flow/block[4]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[4]/lineArea[2]/text/word)"/>
+ <eval expected="77" xpath="count(//flow/block[4]/lineArea[2]/text/space)"/>
+
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea)"/>
+ <eval expected="2" xpath="count(//flow/block[5]/lineArea[1]/text/word)"/>
+ <eval expected="56" xpath="count(//flow/block[5]/lineArea[1]/text/space)"/>
+ <eval expected="1" xpath="count(//flow/block[5]/lineArea[2]/text/word)"/>
+ <eval expected="72" xpath="count(//flow/block[5]/lineArea[2]/text/space)"/>
+
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml b/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml index c45876bd8..35e875190 100755 --- a/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml +++ b/test/layoutengine/standard-testcases/block_white-space-treatment_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space.xml b/test/layoutengine/standard-testcases/block_white-space.xml index 1bb435109..f46f36d8a 100755 --- a/test/layoutengine/standard-testcases/block_white-space.xml +++ b/test/layoutengine/standard-testcases/block_white-space.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space_1.xml b/test/layoutengine/standard-testcases/block_white-space_1.xml index c249bcea3..3b800714c 100644 --- a/test/layoutengine/standard-testcases/block_white-space_1.xml +++ b/test/layoutengine/standard-testcases/block_white-space_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space_3.xml b/test/layoutengine/standard-testcases/block_white-space_3.xml index 112d6bed6..c8cdb5e47 100644 --- a/test/layoutengine/standard-testcases/block_white-space_3.xml +++ b/test/layoutengine/standard-testcases/block_white-space_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space_4.xml b/test/layoutengine/standard-testcases/block_white-space_4.xml index c19c6f529..67285e8fd 100644 --- a/test/layoutengine/standard-testcases/block_white-space_4.xml +++ b/test/layoutengine/standard-testcases/block_white-space_4.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space_5.xml b/test/layoutengine/standard-testcases/block_white-space_5.xml index 2e40314fc..9fa2cd2af 100644 --- a/test/layoutengine/standard-testcases/block_white-space_5.xml +++ b/test/layoutengine/standard-testcases/block_white-space_5.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml b/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml index 9ef8ba78e..b7e490b47 100644 --- a/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml +++ b/test/layoutengine/standard-testcases/block_white-space_nbsp_1.xml @@ -1,105 +1,106 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks non breaking white space (nbsp). - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" id="single"> single nbsp around </fo:block> - <fo:block background-color="red" id="only"> </fo:block> - <fo:block background-color="silver" id="double">  after  empty  line  </fo:block> - <fo:block background-color="silver" id="single-justify" text-align="justify" text-align-last="justify" space-before="5pt"> single nbsp around </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="4" xpath="count(//flow/block[1]/lineArea/text/space)"/> - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="1" xpath="count(//flow/block[2]/lineArea/text/space)"/> - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="8" xpath="count(//flow/block[3]/lineArea/text/space)"/> - <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/> - <eval expected="3" xpath="count(//flow/block[4]/lineArea/text/space)"/> <!-- trailing nbsp is removed by LineLM --> - - <!-- nbsp must be adjustable --> - <true xpath="not(//flow/block[4]/lineArea/text/space[1]/@adj = 'false')"/> - - <element-list category="line" id="single"> - <box w="3336"/> - <box/> - <box w="3336"/> - <box/> - <box w="3336"/> - <box/> - <box w="3336"/> - <skip>3</skip> - </element-list> - - <element-list category="line" id="only"> - <box w="3336"/> - <skip>3</skip> - </element-list> - - <element-list category="line" id="double"> - <box w="3336"/> - <box w="3336"/> - <box/> - <box w="3336"/> - <box w="3336"/> - <box/> - <box w="3336"/> - <box w="3336"/> - <box/> - <box w="3336"/> - <box w="3336"/> - <skip>3</skip> - </element-list> - - <element-list category="line" id="single-justify"> - <box w="0"/> - <penalty p="INF"/> - <glue w="3336" y="1668" z="1112"/> - <box/> - <box w="0"/> - <penalty p="INF"/> - <glue w="3336" y="1668" z="1112"/> - <box/> - <box w="0"/> - <penalty p="INF"/> - <glue w="3336" y="1668" z="1112"/> - <box/> - <box w="0"/> - <penalty p="INF"/> - <glue w="3336" y="1668" z="1112"/> - <skip>3</skip> - </element-list> - - </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>
+ This test checks non breaking white space (nbsp).
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" id="single"> single nbsp around </fo:block>
+ <fo:block background-color="red" id="only"> </fo:block>
+ <fo:block background-color="silver" id="double">  after  empty  line  </fo:block>
+ <fo:block background-color="silver" id="single-justify" text-align="justify" text-align-last="justify" space-before="5pt"> single nbsp around </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="4" xpath="count(//flow/block[1]/lineArea/text/space)"/>
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="1" xpath="count(//flow/block[2]/lineArea/text/space)"/>
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="8" xpath="count(//flow/block[3]/lineArea/text/space)"/>
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="3" xpath="count(//flow/block[4]/lineArea/text/space)"/> <!-- trailing nbsp is removed by LineLM -->
+
+ <!-- nbsp must be adjustable -->
+ <true xpath="not(//flow/block[4]/lineArea/text/space[1]/@adj = 'false')"/>
+
+ <element-list category="line" id="single">
+ <box w="3336"/>
+ <box/>
+ <box w="3336"/>
+ <box/>
+ <box w="3336"/>
+ <box/>
+ <box w="3336"/>
+ <skip>3</skip>
+ </element-list>
+
+ <element-list category="line" id="only">
+ <box w="3336"/>
+ <skip>3</skip>
+ </element-list>
+
+ <element-list category="line" id="double">
+ <box w="3336"/>
+ <box w="3336"/>
+ <box/>
+ <box w="3336"/>
+ <box w="3336"/>
+ <box/>
+ <box w="3336"/>
+ <box w="3336"/>
+ <box/>
+ <box w="3336"/>
+ <box w="3336"/>
+ <skip>3</skip>
+ </element-list>
+
+ <element-list category="line" id="single-justify">
+ <box w="0"/>
+ <penalty p="INF"/>
+ <glue w="3336" y="1668" z="1112"/>
+ <box/>
+ <box w="0"/>
+ <penalty p="INF"/>
+ <glue w="3336" y="1668" z="1112"/>
+ <box/>
+ <box w="0"/>
+ <penalty p="INF"/>
+ <glue w="3336" y="1668" z="1112"/>
+ <box/>
+ <box w="0"/>
+ <penalty p="INF"/>
+ <glue w="3336" y="1668" z="1112"/>
+ <skip>3</skip>
+ </element-list>
+
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml b/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml index ac8d1d76c..9ec6a6ca8 100644 --- a/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml +++ b/test/layoutengine/standard-testcases/block_white-space_nbsp_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_word-spacing.xml b/test/layoutengine/standard-testcases/block_word-spacing.xml index d8dda0cb7..7081329a7 100644 --- a/test/layoutengine/standard-testcases/block_word-spacing.xml +++ b/test/layoutengine/standard-testcases/block_word-spacing.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml b/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml index 739d927a6..8bf4ed6f9 100644 --- a/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml +++ b/test/layoutengine/standard-testcases/block_word-spacing_text-align_justify.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/block_wrap-option.xml b/test/layoutengine/standard-testcases/block_wrap-option.xml index 40e64372f..bb2e75130 100644 --- a/test/layoutengine/standard-testcases/block_wrap-option.xml +++ b/test/layoutengine/standard-testcases/block_wrap-option.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/character_background-color.xml b/test/layoutengine/standard-testcases/character_background-color.xml index 7a2dfd29c..241d73f1f 100644 --- a/test/layoutengine/standard-testcases/character_background-color.xml +++ b/test/layoutengine/standard-testcases/character_background-color.xml @@ -1,43 +1,44 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks fo:character with background-color property. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver"> - To <fo:character background-color="yellow" character="e" />mphasize a character highlight it. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - </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>
+ This test checks fo:character with background-color property.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver">
+ To <fo:character background-color="yellow" character="e" />mphasize a character highlight it.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_background-image.xml b/test/layoutengine/standard-testcases/character_background-image.xml index 3a7e2400e..67e9e8162 100644 --- a/test/layoutengine/standard-testcases/character_background-image.xml +++ b/test/layoutengine/standard-testcases/character_background-image.xml @@ -1,48 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks fo:character with background-image property. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block font-size="24pt"> - <fo:character font-size="96pt" character="A" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" /> - <fo:character font-size="48pt" character="g" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" /> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/> - </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>
+ This test checks fo:character with background-image property.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-size="24pt">
+ <fo:character font-size="96pt" character="A" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+ <fo:character font-size="48pt" character="g" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=8976,vertical=21360" xpath="//flow/block[1]/lineArea/text[1]/@background"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[3]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_border_padding.xml b/test/layoutengine/standard-testcases/character_border_padding.xml index d083d7cec..465a4f1a7 100644 --- a/test/layoutengine/standard-testcases/character_border_padding.xml +++ b/test/layoutengine/standard-testcases/character_border_padding.xml @@ -1,98 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks fo:character with border and padding properties. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt"> - To <fo:character border="solid 1pt red" background-color="yellow" character="e"/>mphasize a letter we give it a 1pt border. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt"> - To really <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" character="e"/>mphasize a letter we give it a 5pt border and padding. - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt"> - To <fo:character border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/>onfuse give it unsymmetric borders and padding. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt"> - Big <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/>order but a smaller font. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/> - <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/> - - <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/> - <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/> - - <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/> - <eval expected="17000" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/> - <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/> - - <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/> - <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/> - <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/> - <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/> - </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>
+ This test checks fo:character with border and padding properties.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+ To <fo:character border="solid 1pt red" background-color="yellow" character="e"/>mphasize a letter we give it a 1pt border.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+ To really <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" character="e"/>mphasize a letter we give it a 5pt border and padding.
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+ To <fo:character border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/>onfuse give it unsymmetric borders and padding.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+ Big <fo:character border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/>order but a smaller font.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>
+ <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>
+
+ <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>
+ <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>
+
+ <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
+ <eval expected="17000" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>
+
+ <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>
+ <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+ <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>
+ <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/character_vertical-align.xml b/test/layoutengine/standard-testcases/character_vertical-align.xml index 36f83c01d..e01d4c0a3 100644 --- a/test/layoutengine/standard-testcases/character_vertical-align.xml +++ b/test/layoutengine/standard-testcases/character_vertical-align.xml @@ -1,59 +1,60 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks fo:character with vertical-align property. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - vertical-align<fo:character font-size="10pt" background-color="yellow" character="=" />not specified - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - vertical-align<fo:character font-size="10pt" vertical-align="baseline" background-color="yellow" character="=" />baseline - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - vertical-align<fo:character font-size="10pt" vertical-align="top" background-color="yellow" character="=" />top - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - vertical-align<fo:character font-size="10pt" vertical-align="middle" background-color="yellow" character="=" />middle - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - vertical-align<fo:character font-size="10pt" vertical-align="bottom" background-color="yellow" character="=" />bottom - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/> - <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/> - <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/> - <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/> - </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>
+ This test checks fo:character with vertical-align property.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ vertical-align<fo:character font-size="10pt" background-color="yellow" character="=" />not specified
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ vertical-align<fo:character font-size="10pt" vertical-align="baseline" background-color="yellow" character="=" />baseline
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ vertical-align<fo:character font-size="10pt" vertical-align="top" background-color="yellow" character="=" />top
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ vertical-align<fo:character font-size="10pt" vertical-align="middle" background-color="yellow" character="=" />middle
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ vertical-align<fo:character font-size="10pt" vertical-align="bottom" background-color="yellow" character="=" />bottom
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+ <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+ <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+ <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_basic.xml b/test/layoutengine/standard-testcases/external-graphic_basic.xml index a4ea4a45a..b28f52456 100644 --- a/test/layoutengine/standard-testcases/external-graphic_basic.xml +++ b/test/layoutengine/standard-testcases/external-graphic_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_bmp.xml b/test/layoutengine/standard-testcases/external-graphic_bmp.xml index 56c3ae62b..34e76dbd3 100644 --- a/test/layoutengine/standard-testcases/external-graphic_bmp.xml +++ b/test/layoutengine/standard-testcases/external-graphic_bmp.xml @@ -1,56 +1,57 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>BMP external-graphic 300dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG - </fo:block> - <fo:block>BMP external-graphic 72dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipd"/> - <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipda"/> - <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpd"/> - <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>BMP external-graphic 300dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.bmp"/>EOG
+ </fo:block>
+ <fo:block>BMP external-graphic 72dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg72dpi.bmp"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46091" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="192043" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_border_padding.xml b/test/layoutengine/standard-testcases/external-graphic_border_padding.xml index a91722b74..d0df5c605 100644 --- a/test/layoutengine/standard-testcases/external-graphic_border_padding.xml +++ b/test/layoutengine/standard-testcases/external-graphic_border_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_breaking.xml b/test/layoutengine/standard-testcases/external-graphic_breaking.xml index 714d0b9f9..18d58173e 100755 --- a/test/layoutengine/standard-testcases/external-graphic_breaking.xml +++ b/test/layoutengine/standard-testcases/external-graphic_breaking.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_bug37815.xml b/test/layoutengine/standard-testcases/external-graphic_bug37815.xml index 23e368eda..0c78d36da 100644 --- a/test/layoutengine/standard-testcases/external-graphic_bug37815.xml +++ b/test/layoutengine/standard-testcases/external-graphic_bug37815.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml index eec2e7b70..e32e4d080 100644 --- a/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml +++ b/test/layoutengine/standard-testcases/external-graphic_content-height_content-width.xml @@ -1,49 +1,50 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics with relative content-height - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>plain external-graphic</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="360000" xpath="//flow/block[2]/@ipd"/> - <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics with relative content-height
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>plain external-graphic</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg" content-height="200%" content-width="200%" />EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="360000" xpath="//flow/block[2]/@ipd"/>
+ <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="92160" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_display-align.xml b/test/layoutengine/standard-testcases/external-graphic_display-align.xml index 4a8d7eb9c..461b7e5e7 100644 --- a/test/layoutengine/standard-testcases/external-graphic_display-align.xml +++ b/test/layoutengine/standard-testcases/external-graphic_display-align.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_emf.xml b/test/layoutengine/standard-testcases/external-graphic_emf.xml index 6cf940530..4dc21d98c 100644 --- a/test/layoutengine/standard-testcases/external-graphic_emf.xml +++ b/test/layoutengine/standard-testcases/external-graphic_emf.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_eps.xml b/test/layoutengine/standard-testcases/external-graphic_eps.xml index 9fedae0bb..1171f9f56 100644 --- a/test/layoutengine/standard-testcases/external-graphic_eps.xml +++ b/test/layoutengine/standard-testcases/external-graphic_eps.xml @@ -1,48 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>EPS external-graphic</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>EPS external-graphic</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/barcode.eps"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="136000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="43000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_gif.xml b/test/layoutengine/standard-testcases/external-graphic_gif.xml index a7828aace..b500313a0 100644 --- a/test/layoutengine/standard-testcases/external-graphic_gif.xml +++ b/test/layoutengine/standard-testcases/external-graphic_gif.xml @@ -1,48 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>GIF external-graphic</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>GIF external-graphic</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg72dpi.gif"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="192000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_invalid.xml b/test/layoutengine/standard-testcases/external-graphic_invalid.xml index 1cd0e239e..f81aeb5e8 100644 --- a/test/layoutengine/standard-testcases/external-graphic_invalid.xml +++ b/test/layoutengine/standard-testcases/external-graphic_invalid.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_jpeg.xml b/test/layoutengine/standard-testcases/external-graphic_jpeg.xml index 1df417926..10f52f8fa 100644 --- a/test/layoutengine/standard-testcases/external-graphic_jpeg.xml +++ b/test/layoutengine/standard-testcases/external-graphic_jpeg.xml @@ -1,56 +1,57 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>JPEG external-graphic 300dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG - </fo:block> - <fo:block>JPEG external-graphic 72dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>JPEG external-graphic 300dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
+ </fo:block>
+ <fo:block>JPEG external-graphic 72dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg72dpi.jpg"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml b/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml index ae099e6d6..f119c6988 100644 --- a/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml +++ b/test/layoutengine/standard-testcases/external-graphic_overflow_hidden.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_oversized.xml b/test/layoutengine/standard-testcases/external-graphic_oversized.xml index 3b091a8c0..e423acd17 100644 --- a/test/layoutengine/standard-testcases/external-graphic_oversized.xml +++ b/test/layoutengine/standard-testcases/external-graphic_oversized.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/external-graphic_png.xml b/test/layoutengine/standard-testcases/external-graphic_png.xml index 2479c533d..0e00d4b1a 100644 --- a/test/layoutengine/standard-testcases/external-graphic_png.xml +++ b/test/layoutengine/standard-testcases/external-graphic_png.xml @@ -1,57 +1,58 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>PNG external-graphic 300dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG - </fo:block> - <fo:block>PNG external-graphic 72dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - <!-- Due to unit computations there is a little difference to the expected 192000 --> - <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipd"/> - <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipda"/> - <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpd"/> - <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>PNG external-graphic 300dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.png"/>EOG
+ </fo:block>
+ <fo:block>PNG external-graphic 72dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg72dpi.png"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <!-- Due to unit computations there is a little difference to the expected 192000 -->
+ <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="191975" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml b/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml index 7466a6e35..8508cad8b 100644 --- a/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml +++ b/test/layoutengine/standard-testcases/external-graphic_rfc2397.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/external-graphic_src_uri.xml b/test/layoutengine/standard-testcases/external-graphic_src_uri.xml index d299517df..cd1dc91fe 100644 --- a/test/layoutengine/standard-testcases/external-graphic_src_uri.xml +++ b/test/layoutengine/standard-testcases/external-graphic_src_uri.xml @@ -1,82 +1,83 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks URI references to external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>plain external-graphic (relative URI)</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG - </fo:block> - <fo:block>plain external-graphic (relative URI with scheme)</fo:block> - <fo:block> - <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG - </fo:block> - <!-- Commented out until portable solution found - <fo:block>plain external-graphic (absolute URI)</fo:block> - <fo:block> - <fo:external-graphic src="/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG - </fo:block> - <fo:block>plain external-graphic (absolute URI with scheme)</fo:block> - <fo:block> - <fo:external-graphic src="file:/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG - </fo:block> - --> - <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block> - <fo:block> - <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG - </fo:block> - <fo:block>plain external-graphic (absolute HTTP URI)</fo:block> - <fo:block> - <fo:external-graphic src="http://xml.apache.org/fop/images/logo.jpg"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/> - <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/> - <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpd"/> - <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpda"/> - <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/> - <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/> - <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpd"/> - <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpda"/> - <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/> - <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/> - <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/> - <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/> - </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>
+ This test checks URI references to external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="210mm" page-height="297mm">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>plain external-graphic (relative URI)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.jpg"/>EOG
+ </fo:block>
+ <fo:block>plain external-graphic (relative URI with scheme)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="file:../../resources/images/bgimg300dpi.jpg"/>EOG
+ </fo:block>
+ <!-- Commented out until portable solution found
+ <fo:block>plain external-graphic (absolute URI)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
+ </fo:block>
+ <fo:block>plain external-graphic (absolute URI with scheme)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="file:/home/mm/fop-trunk/test/resources/images/bgimg300dpi.jpg"/>EOG
+ </fo:block>
+ -->
+ <fo:block>plain external-graphic (relative URI using url(...) function)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="url(../../resources/images/bgimg300dpi.jpg)"/>EOG
+ </fo:block>
+ <fo:block>plain external-graphic (absolute HTTP URI)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="http://xml.apache.org/fop/images/logo.jpg"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+ <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+ <eval expected="120000" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+ <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+ <eval expected="65000" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/external-graphic_svg.xml b/test/layoutengine/standard-testcases/external-graphic_svg.xml index 6c60296b1..a9d6a048a 100644 --- a/test/layoutengine/standard-testcases/external-graphic_svg.xml +++ b/test/layoutengine/standard-testcases/external-graphic_svg.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/external-graphic_tiff.xml b/test/layoutengine/standard-testcases/external-graphic_tiff.xml index d8db5af8e..ae6f1a2a8 100644 --- a/test/layoutengine/standard-testcases/external-graphic_tiff.xml +++ b/test/layoutengine/standard-testcases/external-graphic_tiff.xml @@ -1,72 +1,73 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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> - This test checks external-graphics. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="8in" page-height="8in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block>TIFF external-graphic 300dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG - </fo:block> - <fo:block>TIFF external-graphic 72dpi</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG - </fo:block> - <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG - </fo:block> - <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block> - <fo:block> - <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG - </fo:block> - <fo:block>EOF</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/> - <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/> - <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipd"/> - <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipda"/> - <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpd"/> - <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpda"/> - <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipd"/> - <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipda"/> - <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpd"/> - <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpda"/> - </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>
+ This test checks external-graphics.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="8in" page-height="8in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>TIFF external-graphic 300dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg300dpi.tif"/>EOG
+ </fo:block>
+ <fo:block>TIFF external-graphic 72dpi</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/bgimg72dpi.tif"/>EOG
+ </fo:block>
+ <fo:block>TIFF external-graphic (CCITT group 4 encoding)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/tiff_group4.tif"/>EOG
+ </fo:block>
+ <fo:block>TIFF external-graphic (CCITT group 4 encoding, multiple strips)</fo:block>
+ <fo:block>
+ <fo:external-graphic src="../../resources/images/tiff_group4-multi-strip.tif"/>EOG
+ </fo:block>
+ <fo:block>EOF</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@ipda"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="46080" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipd"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@ipda"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpd"/>
+ <eval expected="192000" xpath="//flow/block[4]/lineArea/viewport/@bpda"/>
+ <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipd"/>
+ <eval expected="550588" xpath="//flow/block[6]/lineArea/viewport/@ipda"/>
+ <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpd"/>
+ <eval expected="66705" xpath="//flow/block[6]/lineArea/viewport/@bpda"/>
+ <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipd"/>
+ <eval expected="550588" xpath="//flow/block[8]/lineArea/viewport/@ipda"/>
+ <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpd"/>
+ <eval expected="66705" xpath="//flow/block[8]/lineArea/viewport/@bpda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/footnote_basic.xml b/test/layoutengine/standard-testcases/footnote_basic.xml index 888c0b1c6..29678fab9 100644 --- a/test/layoutengine/standard-testcases/footnote_basic.xml +++ b/test/layoutengine/standard-testcases/footnote_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_bug37880.xml b/test/layoutengine/standard-testcases/footnote_bug37880.xml index d293973a7..2395ad8d2 100644 --- a/test/layoutengine/standard-testcases/footnote_bug37880.xml +++ b/test/layoutengine/standard-testcases/footnote_bug37880.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_footnote-separator.xml b/test/layoutengine/standard-testcases/footnote_footnote-separator.xml index 4bfdb64e1..414b39686 100644 --- a/test/layoutengine/standard-testcases/footnote_footnote-separator.xml +++ b/test/layoutengine/standard-testcases/footnote_footnote-separator.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_in_list.xml b/test/layoutengine/standard-testcases/footnote_in_list.xml index 0d25bdf22..13bfa2ba4 100644 --- a/test/layoutengine/standard-testcases/footnote_in_list.xml +++ b/test/layoutengine/standard-testcases/footnote_in_list.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_in_table.xml b/test/layoutengine/standard-testcases/footnote_in_table.xml index c9cf840de..5011b48c6 100644 --- a/test/layoutengine/standard-testcases/footnote_in_table.xml +++ b/test/layoutengine/standard-testcases/footnote_in_table.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_large.xml b/test/layoutengine/standard-testcases/footnote_large.xml index 5870b3d14..b3e2bd7ce 100644 --- a/test/layoutengine/standard-testcases/footnote_large.xml +++ b/test/layoutengine/standard-testcases/footnote_large.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml b/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml index ddeea2392..8220e60b6 100644 --- a/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml +++ b/test/layoutengine/standard-testcases/footnote_overflow-to-empty-page.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml b/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml index abd631e22..25f2c8a14 100644 --- a/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml +++ b/test/layoutengine/standard-testcases/footnote_overflow-to-multiple-pages.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_positioning_1.xml b/test/layoutengine/standard-testcases/footnote_positioning_1.xml index 854b3ed6e..300327f58 100644 --- a/test/layoutengine/standard-testcases/footnote_positioning_1.xml +++ b/test/layoutengine/standard-testcases/footnote_positioning_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_positioning_2.xml b/test/layoutengine/standard-testcases/footnote_positioning_2.xml index 0fb323d5e..43938d051 100644 --- a/test/layoutengine/standard-testcases/footnote_positioning_2.xml +++ b/test/layoutengine/standard-testcases/footnote_positioning_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_positioning_3.xml b/test/layoutengine/standard-testcases/footnote_positioning_3.xml index e2dee78ed..46af4985d 100644 --- a/test/layoutengine/standard-testcases/footnote_positioning_3.xml +++ b/test/layoutengine/standard-testcases/footnote_positioning_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_positioning_4.xml b/test/layoutengine/standard-testcases/footnote_positioning_4.xml index e8be4b0cf..58698e3f5 100644 --- a/test/layoutengine/standard-testcases/footnote_positioning_4.xml +++ b/test/layoutengine/standard-testcases/footnote_positioning_4.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_positioning_5.xml b/test/layoutengine/standard-testcases/footnote_positioning_5.xml index 3b3cea007..b9ba05898 100644 --- a/test/layoutengine/standard-testcases/footnote_positioning_5.xml +++ b/test/layoutengine/standard-testcases/footnote_positioning_5.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/footnote_space-resolution.xml b/test/layoutengine/standard-testcases/footnote_space-resolution.xml index 151e276b9..2110b7323 100644 --- a/test/layoutengine/standard-testcases/footnote_space-resolution.xml +++ b/test/layoutengine/standard-testcases/footnote_space-resolution.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/foreign-attributes.xml b/test/layoutengine/standard-testcases/foreign-attributes.xml index 4d848fc1e..092860765 100644 --- a/test/layoutengine/standard-testcases/foreign-attributes.xml +++ b/test/layoutengine/standard-testcases/foreign-attributes.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline-container_block_nested.xml b/test/layoutengine/standard-testcases/inline-container_block_nested.xml index 3acf170d3..cf4ebf486 100644 --- a/test/layoutengine/standard-testcases/inline-container_block_nested.xml +++ b/test/layoutengine/standard-testcases/inline-container_block_nested.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline-container_border_padding.xml b/test/layoutengine/standard-testcases/inline-container_border_padding.xml index 10ab7b646..a667b86f1 100644 --- a/test/layoutengine/standard-testcases/inline-container_border_padding.xml +++ b/test/layoutengine/standard-testcases/inline-container_border_padding.xml @@ -1,85 +1,86 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks the borders and the like for instream-foreign-object. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="orange"> - Before <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white"> - <fo:block>inside the container</fo:block> - </fo:inline-container> after - </fo:block> - <fo:block background-color="yellow" font-size="100pt"> - BC <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white"> - <fo:block font-size="12pt">inside the container</fo:block> - </fo:inline-container> AC - </fo:block> - <fo:block font-size="9pt"> - In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the i-f-o. - In the first block the i-f-o determines the height of the line in the 2nd block the font is bigger than the i-f-o. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- first e-g --> - <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/> - <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/> - <eval expected="70000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/> - <eval expected="1650" xpath="//flow/block[1]/lineArea/viewport/@offset"/> - <eval expected="20000 30000 20000 30000" xpath="//flow/block[1]/lineArea/viewport/@bap"/> - <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/> - <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/> - <eval expected="(solid,#000000,20000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/> - <eval expected="(solid,#000000,15000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/> - <eval expected="(solid,#000000,10000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/> - <eval expected="15000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/> - <eval expected="10000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/> - <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/> - <eval expected="20000 20000 20000 20000" xpath="//flow/block[1]/lineArea/viewport/foreignObject/@pos"/> - <!-- second e-g --> - <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/> - <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/> - <eval expected="70000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/> - <eval expected="15550" xpath="//flow/block[2]/lineArea/viewport/@offset"/> - <eval expected="20000 30000 20000 30000" xpath="//flow/block[2]/lineArea/viewport/@bap"/> - <eval expected="color=#ffffff" xpath="//flow/block[2]/lineArea/viewport/@background"/> - <eval expected="(solid,#000000,5000)" xpath="//flow/block[2]/lineArea/viewport/@border-before"/> - <eval expected="(solid,#000000,20000)" xpath="//flow/block[2]/lineArea/viewport/@border-after"/> - <eval expected="(solid,#000000,15000)" xpath="//flow/block[2]/lineArea/viewport/@border-start"/> - <eval expected="(solid,#000000,10000)" xpath="//flow/block[2]/lineArea/viewport/@border-end"/> - <eval expected="15000" xpath="//flow/block[2]/lineArea/viewport/@padding-before"/> - <eval expected="10000" xpath="//flow/block[2]/lineArea/viewport/@padding-after"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/viewport/@padding-start"/> - <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@padding-end"/> - <eval expected="20000 20000 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/> - </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>
+ This test checks the borders and the like for instream-foreign-object.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="orange">
+ Before <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
+ <fo:block>inside the container</fo:block>
+ </fo:inline-container> after
+ </fo:block>
+ <fo:block background-color="yellow" font-size="100pt">
+ BC <fo:inline-container border-style="solid" border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" background-color="white">
+ <fo:block font-size="12pt">inside the container</fo:block>
+ </fo:inline-container> AC
+ </fo:block>
+ <fo:block font-size="9pt">
+ In both blocks we have a setting of border-width="5pt 10pt 20pt 15pt" padding="15pt 20pt 10pt 5pt" on the i-f-o.
+ In the first block the i-f-o determines the height of the line in the 2nd block the font is bigger than the i-f-o.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- first e-g -->
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@bpd"/>
+ <eval expected="70000" xpath="//flow/block[1]/lineArea/viewport/@bpda"/>
+ <eval expected="1650" xpath="//flow/block[1]/lineArea/viewport/@offset"/>
+ <eval expected="20000 30000 20000 30000" xpath="//flow/block[1]/lineArea/viewport/@bap"/>
+ <eval expected="color=#ffffff" xpath="//flow/block[1]/lineArea/viewport/@background"/>
+ <eval expected="(solid,#000000,5000)" xpath="//flow/block[1]/lineArea/viewport/@border-before"/>
+ <eval expected="(solid,#000000,20000)" xpath="//flow/block[1]/lineArea/viewport/@border-after"/>
+ <eval expected="(solid,#000000,15000)" xpath="//flow/block[1]/lineArea/viewport/@border-start"/>
+ <eval expected="(solid,#000000,10000)" xpath="//flow/block[1]/lineArea/viewport/@border-end"/>
+ <eval expected="15000" xpath="//flow/block[1]/lineArea/viewport/@padding-before"/>
+ <eval expected="10000" xpath="//flow/block[1]/lineArea/viewport/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea/viewport/@padding-start"/>
+ <eval expected="20000" xpath="//flow/block[1]/lineArea/viewport/@padding-end"/>
+ <eval expected="20000 20000 20000 20000" xpath="//flow/block[1]/lineArea/viewport/foreignObject/@pos"/>
+ <!-- second e-g -->
+ <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@ipd"/>
+ <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@bpd"/>
+ <eval expected="70000" xpath="//flow/block[2]/lineArea/viewport/@bpda"/>
+ <eval expected="15550" xpath="//flow/block[2]/lineArea/viewport/@offset"/>
+ <eval expected="20000 30000 20000 30000" xpath="//flow/block[2]/lineArea/viewport/@bap"/>
+ <eval expected="color=#ffffff" xpath="//flow/block[2]/lineArea/viewport/@background"/>
+ <eval expected="(solid,#000000,5000)" xpath="//flow/block[2]/lineArea/viewport/@border-before"/>
+ <eval expected="(solid,#000000,20000)" xpath="//flow/block[2]/lineArea/viewport/@border-after"/>
+ <eval expected="(solid,#000000,15000)" xpath="//flow/block[2]/lineArea/viewport/@border-start"/>
+ <eval expected="(solid,#000000,10000)" xpath="//flow/block[2]/lineArea/viewport/@border-end"/>
+ <eval expected="15000" xpath="//flow/block[2]/lineArea/viewport/@padding-before"/>
+ <eval expected="10000" xpath="//flow/block[2]/lineArea/viewport/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/viewport/@padding-start"/>
+ <eval expected="20000" xpath="//flow/block[2]/lineArea/viewport/@padding-end"/>
+ <eval expected="20000 20000 20000 20000" xpath="//flow/block[2]/lineArea/viewport/foreignObject/@pos"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline-level_id.xml b/test/layoutengine/standard-testcases/inline-level_id.xml index 31096cc31..d3e94daf9 100644 --- a/test/layoutengine/standard-testcases/inline-level_id.xml +++ b/test/layoutengine/standard-testcases/inline-level_id.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml b/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml index ca2cfde50..bf8b5ab39 100644 --- a/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml +++ b/test/layoutengine/standard-testcases/inline_alignment-adjust_1.xml @@ -1,91 +1,92 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level alignment-adjust. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" background-color="yellow">alignment-adjust not specified</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="auto" background-color="yellow">alignment-adjust="auto"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="baseline" background-color="yellow">alignment-adjust="baseline"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="before-edge" background-color="yellow">alignment-adjust="before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="text-before-edge" background-color="yellow">alignment-adjust="text-before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="central" background-color="yellow">alignment-adjust="central"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="middle" background-color="yellow">alignment-adjust="middle"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="after-edge" background-color="yellow">alignment-adjust="after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="text-after-edge" background-color="yellow">alignment-adjust="text-after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="ideographic" background-color="yellow">alignment-adjust="ideographic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="alphabetic" background-color="yellow">alignment-adjust="alphabetic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="hanging" background-color="yellow">alignment-adjust="hanging"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="10052" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="10052" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="5427" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="5487" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="802" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="802" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="802" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/> - <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/> - <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/> - </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>
+ This test checks inline level alignment-adjust.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" background-color="yellow">alignment-adjust not specified</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="auto" background-color="yellow">alignment-adjust="auto"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="baseline" background-color="yellow">alignment-adjust="baseline"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="before-edge" background-color="yellow">alignment-adjust="before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="text-before-edge" background-color="yellow">alignment-adjust="text-before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="central" background-color="yellow">alignment-adjust="central"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="middle" background-color="yellow">alignment-adjust="middle"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="after-edge" background-color="yellow">alignment-adjust="after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="text-after-edge" background-color="yellow">alignment-adjust="text-after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="ideographic" background-color="yellow">alignment-adjust="ideographic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="alphabetic" background-color="yellow">alignment-adjust="alphabetic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="hanging" background-color="yellow">alignment-adjust="hanging"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="mathematical" background-color="yellow">alignment-adjust="mathematical"</fo:inline> After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="10052" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="10052" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="5427" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="5487" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="802" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="802" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="802" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="8616" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="6462" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml b/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml index d8d766e50..501e76bd8 100644 --- a/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml +++ b/test/layoutengine/standard-testcases/inline_alignment-adjust_2.xml @@ -1,98 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level alignment-adjust. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="0pt" background-color="yellow">alignment-adjust="0pt"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="0%" background-color="yellow">alignment-adjust="0%"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="3pt" background-color="yellow">alignment-adjust="3pt"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="-3pt" background-color="yellow">alignment-adjust="-3pt"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="30%" background-color="yellow">alignment-adjust="30%"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-adjust="-30%" background-color="yellow">alignment-adjust="-30%"</fo:inline> After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="13078" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/> - <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="15122" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="5872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="13678" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/> - <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="15722" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="6472" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level alignment-adjust.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="0pt" background-color="yellow">alignment-adjust="0pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="0%" background-color="yellow">alignment-adjust="0%"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="3pt" background-color="yellow">alignment-adjust="3pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="-3pt" background-color="yellow">alignment-adjust="-3pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="30%" background-color="yellow">alignment-adjust="30%"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-adjust="-30%" background-color="yellow">alignment-adjust="-30%"</fo:inline> After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="13078" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+ <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="128" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="15122" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="13678" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+ <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="728" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="15722" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="6472" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml index 0e1ae430d..03f9da676 100644 --- a/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml +++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_1.xml @@ -1,91 +1,92 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level alignment-baseline. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/> - <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/> - <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/> - </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>
+ This test checks inline level alignment-baseline.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="574" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml index 2fc852a76..d1274be73 100644 --- a/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml +++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_2.xml @@ -1,116 +1,117 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level alignment-baseline. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" background-color="yellow">alignment-baseline not specified</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - - <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/> - <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/> - - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/> - - <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/> - <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/> - - <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/> - <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/> - - <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/> - - <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/> - <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/> - - <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/> - <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level alignment-baseline.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ Before <fo:inline font-size="14pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1850" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1826" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="574" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1436" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml index 3359f862d..10948938b 100644 --- a/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml +++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_3.xml @@ -1,91 +1,92 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level alignment-baseline. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="1436" xpath="//flow/block[5]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="2361" xpath="//flow/block[6]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="2349" xpath="//flow/block[7]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="3286" xpath="//flow/block[9]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="3286" xpath="//flow/block[10]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="1723" xpath="//flow/block[12]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="2154" xpath="//flow/block[13]/lineArea[1]/inlineparent[2]/@offset"/> - </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>
+ This test checks inline level alignment-baseline.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" background-color="yellow">alignment-baseline not specified</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="auto" background-color="yellow">alignment-baseline="auto"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="baseline" background-color="yellow">alignment-baseline="baseline"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="before-edge" background-color="yellow">alignment-baseline="before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-before-edge" background-color="yellow">alignment-baseline="text-before-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="central" background-color="yellow">alignment-baseline="central"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="middle" background-color="yellow">alignment-baseline="middle"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="after-edge" background-color="yellow">alignment-baseline="after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="text-after-edge" background-color="yellow">alignment-baseline="text-after-edge"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="ideographic" background-color="yellow">alignment-baseline="ideographic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="alphabetic" background-color="yellow">alignment-baseline="alphabetic"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="hanging" background-color="yellow">alignment-baseline="hanging"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ <fo:inline font-size="14pt">B</fo:inline>efore <fo:inline font-size="10pt" alignment-baseline="mathematical" background-color="yellow">alignment-baseline="mathematical"</fo:inline> After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[3]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="1436" xpath="//flow/block[5]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="2361" xpath="//flow/block[6]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="2349" xpath="//flow/block[7]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[8]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="3286" xpath="//flow/block[9]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="3286" xpath="//flow/block[10]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[11]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="1723" xpath="//flow/block[12]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="2154" xpath="//flow/block[13]/lineArea[1]/inlineparent[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml b/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml index 4268c1239..6400c4da5 100644 --- a/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml +++ b/test/layoutengine/standard-testcases/inline_alignment-baseline_4.xml @@ -1,231 +1,232 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level alignment-baseline for nested inlines. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" font-family="sans-serif"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - background-color="yellow">alphabetic - <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - dominant-baseline="reset-size" - background-color="yellow">alphabetic - <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - alignment-baseline="hanging" - background-color="yellow">hanging - <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - dominant-baseline="reset-size" - alignment-baseline="hanging" - background-color="yellow">hanging - <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - alignment-baseline="text-before-edge" - background-color="yellow">text-before-edge - <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - dominant-baseline="reset-size" - alignment-baseline="text-before-edge" - background-color="yellow">text-before-edge - <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="25%" - alignment-baseline="central" - background-color="yellow">central - <fo:inline font-size="150%" - alignment-baseline="text-before-edge" - background-color="red">text-before-edge - <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline> - </fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="25%" - dominant-baseline="reset-size" - alignment-baseline="central" - background-color="yellow">central - <fo:inline font-size="150%" - alignment-baseline="text-before-edge" - background-color="red">text-before-edge - <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline> - </fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="25%" - dominant-baseline="reset-size" - alignment-baseline="central" - background-color="yellow">central - <fo:inline font-size="150%" - dominant-baseline="reset-size" - alignment-baseline="text-before-edge" - background-color="red">text-before-edge - <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline> - </fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">Baseline table changed twice</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big - <fo:inline font-size="50%" - dominant-baseline="reset-size" - alignment-baseline="before-edge" - background-color="yellow">before-edge - <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline> - </fo:inline> - Big <fo:inline font-size="8pt">This is over constraint</fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="22200" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="8616" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22200" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="8616" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22200" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="1723" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="6494" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22200" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="1723" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="2739" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22200" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="5550" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="27750" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22200" xpath="//flow/block[7]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/> - <eval expected="8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="4308" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22491" xpath="//flow/block[8]/lineArea[1]/@bpd"/> - <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/> - <eval expected="8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="-8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/> - <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22200" xpath="//flow/block[9]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/> - <eval expected="8325" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="-6462" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/> - - <eval expected="27750" xpath="//flow/block[10]/lineArea[1]/@bpd"/> - <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-5550" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level alignment-baseline for nested inlines.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" font-family="sans-serif">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ background-color="yellow">alphabetic
+ <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ dominant-baseline="reset-size"
+ background-color="yellow">alphabetic
+ <fo:inline font-size="150%" background-color="red">alphabetic</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ alignment-baseline="hanging"
+ background-color="yellow">hanging
+ <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ dominant-baseline="reset-size"
+ alignment-baseline="hanging"
+ background-color="yellow">hanging
+ <fo:inline font-size="50%" background-color="red" alignment-baseline="middle">middle</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ alignment-baseline="text-before-edge"
+ background-color="yellow">text-before-edge
+ <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ dominant-baseline="reset-size"
+ alignment-baseline="text-before-edge"
+ background-color="yellow">text-before-edge
+ <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="25%"
+ alignment-baseline="central"
+ background-color="yellow">central
+ <fo:inline font-size="150%"
+ alignment-baseline="text-before-edge"
+ background-color="red">text-before-edge
+ <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>
+ </fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="25%"
+ dominant-baseline="reset-size"
+ alignment-baseline="central"
+ background-color="yellow">central
+ <fo:inline font-size="150%"
+ alignment-baseline="text-before-edge"
+ background-color="red">text-before-edge
+ <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>
+ </fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="25%"
+ dominant-baseline="reset-size"
+ alignment-baseline="central"
+ background-color="yellow">central
+ <fo:inline font-size="150%"
+ dominant-baseline="reset-size"
+ alignment-baseline="text-before-edge"
+ background-color="red">text-before-edge
+ <fo:inline font-size="200%" background-color="green">alphabetic</fo:inline>
+ </fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">Baseline table changed twice</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="24pt">Big
+ <fo:inline font-size="50%"
+ dominant-baseline="reset-size"
+ alignment-baseline="before-edge"
+ background-color="yellow">before-edge
+ <fo:inline font-size="150%" background-color="red" alignment-baseline="after-edge">after-edge</fo:inline>
+ </fo:inline>
+ Big <fo:inline font-size="8pt">This is over constraint</fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="22200" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="8616" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-4308" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22200" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="8616" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-4308" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22200" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1723" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="6494" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22200" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1723" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="2739" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22200" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="5550" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="27750" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22200" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-8325" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="4308" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22491" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+ <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="-8616" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+ <eval expected="291" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22200" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="8325" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="-6462" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="27750" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+ <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-5550" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="5550" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_background-color.xml b/test/layoutengine/standard-testcases/inline_background-color.xml index ee56f58ed..f7eede3b0 100644 --- a/test/layoutengine/standard-testcases/inline_background-color.xml +++ b/test/layoutengine/standard-testcases/inline_background-color.xml @@ -1,132 +1,133 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:inline with background-color properties. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it. - </fo:block> - <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt"> - To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="end". - </fo:block> - <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt"> - To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="justify". - </fo:block> - <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt"> - To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="center". - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt"> - This demonstrates a long inline - <fo:inline background-color="yellow">which stretches over multiple lines to - show how the highlight extends from line to line while - correctly honouring the text-align (not specified) property</fo:inline> - back to normal - </fo:block> - <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt"> - This demonstrates a long inline - <fo:inline background-color="yellow">which stretches over multiple lines to - show how the highlight extends from line to line while - correctly honouring the text-align="end" property</fo:inline> - back to normal - </fo:block> - <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt"> - This demonstrates a long inline - <fo:inline background-color="yellow">which stretches over multiple lines to - show how the highlight extends from line to line while - correctly honouring the text-align="justify" property</fo:inline> - back to normal - </fo:block> - <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt"> - This demonstrates a long inline - <fo:inline background-color="yellow">which stretches over multiple lines to - show how the highlight extends from line to line while - correctly honouring the text-align="center" property</fo:inline> - back to normal - </fo:block> - <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt"> - Nested inline highlights - <fo:inline background-color="yellow" font-size="10pt">this is 10pt text - <fo:inline font-size="14pt">nested within is 14pt text</fo:inline> - followed by 10pt text</fo:inline> - back to normal - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="90040" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/> - - <eval expected="90040" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/inlineparent/@background"/> - - <eval expected="90040" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/inlineparent/@background"/> - - <eval expected="90040" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/inlineparent/@background"/> - - <eval expected="188950" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[1]/inlineparent/@background"/> - <eval expected="313470" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[2]/inlineparent/@background"/> - <eval expected="145610" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[3]/inlineparent/@background"/> - - <eval expected="188950" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[1]/inlineparent/@background"/> - <eval expected="313470" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[2]/inlineparent/@background"/> - <eval expected="109650" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[3]/inlineparent/@background"/> - - <eval expected="199793" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[1]/inlineparent/@background"/> - <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[2]/inlineparent/@background"/> - <eval expected="118530" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[3]/inlineparent/@background"/> - - <eval expected="128370" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[1]/inlineparent/@background"/> - <eval expected="269560" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[2]/inlineparent/@background"/> - <eval expected="225250" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[3]/inlineparent/@background"/> - - <eval expected="151184" xpath="//flow/block[9]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[1]/inlineparent/@background"/> - <eval expected="81704" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@ipd"/> - <eval expected="161644" xpath="//flow/block[9]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[2]/inlineparent/@background"/> - <eval expected="67704" xpath="//flow/block[9]/lineArea[2]/inlineparent/inlineparent/@ipd"/> - </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>
+ This test checks fo:inline with background-color properties.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it.
+ </fo:block>
+ <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt">
+ To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="end".
+ </fo:block>
+ <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt">
+ To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="justify".
+ </fo:block>
+ <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">
+ To <fo:inline background-color="yellow">emphasize a phrase</fo:inline> highlight it with text-align="center".
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt">
+ This demonstrates a long inline
+ <fo:inline background-color="yellow">which stretches over multiple lines to
+ show how the highlight extends from line to line while
+ correctly honouring the text-align (not specified) property</fo:inline>
+ back to normal
+ </fo:block>
+ <fo:block background-color="silver" text-align="end" margin="1pt 0pt 1pt 0pt">
+ This demonstrates a long inline
+ <fo:inline background-color="yellow">which stretches over multiple lines to
+ show how the highlight extends from line to line while
+ correctly honouring the text-align="end" property</fo:inline>
+ back to normal
+ </fo:block>
+ <fo:block background-color="silver" text-align="justify" margin="1pt 0pt 1pt 0pt">
+ This demonstrates a long inline
+ <fo:inline background-color="yellow">which stretches over multiple lines to
+ show how the highlight extends from line to line while
+ correctly honouring the text-align="justify" property</fo:inline>
+ back to normal
+ </fo:block>
+ <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">
+ This demonstrates a long inline
+ <fo:inline background-color="yellow">which stretches over multiple lines to
+ show how the highlight extends from line to line while
+ correctly honouring the text-align="center" property</fo:inline>
+ back to normal
+ </fo:block>
+ <fo:block background-color="silver" text-align="center" margin="1pt 0pt 1pt 0pt">
+ Nested inline highlights
+ <fo:inline background-color="yellow" font-size="10pt">this is 10pt text
+ <fo:inline font-size="14pt">nested within is 14pt text</fo:inline>
+ followed by 10pt text</fo:inline>
+ back to normal
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="90040" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/>
+
+ <eval expected="90040" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/inlineparent/@background"/>
+
+ <eval expected="90040" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/inlineparent/@background"/>
+
+ <eval expected="90040" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/inlineparent/@background"/>
+
+ <eval expected="188950" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[1]/inlineparent/@background"/>
+ <eval expected="313470" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[2]/inlineparent/@background"/>
+ <eval expected="145610" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[5]/lineArea[3]/inlineparent/@background"/>
+
+ <eval expected="188950" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[1]/inlineparent/@background"/>
+ <eval expected="313470" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[2]/inlineparent/@background"/>
+ <eval expected="109650" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[6]/lineArea[3]/inlineparent/@background"/>
+
+ <eval expected="199793" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[1]/inlineparent/@background"/>
+ <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[2]/inlineparent/@background"/>
+ <eval expected="118530" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[7]/lineArea[3]/inlineparent/@background"/>
+
+ <eval expected="128370" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[1]/inlineparent/@background"/>
+ <eval expected="269560" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[2]/inlineparent/@background"/>
+ <eval expected="225250" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[8]/lineArea[3]/inlineparent/@background"/>
+
+ <eval expected="151184" xpath="//flow/block[9]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[1]/inlineparent/@background"/>
+ <eval expected="81704" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@ipd"/>
+ <eval expected="161644" xpath="//flow/block[9]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[9]/lineArea[2]/inlineparent/@background"/>
+ <eval expected="67704" xpath="//flow/block[9]/lineArea[2]/inlineparent/inlineparent/@ipd"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_background-image.xml b/test/layoutengine/standard-testcases/inline_background-image.xml index 570be1d8d..5e60e20cf 100644 --- a/test/layoutengine/standard-testcases/inline_background-image.xml +++ b/test/layoutengine/standard-testcases/inline_background-image.xml @@ -1,48 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on a fo:inline. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Why is <fo:inline font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:inline> so cool? - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/> - <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/> - </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>
+ This test checks background image on a fo:inline.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Why is <fo:inline font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">FOP</fo:inline> so cool?
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="197376" xpath="//flow/block/lineArea/inlineparent/@ipd"/>
+ <eval expected="88800" xpath="//flow/block/lineArea/inlineparent/@bpd"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=75648,vertical=21360" xpath="//flow/block/lineArea/inlineparent/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml index 591e33756..66b4b7bdf 100644 --- a/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml +++ b/test/layoutengine/standard-testcases/inline_baseline-shift_1.xml @@ -1,164 +1,165 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level baseline-shift. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="baseline" - background-color="yellow">baseline-shift="baseline"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="sub" - background-color="yellow">baseline-shift="sub"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="super" - background-color="yellow">baseline-shift="super"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="0pt" - background-color="yellow">baseline-shift="0pt"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="0%" - background-color="yellow">baseline-shift="0%"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="3pt" - background-color="yellow">baseline-shift="3pt"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="-3pt" - background-color="yellow">baseline-shift="-3pt"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="30%" - background-color="yellow">baseline-shift="30%"</fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="-30%" - background-color="yellow">baseline-shift="-30%"</fo:inline> - After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="17400" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/> - <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="13078" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/> - <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - - <eval expected="15122" xpath="//flow/block[7]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/> - <eval expected="5872" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/> - - <eval expected="15118" xpath="//flow/block[8]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/> - <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/> - - <eval expected="17162" xpath="//flow/block[9]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/> - <eval expected="7912" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level baseline-shift.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="baseline"
+ background-color="yellow">baseline-shift="baseline"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="sub"
+ background-color="yellow">baseline-shift="sub"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="super"
+ background-color="yellow">baseline-shift="super"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="0pt"
+ background-color="yellow">baseline-shift="0pt"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="0%"
+ background-color="yellow">baseline-shift="0%"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="3pt"
+ background-color="yellow">baseline-shift="3pt"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="-3pt"
+ background-color="yellow">baseline-shift="-3pt"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="30%"
+ background-color="yellow">baseline-shift="30%"</fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="-30%"
+ background-color="yellow">baseline-shift="-30%"</fo:inline>
+ After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="17400" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+ <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="4450" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="13078" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+ <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="128" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="15122" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5872" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="15118" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+ <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2168" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="17162" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="7912" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml index 5e7b276b7..0af4f3683 100644 --- a/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml +++ b/test/layoutengine/standard-testcases/inline_baseline-shift_2.xml @@ -1,172 +1,173 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level baseline-shift. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="sub" - background-color="yellow">sub - <fo:inline font-size="8pt" - baseline-shift="sub" - background-color="red">sub - </fo:inline>sub - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="sub" - background-color="yellow">sub - <fo:inline font-size="8pt" - baseline-shift="super" - background-color="red">super - </fo:inline>sub - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="8pt" - baseline-shift="super" - background-color="red">super - </fo:inline>super - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="8pt" - baseline-shift="sub" - background-color="red">sub - </fo:inline>super - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - baseline-shift="30%" - background-color="yellow">30% - <fo:inline font-size="8pt" - baseline-shift="-50%" - background-color="red">-50% - </fo:inline>30% - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="18pt" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="24pt" - baseline-shift="sub" - background-color="red">sub - <fo:inline font-size="30pt" - baseline-shift="super" - background-color="green">super - </fo:inline>sub - </fo:inline>super - </fo:inline> - After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="16415" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="5487" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="3528" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-3794" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="21194" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="17400" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="3528" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="15118" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="7436" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="39060" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="14892" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="-16860" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level baseline-shift.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="8pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ </fo:inline>sub
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="8pt"
+ baseline-shift="super"
+ background-color="red">super
+ </fo:inline>sub
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="8pt"
+ baseline-shift="super"
+ background-color="red">super
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="8pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ baseline-shift="30%"
+ background-color="yellow">30%
+ <fo:inline font-size="8pt"
+ baseline-shift="-50%"
+ background-color="red">-50%
+ </fo:inline>30%
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="18pt"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="24pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ <fo:inline font-size="30pt"
+ baseline-shift="super"
+ background-color="green">super
+ </fo:inline>sub
+ </fo:inline>super
+ </fo:inline>
+ After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="16415" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5487" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="3528" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="14737" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5487" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3794" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="21194" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3794" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="8244" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="17400" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="3528" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="4450" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="15118" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="7436" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="2168" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="39060" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="14892" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="-16860" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="25086" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
+
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml index 10f745a18..46649aac8 100644 --- a/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml +++ b/test/layoutengine/standard-testcases/inline_baseline-shift_3.xml @@ -1,210 +1,211 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level baseline-shift. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="middle" - dominant-baseline="middle" - background-color="yellow">middle - <fo:inline font-size="8pt" - baseline-shift="sub" - background-color="red">sub - </fo:inline>middle - </fo:inline> - After <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="middle" - dominant-baseline="middle" - background-color="yellow">middle - <fo:inline font-size="8pt" - baseline-shift="super" - background-color="red">super - </fo:inline>middle - </fo:inline> - After <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="text-after-edge" - dominant-baseline="text-after-edge" - background-color="yellow">text-after-edge - <fo:inline font-size="8pt" - baseline-shift="30%" - background-color="red">30% - </fo:inline>text-after-edge - </fo:inline> - After <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="text-before-edge" - dominant-baseline="text-before-edge" - background-color="yellow">text-before-edge - <fo:inline font-size="8pt" - baseline-shift="-50%" - background-color="red">-50% - </fo:inline>text-before-edge - </fo:inline> - After <fo:inline font-size="8pt">Baseline table changed</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="middle" - background-color="yellow">middle - <fo:inline font-size="8pt" - baseline-shift="sub" - background-color="red">sub - </fo:inline>middle - </fo:inline> - After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="middle" - background-color="yellow">middle - <fo:inline font-size="8pt" - baseline-shift="super" - background-color="red">super - </fo:inline>middle - </fo:inline> - After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="text-after-edge" - background-color="yellow">text-after-edge - <fo:inline font-size="8pt" - baseline-shift="30%" - background-color="red">30% - </fo:inline>text-after-edge - </fo:inline> - After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - Before - <fo:inline font-size="10pt" - alignment-baseline="text-before-edge" - background-color="yellow">text-before-edge - <fo:inline font-size="8pt" - baseline-shift="-50%" - background-color="red">-50% - </fo:inline>text-before-edge - </fo:inline> - After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="14846" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="1826" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="5620" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="1826" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-1702" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-1750" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="13400" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="6000" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="1826" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="3528" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="14918" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - - <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/> - <eval expected="3700" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-2992" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/> - - <eval expected="17708" xpath="//flow/block[8]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="10308" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level baseline-shift.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="middle"
+ dominant-baseline="middle"
+ background-color="yellow">middle
+ <fo:inline font-size="8pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ </fo:inline>middle
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="middle"
+ dominant-baseline="middle"
+ background-color="yellow">middle
+ <fo:inline font-size="8pt"
+ baseline-shift="super"
+ background-color="red">super
+ </fo:inline>middle
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="text-after-edge"
+ dominant-baseline="text-after-edge"
+ background-color="yellow">text-after-edge
+ <fo:inline font-size="8pt"
+ baseline-shift="30%"
+ background-color="red">30%
+ </fo:inline>text-after-edge
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="text-before-edge"
+ dominant-baseline="text-before-edge"
+ background-color="yellow">text-before-edge
+ <fo:inline font-size="8pt"
+ baseline-shift="-50%"
+ background-color="red">-50%
+ </fo:inline>text-before-edge
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table changed</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="middle"
+ background-color="yellow">middle
+ <fo:inline font-size="8pt"
+ baseline-shift="sub"
+ background-color="red">sub
+ </fo:inline>middle
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="middle"
+ background-color="yellow">middle
+ <fo:inline font-size="8pt"
+ baseline-shift="super"
+ background-color="red">super
+ </fo:inline>middle
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="text-after-edge"
+ background-color="yellow">text-after-edge
+ <fo:inline font-size="8pt"
+ baseline-shift="30%"
+ background-color="red">30%
+ </fo:inline>text-after-edge
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ Before
+ <fo:inline font-size="10pt"
+ alignment-baseline="text-before-edge"
+ background-color="yellow">text-before-edge
+ <fo:inline font-size="8pt"
+ baseline-shift="-50%"
+ background-color="red">-50%
+ </fo:inline>text-before-edge
+ </fo:inline>
+ After <fo:inline font-size="8pt">Baseline table unchanged</fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="14846" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1826" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="5620" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1826" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-1702" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-1750" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="13400" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1826" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="3528" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="14918" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3794" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="1968" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-2992" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="17708" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="10308" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml b/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml index c0ade7fbe..81566bac0 100644 --- a/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml +++ b/test/layoutengine/standard-testcases/inline_baseline-shift_4.xml @@ -1,184 +1,185 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level baseline-shift. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - alignment-baseline="central" - baseline-shift="6pt" - background-color="yellow">6pt central - </fo:inline> - <fo:inline font-size="50%" - alignment-baseline="central" - background-color="orange">central - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - alignment-baseline="central" - baseline-shift="-6pt" - background-color="yellow">-6pt central - </fo:inline> - <fo:inline font-size="50%" - alignment-baseline="central" - background-color="orange">central - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - alignment-baseline="central" - baseline-shift="sub" - background-color="yellow">sub - <fo:inline font-size="150%" - alignment-baseline="text-before-edge" - background-color="red">text-before-edge - <fo:inline font-size="6pt" - background-color="green">Baseline unchanged</fo:inline> - </fo:inline>central - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - alignment-baseline="central" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="150%" - alignment-baseline="text-after-edge" - background-color="red">text-after-edge - <fo:inline font-size="6pt" - background-color="green">Baseline unchanged</fo:inline> - </fo:inline>central - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - alignment-baseline="central" - baseline-shift="sub" - background-color="yellow">sub - <fo:inline font-size="150%" - dominant-baseline="text-before-edge" - background-color="red">text-before-edge - <fo:inline font-size="6pt" - background-color="green">Baseline changed</fo:inline> - </fo:inline>central - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - alignment-baseline="central" - baseline-shift="super" - background-color="yellow">super - <fo:inline font-size="150%" - dominant-baseline="text-after-edge" - background-color="red">text-after-edge - <fo:inline font-size="6pt" - background-color="green">Baseline changed</fo:inline> - </fo:inline>central - </fo:inline> - After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="17100" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/text[1]/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/text[1]/@offset"/> - <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="17100" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="9700" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/text[1]/@offset"/> - <eval expected="3700" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="16892" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="5792" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="1436" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="23168" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="5136" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="14800" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="5792" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22340" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/> - <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/> - <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level baseline-shift.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ baseline-shift="6pt"
+ background-color="yellow">6pt central
+ </fo:inline>
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ background-color="orange">central
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ baseline-shift="-6pt"
+ background-color="yellow">-6pt central
+ </fo:inline>
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ background-color="orange">central
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="150%"
+ alignment-baseline="text-before-edge"
+ background-color="red">text-before-edge
+ <fo:inline font-size="6pt"
+ background-color="green">Baseline unchanged</fo:inline>
+ </fo:inline>central
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="150%"
+ alignment-baseline="text-after-edge"
+ background-color="red">text-after-edge
+ <fo:inline font-size="6pt"
+ background-color="green">Baseline unchanged</fo:inline>
+ </fo:inline>central
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ baseline-shift="sub"
+ background-color="yellow">sub
+ <fo:inline font-size="150%"
+ dominant-baseline="text-before-edge"
+ background-color="red">text-before-edge
+ <fo:inline font-size="6pt"
+ background-color="green">Baseline changed</fo:inline>
+ </fo:inline>central
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ alignment-baseline="central"
+ baseline-shift="super"
+ background-color="yellow">super
+ <fo:inline font-size="150%"
+ dominant-baseline="text-after-edge"
+ background-color="red">text-after-edge
+ <fo:inline font-size="6pt"
+ background-color="green">Baseline changed</fo:inline>
+ </fo:inline>central
+ </fo:inline>
+ After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="17100" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[1]/text[1]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent[2]/text[1]/@offset"/>
+ <eval expected="2300" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="17100" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="9700" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[1]/text[1]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent[2]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="16892" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5792" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="1436" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="23168" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3700" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="5136" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="8368" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="14800" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5792" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-2872" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22340" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-2872" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="5550" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/inlineparent/text/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/text[2]/@offset"/>
+ <eval expected="7540" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_block_nested_1.xml b/test/layoutengine/standard-testcases/inline_block_nested_1.xml index f64ebe37e..570e1bf5e 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_1.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_block_nested_2.xml b/test/layoutengine/standard-testcases/inline_block_nested_2.xml index e0f77824b..5b10e4c76 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_2.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_block_nested_3.xml b/test/layoutengine/standard-testcases/inline_block_nested_3.xml index 60bdea9f1..20115c17e 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_3.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_block_nested_4.xml b/test/layoutengine/standard-testcases/inline_block_nested_4.xml index 8def85e10..1ab882452 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_4.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_4.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_block_nested_5.xml b/test/layoutengine/standard-testcases/inline_block_nested_5.xml index f1ef1d336..0a2a6cee5 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_5.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_5.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_block_nested_6.xml b/test/layoutengine/standard-testcases/inline_block_nested_6.xml index eeb0bdd40..9dc588074 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_6.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_6.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml b/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml index d25247a0b..d9e19b0c8 100644 --- a/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml +++ b/test/layoutengine/standard-testcases/inline_block_nested_bug36248.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/inline_border_bug37743.xml b/test/layoutengine/standard-testcases/inline_border_bug37743.xml index 446bcce89..9dc9f02fa 100644 --- a/test/layoutengine/standard-testcases/inline_border_bug37743.xml +++ b/test/layoutengine/standard-testcases/inline_border_bug37743.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_border_padding.xml b/test/layoutengine/standard-testcases/inline_border_padding.xml index 5797da93a..a0197c319 100644 --- a/test/layoutengine/standard-testcases/inline_border_padding.xml +++ b/test/layoutengine/standard-testcases/inline_border_padding.xml @@ -1,140 +1,141 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inlines with border and padding properties. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt"> - To <fo:inline border="solid 1pt red" background-color="yellow">emphasize</fo:inline> a word we give it a 1pt border and a background. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt"> - Demonstrates a big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow">inline with border="solid 5pt red" padding="5pt"</fo:inline> extending over the small allocation rectangle to the top and bottom. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt"> - Demonstrates <fo:inline border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow">unsymmetric borders and padding</fo:inline> but the baselines should align. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt"> - Big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt">with a smaller font</fo:inline> but the baselines should align. - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - This demonstrates correct line breaking of a fo:inline because it does fit nicely.. - This demonstrates correct line breaking of a fo:inline because it does fit <fo:inline border="solid 1pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">nicely.. - Not really as we started a fo:inline with border/padding just before the word "nicely" which forces it to the next line.</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Demonstrates nested - <fo:inline border="solid 2pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">inlines - <fo:inline border="solid 1pt green" padding-start="2pt" padding-end="2pt" background-color="orange">finishing together - </fo:inline> - </fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="48350" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="50350" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/> - - <eval expected="208190" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/> - <eval expected="228190" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-start"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-after"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-start"/> - - <eval expected="151170" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/> - <eval expected="163170" xpath="//flow/block[3]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-start"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-end"/> - <eval expected="4000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-start"/> - - <eval expected="64464" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/> - <eval expected="84464" xpath="//flow/block[4]/lineArea/inlineparent/@ipda"/> - <eval expected="8616" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-start"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-after"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-start"/> - - <eval expected="340710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="343710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="2000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/> - <eval expected="193840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipd"/> - <eval expected="196840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[4]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-end"/> - <eval expected="2000" xpath="//flow/block[5]/lineArea[4]/inlineparent/@padding-end"/> - - <eval expected="113270" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/> - <eval expected="121270" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/> - <eval expected="76150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipd"/> - <eval expected="82150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@offset"/> - <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-after"/> - <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-before"/> - <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-end"/> - <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-start"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-end"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-start"/> - </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>
+ This test checks inlines with border and padding properties.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+ To <fo:inline border="solid 1pt red" background-color="yellow">emphasize</fo:inline> a word we give it a 1pt border and a background.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+ Demonstrates a big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow">inline with border="solid 5pt red" padding="5pt"</fo:inline> extending over the small allocation rectangle to the top and bottom.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+ Demonstrates <fo:inline border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow">unsymmetric borders and padding</fo:inline> but the baselines should align.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+ Big border <fo:inline border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt">with a smaller font</fo:inline> but the baselines should align.
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ This demonstrates correct line breaking of a fo:inline because it does fit nicely..
+ This demonstrates correct line breaking of a fo:inline because it does fit <fo:inline border="solid 1pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">nicely..
+ Not really as we started a fo:inline with border/padding just before the word "nicely" which forces it to the next line.</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Demonstrates nested
+ <fo:inline border="solid 2pt red" padding-start="2pt" padding-end="2pt" background-color="yellow">inlines
+ <fo:inline border="solid 1pt green" padding-start="2pt" padding-end="2pt" background-color="orange">finishing together
+ </fo:inline>
+ </fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="48350" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="50350" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/>
+
+ <eval expected="208190" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+ <eval expected="228190" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/inlineparent/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/inlineparent/@padding-start"/>
+
+ <eval expected="151170" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+ <eval expected="163170" xpath="//flow/block[3]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/inlineparent/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[3]/lineArea/inlineparent/@padding-start"/>
+
+ <eval expected="64464" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+ <eval expected="84464" xpath="//flow/block[4]/lineArea/inlineparent/@ipda"/>
+ <eval expected="8616" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/inlineparent/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/inlineparent/@padding-start"/>
+
+ <eval expected="340710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="343710" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="2000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+ <eval expected="193840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipd"/>
+ <eval expected="196840" xpath="//flow/block[5]/lineArea[4]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[4]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[4]/inlineparent/@border-end"/>
+ <eval expected="2000" xpath="//flow/block[5]/lineArea[4]/inlineparent/@padding-end"/>
+
+ <eval expected="113270" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
+ <eval expected="121270" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/>
+ <eval expected="76150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipd"/>
+ <eval expected="82150" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@offset"/>
+ <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-after"/>
+ <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-before"/>
+ <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-end"/>
+ <eval expected="(solid,#008000,1000)" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@border-start"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-end"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml index 62054b520..95083a9e0 100644 --- a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml +++ b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_1.xml @@ -1,133 +1,134 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:inlines with border and padding properties and nested inner blocks. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Before inline - <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow"><fo:block>starting with a block</fo:block> - after block</fo:inline> - After inline - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Before inline - <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow">before block - <fo:block>having a block at the end of an inline</fo:block></fo:inline> - After inline - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Before inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="2pt" - padding-end.length="2pt" - background-color="yellow">before block - <fo:block>As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:block> - after block</fo:inline> - After inline - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="347000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipda"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-start"/> - <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-after"/> - <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-start"/> - <eval expected="46130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="49130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="54470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="57470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="347000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-end"/> - <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/> - <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-end"/> - - <eval expected="54470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="57470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@offset"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-before"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@offset"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-before"/> - <eval expected="46130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipd"/> - <eval expected="49130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-end"/> - - </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>
+ This test checks fo:inlines with border and padding properties and nested inner blocks.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Before inline
+ <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow"><fo:block>starting with a block</fo:block>
+ after block</fo:inline>
+ After inline
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Before inline
+ <fo:inline border="solid 1pt red" padding="2pt" background-color="yellow">before block
+ <fo:block>having a block at the end of an inline</fo:block></fo:inline>
+ After inline
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Before inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="2pt"
+ padding-end.length="2pt"
+ background-color="yellow">before block
+ <fo:block>As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:block>
+ after block</fo:inline>
+ After inline
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="347000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@ipda"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@border-start"/>
+ <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-after"/>
+ <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[1]/lineArea[2]/inlineblockparent/@padding-start"/>
+ <eval expected="46130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="49130" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="54470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="57470" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="347000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@border-end"/>
+ <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-after"/>
+ <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[2]/lineArea[2]/inlineblockparent/@padding-end"/>
+
+ <eval expected="54470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="57470" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@border-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@offset"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineblockparent/@padding-before"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@border-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@offset"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineblockparent/@padding-before"/>
+ <eval expected="46130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipd"/>
+ <eval expected="49130" xpath="//flow/block[3]/lineArea[4]/inlineparent/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[4]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea[4]/inlineparent/@padding-end"/>
+
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml index 4b1bf52d2..f606da4b4 100644 --- a/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml +++ b/test/layoutengine/standard-testcases/inline_border_padding_block_nested_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml index 86284f868..aa5e3d44b 100644 --- a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml +++ b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_1.xml @@ -1,398 +1,399 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:inlines with border and padding properties and conditionality. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align not set .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="end" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="justify" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align not set .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="end" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="justify" .conditionality="discard". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" .conditionality="discard". - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="265100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="345720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="45570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="265100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="345720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="45570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="259229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="269229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="340000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="45570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="226190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="299050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="309050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="111150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="121150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="261100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="39570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="261100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="39570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="262613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="268613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="39570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/> - - <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="222190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="100030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="104030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/> - </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>
+ This test checks fo:inlines with border and padding properties and conditionality.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align not set .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="end" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="justify" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align not set .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="end" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="justify" .conditionality="discard".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" .conditionality="discard".
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="265100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="345720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="45570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="265100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="345720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="45570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="259229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="269229" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="340000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="45570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="216190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="226190" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="299050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="309050" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="111150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="121150" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="255100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="261100" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="335720" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="35570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="39570" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="255100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="261100" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="335720" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="35570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="39570" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="262613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="268613" xpath="//flow/block[7]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="35570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="39570" xpath="//flow/block[7]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[7]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[7]/lineArea[3]/inlineparent/@padding-end"/>
+
+ <eval expected="216190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="222190" xpath="//flow/block[8]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="310170" xpath="//flow/block[8]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="100030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="104030" xpath="//flow/block[8]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[8]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[8]/lineArea[3]/inlineparent/@padding-end"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml index 3e2d4a9b9..0b03fba30 100644 --- a/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml +++ b/test/layoutengine/standard-testcases/inline_border_padding_conditionality_2.xml @@ -1,311 +1,312 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:inlines with border and padding properties and conditionality retain. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align not set padding .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="end" padding .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="justify" padding .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain, - and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" padding .conditionality="retain". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center"> - Multi-line fo:inline - <fo:inline border="solid 1pt red" - border-start-width.length="1pt" - border-start-width.conditionality="retain" - border-end-width.length="1pt" - border-end-width.conditionality="retain" - padding="1pt" - padding-start.length="5pt" - padding-start.conditionality="retain" - padding-end.length="3pt" - padding-end.conditionality="retain" - background-color="yellow" - linefeed-treatment="preserve">As far as the laws of mathematics refer to reality, - they are not certain, and as far as they are certain, - they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" .conditionality="retain" linefeed-treatment="preserve". - </fo:block> - <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center"> - Multi-line fo:inline - <fo:inline - border="solid 1pt red" - border-start-width.length="1pt" - border-end-width.length="1pt" - padding="1pt" - padding-start.length="5pt" - padding-end.length="3pt" - background-color="yellow" - linefeed-treatment="preserve">As far as the laws of mathematics refer to reality, - they are not certain, and as far as they are certain, - they do not refer to reality - Albert Einstein</fo:inline> - text-align="center" .conditionality="discard" linefeed-treatment="preserve". - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="264100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="343720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="44570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="264100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="343720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="44570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="260075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="269075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="342000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="44570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="237870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="246870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="317940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="325940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="70580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="79580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="183960" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="193960" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="255680" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="265680" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/> - <eval expected="186750" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="196750" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/> - - <eval expected="172840" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/> - <eval expected="178840" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/> - <eval expected="266800" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/> - <eval expected="266800" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/> - <eval expected="186750" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/> - <eval expected="190750" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/> - <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/> - </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>
+ This test checks fo:inlines with border and padding properties and conditionality retain.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align not set padding .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="end">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="end" padding .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="justify">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="justify" padding .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow">As far as the laws of mathematics refer to reality, they are not certain,
+ and as far as they are certain, they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" padding .conditionality="retain".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+ Multi-line fo:inline
+ <fo:inline border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-start-width.conditionality="retain"
+ border-end-width.length="1pt"
+ border-end-width.conditionality="retain"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-start.conditionality="retain"
+ padding-end.length="3pt"
+ padding-end.conditionality="retain"
+ background-color="yellow"
+ linefeed-treatment="preserve">As far as the laws of mathematics refer to reality,
+ they are not certain, and as far as they are certain,
+ they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" .conditionality="retain" linefeed-treatment="preserve".
+ </fo:block>
+ <fo:block background-color="silver" margin="3pt 0pt 3pt 0pt" text-align="center">
+ Multi-line fo:inline
+ <fo:inline
+ border="solid 1pt red"
+ border-start-width.length="1pt"
+ border-end-width.length="1pt"
+ padding="1pt"
+ padding-start.length="5pt"
+ padding-end.length="3pt"
+ background-color="yellow"
+ linefeed-treatment="preserve">As far as the laws of mathematics refer to reality,
+ they are not certain, and as far as they are certain,
+ they do not refer to reality - Albert Einstein</fo:inline>
+ text-align="center" .conditionality="discard" linefeed-treatment="preserve".
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="255100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="264100" xpath="//flow/block[1]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="343720" xpath="//flow/block[1]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="44570" xpath="//flow/block[1]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[1]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="255100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="264100" xpath="//flow/block[2]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="335720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="343720" xpath="//flow/block[2]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="44570" xpath="//flow/block[2]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="260075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="269075" xpath="//flow/block[3]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="342000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="350000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="35570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="44570" xpath="//flow/block[3]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[3]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="237870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="246870" xpath="//flow/block[4]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="317940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="325940" xpath="//flow/block[4]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="70580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="79580" xpath="//flow/block[4]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="183960" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="193960" xpath="//flow/block[5]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="255680" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="265680" xpath="//flow/block[5]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[2]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[2]/inlineparent/@padding-start"/>
+ <eval expected="186750" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="196750" xpath="//flow/block[5]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea[3]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[5]/lineArea[3]/inlineparent/@padding-start"/>
+
+ <eval expected="172840" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipd"/>
+ <eval expected="178840" xpath="//flow/block[6]/lineArea[1]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[1]/inlineparent/@border-start"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea[1]/inlineparent/@padding-start"/>
+ <eval expected="266800" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipd"/>
+ <eval expected="266800" xpath="//flow/block[6]/lineArea[2]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[2]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[2]/inlineparent/@border-before"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[2]/inlineparent/@padding-before"/>
+ <eval expected="186750" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipd"/>
+ <eval expected="190750" xpath="//flow/block[6]/lineArea[3]/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[3]/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[6]/lineArea[3]/inlineparent/@border-end"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-before"/>
+ <eval expected="3000" xpath="//flow/block[6]/lineArea[3]/inlineparent/@padding-end"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml b/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml index e812bc387..8a170e5a7 100644 --- a/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml +++ b/test/layoutengine/standard-testcases/inline_dominant-baseline_1.xml @@ -1,128 +1,129 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level dominant-baseline. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="auto">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="central">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="middle">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt"> - <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/> - <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-before"/> - <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/> - </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>
+ This test checks inline level dominant-baseline.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="auto">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="central">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="middle">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="14pt">
+ <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="10pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+ <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
+ <eval expected="1925" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml b/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml index f382e8aa3..20b6c2363 100644 --- a/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml +++ b/test/layoutengine/standard-testcases/inline_dominant-baseline_2.xml @@ -1,128 +1,129 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level dominant-baseline. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="auto">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="central">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="middle">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline> - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt"> - <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-after"/> - <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-after"/> - <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-after"/> - <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-after"/> - <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-after"/> - <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-after"/> - <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-after"/> - <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-after"/> - <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-after"/> - <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="-3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/> - - <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/> - <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-before"/> - <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/> - </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>
+ This test checks inline level dominant-baseline.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="auto">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="auto"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="no-change">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="no-change"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="ideographic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="ideographic"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="alphabetic">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="alphabetic"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="hanging">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="hanging"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="mathematical">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="mathematical"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="central">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="central"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="middle">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="middle"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="text-after-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-after-edge"</fo:inline> After</fo:inline>
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="10pt">
+ <fo:inline dominant-baseline="text-before-edge">Before <fo:inline font-size="14pt" background-color="yellow">dominant-baseline="text-before-edge"</fo:inline> After</fo:inline>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="12950" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+ <eval expected="2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-2872" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+ <eval expected="2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-2872" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+ <eval expected="3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+ <eval expected="2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-2872" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+ <eval expected="574" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-574" xpath="//flow/block[5]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+ <eval expected="1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-1436" xpath="//flow/block[6]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+ <eval expected="1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-1850" xpath="//flow/block[7]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+ <eval expected="1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-1826" xpath="//flow/block[8]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+ <eval expected="3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="-3700" xpath="//flow/block[9]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+
+ <eval expected="12950" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+ <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
+ <eval expected="1375" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml b/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml index 4d09ad57b..836cf48e3 100644 --- a/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml +++ b/test/layoutengine/standard-testcases/inline_dominant-baseline_3.xml @@ -1,115 +1,116 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level dominant-baseline. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - dominant-baseline="central" - background-color="yellow">central - <fo:inline font-size="50%" - background-color="red">Baseline changed</fo:inline> - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - dominant-baseline="text-before-edge" - background-color="yellow">text-before-edge - <fo:inline font-size="50%" - background-color="red">Baseline changed</fo:inline> - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - dominant-baseline="text-after-edge" - background-color="yellow">text-after-edge - <fo:inline font-size="150%" - background-color="red">Baseline changed</fo:inline> - </fo:inline> - After - </fo:block> - <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt"> - Before - <fo:inline font-size="50%" - dominant-baseline="middle" - background-color="yellow">middle - <fo:inline font-size="150%" - dominant-baseline="hanging" - background-color="red">hanging - <fo:inline font-size="75%" - background-color="green">Baseline changed - </fo:inline> - </fo:inline> - </fo:inline> - After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="14800" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="5744" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="1850" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="14800" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="5744" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="14800" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="5744" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="15018" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="5744" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/> - <eval expected="-1826" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level dominant-baseline.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ dominant-baseline="central"
+ background-color="yellow">central
+ <fo:inline font-size="50%"
+ background-color="red">Baseline changed</fo:inline>
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ dominant-baseline="text-before-edge"
+ background-color="yellow">text-before-edge
+ <fo:inline font-size="50%"
+ background-color="red">Baseline changed</fo:inline>
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ dominant-baseline="text-after-edge"
+ background-color="yellow">text-after-edge
+ <fo:inline font-size="150%"
+ background-color="red">Baseline changed</fo:inline>
+ </fo:inline>
+ After
+ </fo:block>
+ <fo:block background-color="silver" margin="1pt 0pt 1pt 0pt" font-size="16pt">
+ Before
+ <fo:inline font-size="50%"
+ dominant-baseline="middle"
+ background-color="yellow">middle
+ <fo:inline font-size="150%"
+ dominant-baseline="hanging"
+ background-color="red">hanging
+ <fo:inline font-size="75%"
+ background-color="green">Baseline changed
+ </fo:inline>
+ </fo:inline>
+ </fo:inline>
+ After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="14800" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5744" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="1850" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="14800" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5744" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="14800" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5744" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-3700" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="15018" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5744" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/text[1]/@offset"/>
+ <eval expected="-1826" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/inlineparent/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_keep-together.xml b/test/layoutengine/standard-testcases/inline_keep-together.xml index 0a3ffe737..1bd82c0b8 100644 --- a/test/layoutengine/standard-testcases/inline_keep-together.xml +++ b/test/layoutengine/standard-testcases/inline_keep-together.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/inline_letter-spacing.xml b/test/layoutengine/standard-testcases/inline_letter-spacing.xml index 1c0ca3d6e..0a5a466e5 100644 --- a/test/layoutengine/standard-testcases/inline_letter-spacing.xml +++ b/test/layoutengine/standard-testcases/inline_letter-spacing.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_letter-spacing_2.xml b/test/layoutengine/standard-testcases/inline_letter-spacing_2.xml index f1e6754f9..d3e06fc25 100644 --- a/test/layoutengine/standard-testcases/inline_letter-spacing_2.xml +++ b/test/layoutengine/standard-testcases/inline_letter-spacing_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml b/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml index daa17f026..b86162ac1 100644 --- a/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml +++ b/test/layoutengine/standard-testcases/inline_letter-spacing_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_table_nested_1.xml b/test/layoutengine/standard-testcases/inline_table_nested_1.xml index 9b483aabc..c6d70bb68 100644 --- a/test/layoutengine/standard-testcases/inline_table_nested_1.xml +++ b/test/layoutengine/standard-testcases/inline_table_nested_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_vertical-align_1.xml b/test/layoutengine/standard-testcases/inline_vertical-align_1.xml index eed8d39f5..c3ec1ac76 100644 --- a/test/layoutengine/standard-testcases/inline_vertical-align_1.xml +++ b/test/layoutengine/standard-testcases/inline_vertical-align_1.xml @@ -1,188 +1,189 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level vertical align. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="6in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" background-color="yellow">vertical-align not specified</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="baseline" background-color="yellow">vertical-align="baseline"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="top" background-color="yellow">vertical-align="top"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="text-top" background-color="yellow">vertical-align="text-top"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="middle" background-color="yellow">vertical-align="middle"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="text-bottom" background-color="yellow">vertical-align="text-bottom"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="bottom" background-color="yellow">vertical-align="bottom"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="3pt" background-color="yellow">vertical-align="3pt"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="-3pt" background-color="yellow">vertical-align="-3pt"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="50%" background-color="yellow">vertical-align="50%"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline font-size="10pt" vertical-align="-50%" background-color="yellow">vertical-align="-50%"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Before <fo:inline vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="18500" xpath="//flow/block[1]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/> - <eval expected="7180" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[2]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/> - <eval expected="7180" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[3]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[4]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[5]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/> - <eval expected="4565" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[6]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/> - <eval expected="9250" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[7]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/> - <eval expected="9250" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/> - - <eval expected="21780" xpath="//flow/block[8]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-after"/> - <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/> - <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/> - - <eval expected="19045" xpath="//flow/block[9]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/> - <eval expected="9795" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[10]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/> - <eval expected="4180" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/> - - <eval expected="19430" xpath="//flow/block[11]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/> - <eval expected="10180" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/> - - <eval expected="18500" xpath="//flow/block[12]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/> - <eval expected="1180" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/> - - <eval expected="22430" xpath="//flow/block[13]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/> - <eval expected="13180" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/> - - <eval expected="28960" xpath="//flow/block[14]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-after"/> - <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/> - <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[2]/@offset"/> - - <eval expected="23730" xpath="//flow/block[15]/lineArea[1]/@bpd"/> - <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-before"/> - <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-after"/> - <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[1]/@offset"/> - <eval expected="5230" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/> - <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[2]/@offset"/> - </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>
+ This test checks inline level vertical align.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="6in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" background-color="yellow">vertical-align not specified</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="baseline" background-color="yellow">vertical-align="baseline"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="top" background-color="yellow">vertical-align="top"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="text-top" background-color="yellow">vertical-align="text-top"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="middle" background-color="yellow">vertical-align="middle"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="text-bottom" background-color="yellow">vertical-align="text-bottom"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="bottom" background-color="yellow">vertical-align="bottom"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="3pt" background-color="yellow">vertical-align="3pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="-3pt" background-color="yellow">vertical-align="-3pt"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="50%" background-color="yellow">vertical-align="50%"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline font-size="10pt" vertical-align="-50%" background-color="yellow">vertical-align="-50%"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline vertical-align="super" background-color="yellow">vertical-align="super"</fo:inline> After
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Before <fo:inline vertical-align="sub" background-color="yellow">vertical-align="sub"</fo:inline> After
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18500" xpath="//flow/block[1]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[1]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[2]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[2]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="7180" xpath="//flow/block[2]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[3]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[3]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[4]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[4]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[5]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[5]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="4565" xpath="//flow/block[5]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[6]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[6]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="9250" xpath="//flow/block[6]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[7]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[7]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="9250" xpath="//flow/block[7]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="21780" xpath="//flow/block[8]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[8]/lineArea[1]/@space-after"/>
+ <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[8]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="3280" xpath="//flow/block[8]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="19045" xpath="//flow/block[9]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[9]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="9795" xpath="//flow/block[9]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[9]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[10]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[10]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="4180" xpath="//flow/block[10]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="19430" xpath="//flow/block[11]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[11]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="10180" xpath="//flow/block[11]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[11]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="18500" xpath="//flow/block[12]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[12]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="1180" xpath="//flow/block[12]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[12]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="22430" xpath="//flow/block[13]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[13]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="13180" xpath="//flow/block[13]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[13]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="28960" xpath="//flow/block[14]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[14]/lineArea[1]/@space-after"/>
+ <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[14]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="10460" xpath="//flow/block[14]/lineArea[1]/text[2]/@offset"/>
+
+ <eval expected="23730" xpath="//flow/block[15]/lineArea[1]/@bpd"/>
+ <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-before"/>
+ <eval expected="2750" xpath="//flow/block[15]/lineArea[1]/@space-after"/>
+ <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[1]/@offset"/>
+ <eval expected="5230" xpath="//flow/block[15]/lineArea[1]/inlineparent/@offset"/>
+ <eval expected="0" xpath="//flow/block[15]/lineArea[1]/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_vertical-align_2.xml b/test/layoutengine/standard-testcases/inline_vertical-align_2.xml index 64d401957..509275a01 100644 --- a/test/layoutengine/standard-testcases/inline_vertical-align_2.xml +++ b/test/layoutengine/standard-testcases/inline_vertical-align_2.xml @@ -1,121 +1,122 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks inline level vertical align. - This example is taken from the spec section 7.13. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5.5in" page-height="7.5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> - This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />, - middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />, - none <fo:external-graphic src="url(../../resources/images/line_medium.png)" />. - And this is a line of text that follows the line with the objects aligned on it. - </fo:block> - <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> - This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />, - middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />. - And this is a line of text that follows the line with the objects aligned on it. - </fo:block> - <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> - This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />. - And this is a line of text that follows the line with the objects aligned on it. - </fo:block> - <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> - This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />. - And this is a line of text that follows the line with the objects aligned on it. - </fo:block> - <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt"> - This is a longer line that provides a context for the line with images aligned on it. - Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />, - after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />, - middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />. - And this is a line of text that follows the line with the objects aligned on it. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[1]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[2]/@offset"/> - <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[2]/@offset"/> - <eval expected="35995" xpath="//flow/block[1]/lineArea[2]/viewport[3]/@offset"/> - <eval expected="17998" xpath="//flow/block[1]/lineArea[2]/viewport[4]/@offset"/> - <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[3]/@offset"/> - <eval expected="34379" xpath="//flow/block[1]/lineArea[2]/viewport[5]/@offset"/> - <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[4]/@offset"/> - <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[6]/@offset"/> - <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[5]/@offset"/> - - <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[1]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[2]/@offset"/> - <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[2]/@offset"/> - <eval expected="35995" xpath="//flow/block[2]/lineArea[2]/viewport[3]/@offset"/> - <eval expected="17998" xpath="//flow/block[2]/lineArea[2]/viewport[4]/@offset"/> - <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[3]/@offset"/> - <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[5]/@offset"/> - <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[4]/@offset"/> - - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[1]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[2]/@offset"/> - <eval expected="35995" xpath="//flow/block[3]/lineArea[2]/viewport[3]/@offset"/> - <eval expected="17998" xpath="//flow/block[3]/lineArea[2]/viewport[4]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[3]/@offset"/> - - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[1]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[2]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[2]/@offset"/> - <eval expected="35995" xpath="//flow/block[4]/lineArea[2]/viewport[3]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[4]/@offset"/> - <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[3]/@offset"/> - - <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[1]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[1]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[2]/@offset"/> - <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[2]/@offset"/> - <eval expected="35995" xpath="//flow/block[5]/lineArea[2]/viewport[3]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[4]/@offset"/> - <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[3]/@offset"/> - <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[5]/@offset"/> - <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[4]/@offset"/> - </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>
+ This test checks inline level vertical align.
+ This example is taken from the spec section 7.13.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5.5in" page-height="7.5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+ This is a longer line that provides a context for the line with images aligned on it.
+ Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,
+ after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />,
+ middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />,
+ none <fo:external-graphic src="url(../../resources/images/line_medium.png)" />.
+ And this is a line of text that follows the line with the objects aligned on it.
+ </fo:block>
+ <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+ This is a longer line that provides a context for the line with images aligned on it.
+ Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,
+ after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />,
+ middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />.
+ And this is a line of text that follows the line with the objects aligned on it.
+ </fo:block>
+ <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+ This is a longer line that provides a context for the line with images aligned on it.
+ Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_large.png)" vertical-align="top" />,
+ after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_medium.png)" vertical-align="bottom" />.
+ And this is a line of text that follows the line with the objects aligned on it.
+ </fo:block>
+ <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+ This is a longer line that provides a context for the line with images aligned on it.
+ Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />,
+ after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />.
+ And this is a line of text that follows the line with the objects aligned on it.
+ </fo:block>
+ <fo:block background-color="yellow" margin="2pt 0pt 2pt 0pt" font-size="10pt">
+ This is a longer line that provides a context for the line with images aligned on it.
+ Before edge <fo:external-graphic src="url(../../resources/images/arrow_down_small.png)" vertical-align="top" /><fo:external-graphic src="url(../../resources/images/arrow_down_medium.png)" vertical-align="top" />,
+ after edge <fo:external-graphic src="url(../../resources/images/arrow_up_small.png)" vertical-align="bottom" /><fo:external-graphic src="url(../../resources/images/arrow_up_large.png)" vertical-align="bottom" />,
+ middle <fo:external-graphic src="url(../../resources/images/arrow_up_down_small.png)" vertical-align="middle" />.
+ And this is a line of text that follows the line with the objects aligned on it.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[2]/@offset"/>
+ <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" xpath="//flow/block[1]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="17998" xpath="//flow/block[1]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[3]/@offset"/>
+ <eval expected="34379" xpath="//flow/block[1]/lineArea[2]/viewport[5]/@offset"/>
+ <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[4]/@offset"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea[2]/viewport[6]/@offset"/>
+ <eval expected="48812" xpath="//flow/block[1]/lineArea[2]/text[5]/@offset"/>
+
+ <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[2]/@offset"/>
+ <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" xpath="//flow/block[2]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="17998" xpath="//flow/block[2]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[3]/@offset"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea[2]/viewport[5]/@offset"/>
+ <eval expected="14433" xpath="//flow/block[2]/lineArea[2]/text[4]/@offset"/>
+
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/viewport[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" xpath="//flow/block[3]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="17998" xpath="//flow/block[3]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea[2]/text[3]/@offset"/>
+
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" xpath="//flow/block[4]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea[2]/text[3]/@offset"/>
+
+ <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[1]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[2]/@offset"/>
+ <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[2]/@offset"/>
+ <eval expected="35995" xpath="//flow/block[5]/lineArea[2]/viewport[3]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[4]/@offset"/>
+ <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[3]/@offset"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea[2]/viewport[5]/@offset"/>
+ <eval expected="14433" xpath="//flow/block[5]/lineArea[2]/text[4]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/inline_word-spacing.xml b/test/layoutengine/standard-testcases/inline_word-spacing.xml index 80585fbfa..1dc9d272e 100644 --- a/test/layoutengine/standard-testcases/inline_word-spacing.xml +++ b/test/layoutengine/standard-testcases/inline_word-spacing.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/inline_word-spacing_text-align_justify.xml b/test/layoutengine/standard-testcases/inline_word-spacing_text-align_justify.xml index 43a8292da..fa21c4dd7 100644 --- a/test/layoutengine/standard-testcases/inline_word-spacing_text-align_justify.xml +++ b/test/layoutengine/standard-testcases/inline_word-spacing_text-align_justify.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/instream-foreign-object_basic.xml b/test/layoutengine/standard-testcases/instream-foreign-object_basic.xml index 1661aa6d6..80a5edf3b 100644 --- a/test/layoutengine/standard-testcases/instream-foreign-object_basic.xml +++ b/test/layoutengine/standard-testcases/instream-foreign-object_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/instream-foreign-object_border_padding.xml b/test/layoutengine/standard-testcases/instream-foreign-object_border_padding.xml index aadcb4bf9..d137f7200 100644 --- a/test/layoutengine/standard-testcases/instream-foreign-object_border_padding.xml +++ b/test/layoutengine/standard-testcases/instream-foreign-object_border_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/instream-foreign-object_display-align.xml b/test/layoutengine/standard-testcases/instream-foreign-object_display-align.xml index 758c0f676..2b7e0e0b0 100644 --- a/test/layoutengine/standard-testcases/instream-foreign-object_display-align.xml +++ b/test/layoutengine/standard-testcases/instream-foreign-object_display-align.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/kerning_1_off.xml b/test/layoutengine/standard-testcases/kerning_1_off.xml index 3002d48d0..569d98238 100644 --- a/test/layoutengine/standard-testcases/kerning_1_off.xml +++ b/test/layoutengine/standard-testcases/kerning_1_off.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/kerning_1_on.xml b/test/layoutengine/standard-testcases/kerning_1_on.xml index 308a196df..4cc016cc2 100644 --- a/test/layoutengine/standard-testcases/kerning_1_on.xml +++ b/test/layoutengine/standard-testcases/kerning_1_on.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/leader-alignment.xml b/test/layoutengine/standard-testcases/leader-alignment.xml index c8257ab48..3f36afc30 100644 --- a/test/layoutengine/standard-testcases/leader-alignment.xml +++ b/test/layoutengine/standard-testcases/leader-alignment.xml @@ -1,67 +1,68 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks leaders - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="6in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block margin="0pt" padding-left="10mm"> - margin="0pt" padding-left="10mm" - </fo:block> - <fo:block padding-left="10mm"> - padding-left="10mm" - </fo:block> - <fo:block> - <fo:leader leader-length.minimum="12pt" - leader-length.optimum="80pt" - leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/> - leader-alignment="page" - </fo:block> - <fo:block margin="0pt" padding-left="10mm"> - <fo:leader leader-length.minimum="12pt" - leader-length.optimum="80pt" - leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/> - leader-alignment="page" - </fo:block> - <fo:block margin="0pt" padding-left="5mm"> - <fo:leader leader-length.minimum="12pt" - leader-length.optimum="80pt" - leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/> - leader-alignment="reference-area" - <fo:leader leader-length.minimum="12pt" - leader-length.optimum="80pt" - leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/> - leader-alignment="reference-area" Leader-pattern is aligned as if it began on the current reference-area's content-rectangle start-edge. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - </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>
+ This test checks leaders
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="6in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block margin="0pt" padding-left="10mm">
+ margin="0pt" padding-left="10mm"
+ </fo:block>
+ <fo:block padding-left="10mm">
+ padding-left="10mm"
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length.minimum="12pt"
+ leader-length.optimum="80pt"
+ leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>
+ leader-alignment="page"
+ </fo:block>
+ <fo:block margin="0pt" padding-left="10mm">
+ <fo:leader leader-length.minimum="12pt"
+ leader-length.optimum="80pt"
+ leader-length.maximum="100%" leader-pattern="dots" leader-alignment="page"/>
+ leader-alignment="page"
+ </fo:block>
+ <fo:block margin="0pt" padding-left="5mm">
+ <fo:leader leader-length.minimum="12pt"
+ leader-length.optimum="80pt"
+ leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>
+ leader-alignment="reference-area"
+ <fo:leader leader-length.minimum="12pt"
+ leader-length.optimum="80pt"
+ leader-length.maximum="100%" leader-pattern="dots" leader-alignment="reference-area"/>
+ leader-alignment="reference-area" Leader-pattern is aligned as if it began on the current reference-area's content-rectangle start-edge.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_alignment-baseline.xml b/test/layoutengine/standard-testcases/leader_alignment-baseline.xml index 630d40e88..352da3efc 100644 --- a/test/layoutengine/standard-testcases/leader_alignment-baseline.xml +++ b/test/layoutengine/standard-testcases/leader_alignment-baseline.xml @@ -1,170 +1,171 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:leader with different alignment-baseline values. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="baseline" background-color="yellow"/> - dots baseline - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="baseline" background-color="yellow"/> - rule solid baseline - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="baseline" background-color="yellow"/> - rule double baseline - </fo:block> - <fo:block> - <!-- use content currently causes a ClassCastException - <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="baseline" background-color="yellow">x</fo:leader> - use-content x baseline - --> - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="before-edge" background-color="yellow"/> - dots before-edge - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="before-edge" background-color="yellow"/> - rule solid before-edge - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="before-edge" background-color="yellow"/> - rule double before-edge - </fo:block> - <fo:block> - <!-- use content currently causes a ClassCastException - <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="before-edge" background-color="yellow">x</fo:leader> - use-content x before-edge - --> - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="middle" background-color="yellow"/> - dots middle - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="middle" background-color="yellow"/> - rule solid middle - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="middle" background-color="yellow"/> - rule double middle - </fo:block> - <fo:block> - <!-- use content currently causes a ClassCastException - <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="middle" background-color="yellow">x</fo:leader> - use-content x middle - --> - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="after-edge" background-color="yellow"/> - dots after-edge - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="after-edge" background-color="yellow"/> - rule solid after-edge - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="after-edge" background-color="yellow"/> - rule double after-edge - </fo:block> - <fo:block> - <!-- use content currently causes a ClassCastException - <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="after-edge" background-color="yellow">x</fo:leader> - use-content x after-edge - --> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/> - <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/> - <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/> - - <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[6]/lineArea/leader/@ipd"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipd"/> - <eval expected="0" xpath="//flow/block[7]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/> - <eval expected="3810" xpath="//flow/block[9]/lineArea/inlineparent/@offset"/> - - <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[10]/lineArea/leader/@ipd"/> - <eval expected="4978" xpath="//flow/block[10]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[11]/lineArea/leader/@ipd"/> - <eval expected="4978" xpath="//flow/block[11]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/> - <eval expected="7764" xpath="//flow/block[13]/lineArea/inlineparent/@offset"/> - - <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[14]/lineArea/leader/@ipd"/> - <eval expected="10100" xpath="//flow/block[14]/lineArea/leader/@offset"/> - - <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[15]/lineArea/leader/@ipd"/> - <eval expected="10100" xpath="//flow/block[15]/lineArea/leader/@offset"/> - </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>
+ This test checks fo:leader with different alignment-baseline values.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="baseline" background-color="yellow"/>
+ dots baseline
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="baseline" background-color="yellow"/>
+ rule solid baseline
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="baseline" background-color="yellow"/>
+ rule double baseline
+ </fo:block>
+ <fo:block>
+ <!-- use content currently causes a ClassCastException
+ <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="baseline" background-color="yellow">x</fo:leader>
+ use-content x baseline
+ -->
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="before-edge" background-color="yellow"/>
+ dots before-edge
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="before-edge" background-color="yellow"/>
+ rule solid before-edge
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="before-edge" background-color="yellow"/>
+ rule double before-edge
+ </fo:block>
+ <fo:block>
+ <!-- use content currently causes a ClassCastException
+ <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="before-edge" background-color="yellow">x</fo:leader>
+ use-content x before-edge
+ -->
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="middle" background-color="yellow"/>
+ dots middle
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="middle" background-color="yellow"/>
+ rule solid middle
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="middle" background-color="yellow"/>
+ rule double middle
+ </fo:block>
+ <fo:block>
+ <!-- use content currently causes a ClassCastException
+ <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="middle" background-color="yellow">x</fo:leader>
+ use-content x middle
+ -->
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="dots" alignment-baseline="after-edge" background-color="yellow"/>
+ dots after-edge
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" alignment-baseline="after-edge" background-color="yellow"/>
+ rule solid after-edge
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" alignment-baseline="after-edge" background-color="yellow"/>
+ rule double after-edge
+ </fo:block>
+ <fo:block>
+ <!-- use content currently causes a ClassCastException
+ <fo:leader leader-length="36pt" leader-pattern="use-content" alignment-baseline="after-edge" background-color="yellow">x</fo:leader>
+ use-content x after-edge
+ -->
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+ <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>
+ <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipd"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>
+ <eval expected="3810" xpath="//flow/block[9]/lineArea/inlineparent/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>
+ <eval expected="4978" xpath="//flow/block[10]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[11]/lineArea/leader/@ipd"/>
+ <eval expected="4978" xpath="//flow/block[11]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>
+ <eval expected="7764" xpath="//flow/block[13]/lineArea/inlineparent/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>
+ <eval expected="10100" xpath="//flow/block[14]/lineArea/leader/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[15]/lineArea/leader/@ipd"/>
+ <eval expected="10100" xpath="//flow/block[15]/lineArea/leader/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_background-color.xml b/test/layoutengine/standard-testcases/leader_background-color.xml index 05dd381a7..25b046045 100644 --- a/test/layoutengine/standard-testcases/leader_background-color.xml +++ b/test/layoutengine/standard-testcases/leader_background-color.xml @@ -1,81 +1,82 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:leader with background-color - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="dots" background-color="yellow"/> - dots yellow background - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" background-color="yellow"/> - rule solid yellow background - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" background-color="yellow"/> - rule double yellow background - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="space" background-color="yellow"/> - space yellow background - </fo:block> - <fo:block> - <!-- use content currently causes a ClassCastException - <fo:leader leader-length="36pt" leader-pattern="use-content" background-color="yellow">x</fo:leader> - use-content x yellow background - --> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/leader/@background"/> - - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/leader/@background"/> - - <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/> - <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipd"/> - <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/space/@background"/> - - </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>
+ This test checks fo:leader with background-color
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="dots" background-color="yellow"/>
+ dots yellow background
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" background-color="yellow"/>
+ rule solid yellow background
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" background-color="yellow"/>
+ rule double yellow background
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="space" background-color="yellow"/>
+ space yellow background
+ </fo:block>
+ <fo:block>
+ <!-- use content currently causes a ClassCastException
+ <fo:leader leader-length="36pt" leader-pattern="use-content" background-color="yellow">x</fo:leader>
+ use-content x yellow background
+ -->
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/inlineparent/@background"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[2]/lineArea/leader/@background"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[3]/lineArea/leader/@background"/>
+
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipd"/>
+ <eval expected="color=#ffff00" xpath="//flow/block[4]/lineArea/space/@background"/>
+
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_border_padding.xml b/test/layoutengine/standard-testcases/leader_border_padding.xml index a51514635..b028d5014 100644 --- a/test/layoutengine/standard-testcases/leader_border_padding.xml +++ b/test/layoutengine/standard-testcases/leader_border_padding.xml @@ -1,288 +1,289 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:leader with border and padding - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="dots" border="solid 1pt red"/> - dots solid 1pt red border - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 1pt red"/> - rule solid solid 1pt red border - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 1pt red"/> - rule double solid 1pt red border - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="space" border="solid 1pt red"/> - space solid 1pt red border - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 1pt red">x</fo:leader> - use-content x solid 1pt red border - </fo:block> - <fo:block margin="10pt 0pt 10pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="dots" border="solid 5pt red" padding="5pt"/> - dots solid 5pt red border 5pt padding - </fo:block> - <fo:block margin="10pt 0pt 10pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 5pt red" padding="5pt"/> - rule solid solid 5pt red border 5pt padding - </fo:block> - <fo:block margin="10pt 0pt 10pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 5pt red" padding="5pt"/> - rule double solid 5pt red border 5pt padding - </fo:block> - <fo:block margin="10pt 0pt 10pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="space" border="solid 5pt red" padding="5pt"/> - space solid 5pt red border 5pt padding - </fo:block> - <fo:block margin="10pt 0pt 10pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 5pt red" padding="5pt">x</fo:leader> - use-content x solid 5pt red border 5pt padding - </fo:block> - <fo:block margin="2pt 0pt 2pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="dots" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/> - dots uneven border and padding - </fo:block> - <fo:block margin="2pt 0pt 2pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/> - rule solid uneven border and padding - </fo:block> - <fo:block margin="2pt 0pt 2pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/> - rule double uneven border and padding - </fo:block> - <fo:block margin="2pt 0pt 2pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="space" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/> - space uneven border and padding - </fo:block> - <fo:block margin="2pt 0pt 2pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="use-content" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt">x</fo:leader> - use-content x uneven border and padding - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/> - <eval expected="34000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/> - <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/> - <eval expected="34000" xpath="//flow/block[2]/lineArea/leader/@ipd"/> - <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipda"/> - <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-start"/> - - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/> - <eval expected="34000" xpath="//flow/block[3]/lineArea/leader/@ipd"/> - <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipda"/> - <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-start"/> - - <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/> - <eval expected="34000" xpath="//flow/block[4]/lineArea/space/@ipd"/> - <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipda"/> - <eval expected="8615" xpath="//flow/block[4]/lineArea/space/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-start"/> - - <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/> - <eval expected="34000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-start"/> - - <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/> - <eval expected="16000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/> - <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-after"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/> - <eval expected="16000" xpath="//flow/block[7]/lineArea/leader/@ipd"/> - <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipda"/> - <eval expected="7616" xpath="//flow/block[7]/lineArea/leader/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-start"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-after"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-before"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-end"/> - <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[8]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/> - <eval expected="16000" xpath="//flow/block[8]/lineArea/leader/@ipd"/> - <eval expected="36000" xpath="//flow/block[8]/lineArea/leader/@ipda"/> - <eval expected="7616" xpath="//flow/block[8]/lineArea/leader/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-start"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-after"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-before"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-end"/> - <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/> - <eval expected="16000" xpath="//flow/block[9]/lineArea/space/@ipd"/> - <eval expected="36000" xpath="//flow/block[9]/lineArea/space/@ipda"/> - <eval expected="8615" xpath="//flow/block[9]/lineArea/space/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-start"/> - <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-after"/> - <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-before"/> - <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-end"/> - <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/> - <eval expected="16000" xpath="//flow/block[10]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[10]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[10]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-start"/> - <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-after"/> - <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-before"/> - <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-end"/> - <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/> - <eval expected="24000" xpath="//flow/block[11]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[11]/lineArea/inlineparent/@ipda"/> - <eval expected="5280" xpath="//flow/block[11]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-start"/> - <eval expected="3000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-end"/> - <eval expected="4000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[12]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/> - <eval expected="24000" xpath="//flow/block[12]/lineArea/leader/@ipd"/> - <eval expected="36000" xpath="//flow/block[12]/lineArea/leader/@ipda"/> - <eval expected="7616" xpath="//flow/block[12]/lineArea/leader/@offset"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[12]/lineArea/leader/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[12]/lineArea/leader/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[12]/lineArea/leader/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[12]/lineArea/leader/@border-start"/> - <eval expected="3000" xpath="//flow/block[12]/lineArea/leader/@padding-after"/> - <eval expected="1000" xpath="//flow/block[12]/lineArea/leader/@padding-before"/> - <eval expected="2000" xpath="//flow/block[12]/lineArea/leader/@padding-end"/> - <eval expected="4000" xpath="//flow/block[12]/lineArea/leader/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/> - <eval expected="24000" xpath="//flow/block[13]/lineArea/leader/@ipd"/> - <eval expected="36000" xpath="//flow/block[13]/lineArea/leader/@ipda"/> - <eval expected="7616" xpath="//flow/block[13]/lineArea/leader/@offset"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[13]/lineArea/leader/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[13]/lineArea/leader/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[13]/lineArea/leader/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[13]/lineArea/leader/@border-start"/> - <eval expected="3000" xpath="//flow/block[13]/lineArea/leader/@padding-after"/> - <eval expected="1000" xpath="//flow/block[13]/lineArea/leader/@padding-before"/> - <eval expected="2000" xpath="//flow/block[13]/lineArea/leader/@padding-end"/> - <eval expected="4000" xpath="//flow/block[13]/lineArea/leader/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/> - <eval expected="24000" xpath="//flow/block[14]/lineArea/space/@ipd"/> - <eval expected="36000" xpath="//flow/block[14]/lineArea/space/@ipda"/> - <eval expected="8615" xpath="//flow/block[14]/lineArea/space/@offset"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[14]/lineArea/space/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[14]/lineArea/space/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[14]/lineArea/space/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[14]/lineArea/space/@border-start"/> - <eval expected="3000" xpath="//flow/block[14]/lineArea/space/@padding-after"/> - <eval expected="1000" xpath="//flow/block[14]/lineArea/space/@padding-before"/> - <eval expected="2000" xpath="//flow/block[14]/lineArea/space/@padding-end"/> - <eval expected="4000" xpath="//flow/block[14]/lineArea/space/@padding-start"/> - - <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/> - <eval expected="24000" xpath="//flow/block[15]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[15]/lineArea/inlineparent/@ipda"/> - <eval expected="0" xpath="//flow/block[15]/lineArea/inlineparent/@offset"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-start"/> - <eval expected="3000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-after"/> - <eval expected="1000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-before"/> - <eval expected="2000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-end"/> - <eval expected="4000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-start"/> - </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>
+ This test checks fo:leader with border and padding
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="dots" border="solid 1pt red"/>
+ dots solid 1pt red border
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 1pt red"/>
+ rule solid solid 1pt red border
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 1pt red"/>
+ rule double solid 1pt red border
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="space" border="solid 1pt red"/>
+ space solid 1pt red border
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 1pt red">x</fo:leader>
+ use-content x solid 1pt red border
+ </fo:block>
+ <fo:block margin="10pt 0pt 10pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="dots" border="solid 5pt red" padding="5pt"/>
+ dots solid 5pt red border 5pt padding
+ </fo:block>
+ <fo:block margin="10pt 0pt 10pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border="solid 5pt red" padding="5pt"/>
+ rule solid solid 5pt red border 5pt padding
+ </fo:block>
+ <fo:block margin="10pt 0pt 10pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border="solid 5pt red" padding="5pt"/>
+ rule double solid 5pt red border 5pt padding
+ </fo:block>
+ <fo:block margin="10pt 0pt 10pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="space" border="solid 5pt red" padding="5pt"/>
+ space solid 5pt red border 5pt padding
+ </fo:block>
+ <fo:block margin="10pt 0pt 10pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 5pt red" padding="5pt">x</fo:leader>
+ use-content x solid 5pt red border 5pt padding
+ </fo:block>
+ <fo:block margin="2pt 0pt 2pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="dots" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+ dots uneven border and padding
+ </fo:block>
+ <fo:block margin="2pt 0pt 2pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="solid" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+ rule solid uneven border and padding
+ </fo:block>
+ <fo:block margin="2pt 0pt 2pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="rule" rule-style="double" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+ rule double uneven border and padding
+ </fo:block>
+ <fo:block margin="2pt 0pt 2pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="space" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt"/>
+ space uneven border and padding
+ </fo:block>
+ <fo:block margin="2pt 0pt 2pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="use-content" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt">x</fo:leader>
+ use-content x uneven border and padding
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="34000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipda"/>
+ <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/inlineparent/@border-start"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="34000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[2]/lineArea/leader/@ipda"/>
+ <eval expected="7616" xpath="//flow/block[2]/lineArea/leader/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[2]/lineArea/leader/@border-start"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+ <eval expected="34000" xpath="//flow/block[3]/lineArea/leader/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[3]/lineArea/leader/@ipda"/>
+ <eval expected="7616" xpath="//flow/block[3]/lineArea/leader/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/leader/@border-start"/>
+
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+ <eval expected="34000" xpath="//flow/block[4]/lineArea/space/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[4]/lineArea/space/@ipda"/>
+ <eval expected="8615" xpath="//flow/block[4]/lineArea/space/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[4]/lineArea/space/@border-start"/>
+
+ <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
+ <eval expected="34000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[5]/lineArea/inlineparent/@border-start"/>
+
+ <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
+ <eval expected="16000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipda"/>
+ <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[6]/lineArea/inlineparent/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[6]/lineArea/inlineparent/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
+ <eval expected="16000" xpath="//flow/block[7]/lineArea/leader/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[7]/lineArea/leader/@ipda"/>
+ <eval expected="7616" xpath="//flow/block[7]/lineArea/leader/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[7]/lineArea/leader/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[7]/lineArea/leader/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[8]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>
+ <eval expected="16000" xpath="//flow/block[8]/lineArea/leader/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[8]/lineArea/leader/@ipda"/>
+ <eval expected="7616" xpath="//flow/block[8]/lineArea/leader/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[8]/lineArea/leader/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[8]/lineArea/leader/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[9]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
+ <eval expected="16000" xpath="//flow/block[9]/lineArea/space/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[9]/lineArea/space/@ipda"/>
+ <eval expected="8615" xpath="//flow/block[9]/lineArea/space/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[9]/lineArea/space/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[9]/lineArea/space/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[10]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
+ <eval expected="16000" xpath="//flow/block[10]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[10]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[10]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[10]/lineArea/inlineparent/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[10]/lineArea/inlineparent/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[11]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
+ <eval expected="24000" xpath="//flow/block[11]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[11]/lineArea/inlineparent/@ipda"/>
+ <eval expected="5280" xpath="//flow/block[11]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[11]/lineArea/inlineparent/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[11]/lineArea/inlineparent/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[12]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>
+ <eval expected="24000" xpath="//flow/block[12]/lineArea/leader/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[12]/lineArea/leader/@ipda"/>
+ <eval expected="7616" xpath="//flow/block[12]/lineArea/leader/@offset"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[12]/lineArea/leader/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[12]/lineArea/leader/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[12]/lineArea/leader/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[12]/lineArea/leader/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[12]/lineArea/leader/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[12]/lineArea/leader/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[12]/lineArea/leader/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[12]/lineArea/leader/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[13]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
+ <eval expected="24000" xpath="//flow/block[13]/lineArea/leader/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[13]/lineArea/leader/@ipda"/>
+ <eval expected="7616" xpath="//flow/block[13]/lineArea/leader/@offset"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[13]/lineArea/leader/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[13]/lineArea/leader/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[13]/lineArea/leader/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[13]/lineArea/leader/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[13]/lineArea/leader/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[13]/lineArea/leader/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[13]/lineArea/leader/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[13]/lineArea/leader/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[14]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
+ <eval expected="24000" xpath="//flow/block[14]/lineArea/space/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[14]/lineArea/space/@ipda"/>
+ <eval expected="8615" xpath="//flow/block[14]/lineArea/space/@offset"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[14]/lineArea/space/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[14]/lineArea/space/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[14]/lineArea/space/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[14]/lineArea/space/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[14]/lineArea/space/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[14]/lineArea/space/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[14]/lineArea/space/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[14]/lineArea/space/@padding-start"/>
+
+ <eval expected="11100" xpath="//flow/block[15]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
+ <eval expected="24000" xpath="//flow/block[15]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[15]/lineArea/inlineparent/@ipda"/>
+ <eval expected="0" xpath="//flow/block[15]/lineArea/inlineparent/@offset"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[15]/lineArea/inlineparent/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[15]/lineArea/inlineparent/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml index 55af7c317..1a0cc8d96 100644 --- a/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml +++ b/test/layoutengine/standard-testcases/leader_leader-pattern_dots.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml index bfba5ea26..4dce8be6c 100644 --- a/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml +++ b/test/layoutengine/standard-testcases/leader_leader-pattern_rule.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml index 61ee71e7d..8948ccb65 100644 --- a/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml +++ b/test/layoutengine/standard-testcases/leader_leader-pattern_space.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml index 9b8306bbd..a3bf802dd 100644 --- a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml +++ b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content.xml @@ -1,175 +1,176 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks leaders with leader-pattern="use-content" - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content">x</fo:leader> - Content is "x" - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content"><fo:inline background-color="yellow">=></fo:inline></fo:leader> - Content is "=>" with background - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline background-color="orange">~</fo:inline></fo:leader> - Content is "~" with leader-pattern-width="12pt" - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" background-color="yellow">*</fo:inline></fo:leader> - Content is "*" with leader-pattern-width="12pt" and border - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" font-size="6pt" alignment-baseline="middle" background-color="yellow">++</fo:inline></fo:leader> - Content is "++" with l-p-w="12pt" and border small font - </fo:block> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:instream-foreign-object> - <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10"> - <rect x="0" y="0" width="5" height="5" style="fill:red"/> - <rect x="5" y="5" width="5" height="5" style="fill:black"/> - </svg> - </fo:instream-foreign-object></fo:leader> - Content is svg 10 x 10 - </fo:block> - <fo:block> - <fo:leader leader-pattern="use-content"><fo:instream-foreign-object> - <svg xmlns="http://www.w3.org/2000/svg" width="20" height="10"> - <rect x="0" y="0" width="10" height="5" style="fill:red"/> - <rect x="10" y="5" width="10" height="5" style="fill:black"/> - </svg> - </fo:instream-foreign-object></fo:leader> - Content is svg 20 x 10 which is wider than the leader-length - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@offset"/> - <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@ipd"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@offset"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/> - <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@ipd"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@offset"/> - - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="36000" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/> - <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/> - <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/> - <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@ipd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@offset"/> - <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/> - <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@ipd"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@offset"/> - - <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/> - <eval expected="36000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/> - <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/> - <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/> - <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/> - <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@ipd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@offset"/> - <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/> - <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/> - <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@ipd"/> - <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@offset"/> - <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/> - - <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/> - <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/> - <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/> - <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@offset"/> - <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/> - <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/> - <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@ipd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@offset"/> - <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@offset"/> - <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/> - <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/> - <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@ipd"/> - <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@offset"/> - <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@offset"/> - <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/> - - <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/> - <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/> - <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/> - <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@bap"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/> - <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@ipd"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@offset"/> - <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@offset"/> - <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@bap"/> - <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/> - <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@ipd"/> - <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@offset"/> - <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@offset"/> - <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@bap"/> - - <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/> - <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/@ipd"/> - <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/@offset"/> - <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@ipd"/> - <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@offset"/> - <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@ipd"/> - <eval expected="-1384" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/> - </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>
+ This test checks leaders with leader-pattern="use-content"
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content">x</fo:leader>
+ Content is "x"
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content"><fo:inline background-color="yellow">=></fo:inline></fo:leader>
+ Content is "=>" with background
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline background-color="orange">~</fo:inline></fo:leader>
+ Content is "~" with leader-pattern-width="12pt"
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" background-color="yellow">*</fo:inline></fo:leader>
+ Content is "*" with leader-pattern-width="12pt" and border
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:inline border="solid 1pt red" font-size="6pt" alignment-baseline="middle" background-color="yellow">++</fo:inline></fo:leader>
+ Content is "++" with l-p-w="12pt" and border small font
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content" leader-pattern-width="12pt"><fo:instream-foreign-object>
+ <svg xmlns="http://www.w3.org/2000/svg" width="10" height="10">
+ <rect x="0" y="0" width="5" height="5" style="fill:red"/>
+ <rect x="5" y="5" width="5" height="5" style="fill:black"/>
+ </svg>
+ </fo:instream-foreign-object></fo:leader>
+ Content is svg 10 x 10
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-pattern="use-content"><fo:instream-foreign-object>
+ <svg xmlns="http://www.w3.org/2000/svg" width="20" height="10">
+ <rect x="0" y="0" width="10" height="5" style="fill:red"/>
+ <rect x="10" y="5" width="10" height="5" style="fill:black"/>
+ </svg>
+ </fo:instream-foreign-object></fo:leader>
+ Content is svg 20 x 10 which is wider than the leader-length
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="36000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[4]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[5]/@offset"/>
+ <eval expected="6000" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/inlineparent/inlineparent[6]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/@offset"/>
+ <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="14016" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="36000" xpath="//flow/block[3]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/@offset"/>
+ <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+ <eval expected="4992" xpath="//flow/block[3]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="7008" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="36000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/@offset"/>
+ <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/>
+ <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+ <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/>
+ <eval expected="5332" xpath="//flow/block[4]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="6668" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+ <eval expected="1000 1000 1000 1000" xpath="//flow/block[4]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/>
+
+ <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="36000" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/@offset"/>
+ <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@offset"/>
+ <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[1]/inlineparent/@bap"/>
+ <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+ <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@offset"/>
+ <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[2]/inlineparent/@bap"/>
+ <eval expected="2992" xpath="//flow/block[5]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="9008" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+ <eval expected="2739" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@offset"/>
+ <eval expected="1000 1000 1000 1000" xpath="//flow/block[5]/lineArea/inlineparent/inlineparent[3]/inlineparent/@bap"/>
+
+ <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+ <eval expected="36000" xpath="//flow/block[6]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/@offset"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/>
+ <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[1]/viewport/@bap"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/@offset"/>
+ <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@offset"/>
+ <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[2]/viewport/@bap"/>
+ <eval expected="2000" xpath="//flow/block[6]/lineArea/inlineparent/space/@ipd"/>
+ <eval expected="10000" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/@offset"/>
+ <eval expected="-1384" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@offset"/>
+ <eval expected="0 0 0 0" xpath="//flow/block[6]/lineArea/inlineparent/inlineparent[3]/viewport/@bap"/>
+
+ <eval expected="11100" xpath="//flow/block[7]/lineArea/@bpd"/>
+ <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/@ipd"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/@offset"/>
+ <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@ipd"/>
+ <eval expected="0" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/@offset"/>
+ <eval expected="20000" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@ipd"/>
+ <eval expected="-1384" xpath="//flow/block[7]/lineArea/inlineparent/inlineparent[1]/viewport/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml index 9a7766672..c79ee28c7 100644 --- a/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml +++ b/test/layoutengine/standard-testcases/leader_leader-pattern_use-content_bug.xml @@ -1,57 +1,58 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test demonstrates a bug with fo:leader use-content - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-length="36pt" leader-pattern="use-content" font-size="24pt">x</fo:leader> - use-content x font-size="24pt" - </fo:block> - <fo:block margin="10pt 0pt 10pt 0pt"> - <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 5pt red" padding="5pt">x</fo:leader> - use-content x solid 5pt red border 5pt padding - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="22200" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/> - <eval expected="16000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - <eval expected="8616" xpath="//flow/block[1]/lineArea/text/@offset"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/> - <eval expected="11100" xpath="//flow/block[2]/lineArea/inlineparent/@bpd"/> - <eval expected="16000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/> - <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/> - </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>
+ This test demonstrates a bug with fo:leader use-content
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-length="36pt" leader-pattern="use-content" font-size="24pt">x</fo:leader>
+ use-content x font-size="24pt"
+ </fo:block>
+ <fo:block margin="10pt 0pt 10pt 0pt">
+ <fo:leader leader-length="36pt" leader-pattern="use-content" border="solid 5pt red" padding="5pt">x</fo:leader>
+ use-content x solid 5pt red border 5pt padding
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="22200" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="16000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+ <eval expected="8616" xpath="//flow/block[1]/lineArea/text/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/inlineparent/@bpd"/>
+ <eval expected="16000" xpath="//flow/block[2]/lineArea/inlineparent/@ipd"/>
+ <eval expected="36000" xpath="//flow/block[2]/lineArea/inlineparent/@ipda"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_text-align.xml b/test/layoutengine/standard-testcases/leader_text-align.xml index 70c91bb9a..2316bf15b 100644 --- a/test/layoutengine/standard-testcases/leader_text-align.xml +++ b/test/layoutengine/standard-testcases/leader_text-align.xml @@ -1,158 +1,159 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:leader with different text-align - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - <fo:leader leader-pattern="dots"/> - dots - </fo:block> - <fo:block> - <fo:leader leader-pattern="rule" rule-style="double"/> - rule double - </fo:block> - <fo:block> - <fo:leader leader-pattern="space"/> - space - </fo:block> - <fo:block> - <fo:leader leader-pattern="use-content">x</fo:leader> - use-content x - </fo:block> - <fo:block text-align-last="justify"> - <fo:leader leader-pattern="dots"/> - dots text-align-last="justify" - </fo:block> - <fo:block text-align-last="justify"> - <fo:leader leader-pattern="rule" rule-style="double"/> - rule double text-align-last="justify" - </fo:block> - <fo:block text-align-last="justify"> - <fo:leader leader-pattern="space"/> - space text-align-last="justify" - </fo:block> - <fo:block text-align-last="justify"> - <fo:leader leader-pattern="use-content">x</fo:leader> - use-content x text-align-last="justify" - </fo:block> - <fo:block text-align-last="end"> - <fo:leader leader-pattern="dots"/> - dots text-align-last="end" - </fo:block> - <fo:block text-align-last="end"> - <fo:leader leader-pattern="rule" rule-style="double"/> - rule double text-align-last="end" - </fo:block> - <fo:block text-align-last="end"> - <fo:leader leader-pattern="space"/> - space text-align-last="end" - </fo:block> - <fo:block text-align-last="end"> - <fo:leader leader-pattern="use-content">x</fo:leader> - use-content x text-align-last="end" - </fo:block> - <fo:block text-align-last="center"> - <fo:leader leader-pattern="dots"/> - dots text-align-last="center" - </fo:block> - <fo:block text-align-last="center"> - <fo:leader leader-pattern="rule" rule-style="double"/> - rule double text-align-last="center" - </fo:block> - <fo:block text-align-last="center"> - <fo:leader leader-pattern="space"/> - space text-align-last="center" - </fo:block> - <fo:block text-align-last="center"> - <fo:leader leader-pattern="use-content">x</fo:leader> - use-content x text-align-last="center" - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/> - <eval expected="12000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/> - <eval expected="12000" xpath="//flow/block[2]/lineArea/leader/@ipd"/> - - <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/> - <eval expected="12000" xpath="//flow/block[3]/lineArea/space/@ipd"/> - - <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/> - <eval expected="12000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/> - <eval expected="211186" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/> - <eval expected="174081" xpath="//flow/block[6]/lineArea/leader/@ipd"/> - - <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/> - <eval expected="201939" xpath="//flow/block[7]/lineArea/space/@ipd"/> - - <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/> - <eval expected="161589" xpath="//flow/block[8]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/> - <eval expected="211752" xpath="//flow/block[9]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/> - <eval expected="175068" xpath="//flow/block[10]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[10]/lineArea/leader/@ipd"/> - - <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/> - <eval expected="202416" xpath="//flow/block[11]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[11]/lineArea/space/@ipd"/> - - <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/> - <eval expected="162396" xpath="//flow/block[12]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[12]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/> - <eval expected="99210" xpath="//flow/block[13]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/> - - <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/> - <eval expected="80868" xpath="//flow/block[14]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[14]/lineArea/leader/@ipd"/> - - <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/> - <eval expected="94542" xpath="//flow/block[15]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[15]/lineArea/space/@ipd"/> - - <eval expected="360000" xpath="//flow/block[16]/lineArea/@ipd"/> - <eval expected="74532" xpath="//flow/block[16]/lineArea/@start-indent"/> - <eval expected="12000" xpath="//flow/block[16]/lineArea/inlineparent/@ipd"/> - </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>
+ This test checks fo:leader with different text-align
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ <fo:leader leader-pattern="dots"/>
+ dots
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-pattern="rule" rule-style="double"/>
+ rule double
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-pattern="space"/>
+ space
+ </fo:block>
+ <fo:block>
+ <fo:leader leader-pattern="use-content">x</fo:leader>
+ use-content x
+ </fo:block>
+ <fo:block text-align-last="justify">
+ <fo:leader leader-pattern="dots"/>
+ dots text-align-last="justify"
+ </fo:block>
+ <fo:block text-align-last="justify">
+ <fo:leader leader-pattern="rule" rule-style="double"/>
+ rule double text-align-last="justify"
+ </fo:block>
+ <fo:block text-align-last="justify">
+ <fo:leader leader-pattern="space"/>
+ space text-align-last="justify"
+ </fo:block>
+ <fo:block text-align-last="justify">
+ <fo:leader leader-pattern="use-content">x</fo:leader>
+ use-content x text-align-last="justify"
+ </fo:block>
+ <fo:block text-align-last="end">
+ <fo:leader leader-pattern="dots"/>
+ dots text-align-last="end"
+ </fo:block>
+ <fo:block text-align-last="end">
+ <fo:leader leader-pattern="rule" rule-style="double"/>
+ rule double text-align-last="end"
+ </fo:block>
+ <fo:block text-align-last="end">
+ <fo:leader leader-pattern="space"/>
+ space text-align-last="end"
+ </fo:block>
+ <fo:block text-align-last="end">
+ <fo:leader leader-pattern="use-content">x</fo:leader>
+ use-content x text-align-last="end"
+ </fo:block>
+ <fo:block text-align-last="center">
+ <fo:leader leader-pattern="dots"/>
+ dots text-align-last="center"
+ </fo:block>
+ <fo:block text-align-last="center">
+ <fo:leader leader-pattern="rule" rule-style="double"/>
+ rule double text-align-last="center"
+ </fo:block>
+ <fo:block text-align-last="center">
+ <fo:leader leader-pattern="space"/>
+ space text-align-last="center"
+ </fo:block>
+ <fo:block text-align-last="center">
+ <fo:leader leader-pattern="use-content">x</fo:leader>
+ use-content x text-align-last="center"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="12000" xpath="//flow/block[1]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="12000" xpath="//flow/block[2]/lineArea/leader/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[3]/lineArea/@ipd"/>
+ <eval expected="12000" xpath="//flow/block[3]/lineArea/space/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+ <eval expected="12000" xpath="//flow/block[4]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[5]/lineArea/@ipd"/>
+ <eval expected="211186" xpath="//flow/block[5]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[6]/lineArea/@ipd"/>
+ <eval expected="174081" xpath="//flow/block[6]/lineArea/leader/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[7]/lineArea/@ipd"/>
+ <eval expected="201939" xpath="//flow/block[7]/lineArea/space/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[8]/lineArea/@ipd"/>
+ <eval expected="161589" xpath="//flow/block[8]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[9]/lineArea/@ipd"/>
+ <eval expected="211752" xpath="//flow/block[9]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[9]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[10]/lineArea/@ipd"/>
+ <eval expected="175068" xpath="//flow/block[10]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[10]/lineArea/leader/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[11]/lineArea/@ipd"/>
+ <eval expected="202416" xpath="//flow/block[11]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[11]/lineArea/space/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[12]/lineArea/@ipd"/>
+ <eval expected="162396" xpath="//flow/block[12]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[12]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[13]/lineArea/@ipd"/>
+ <eval expected="99210" xpath="//flow/block[13]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[13]/lineArea/inlineparent/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[14]/lineArea/@ipd"/>
+ <eval expected="80868" xpath="//flow/block[14]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[14]/lineArea/leader/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[15]/lineArea/@ipd"/>
+ <eval expected="94542" xpath="//flow/block[15]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[15]/lineArea/space/@ipd"/>
+
+ <eval expected="360000" xpath="//flow/block[16]/lineArea/@ipd"/>
+ <eval expected="74532" xpath="//flow/block[16]/lineArea/@start-indent"/>
+ <eval expected="12000" xpath="//flow/block[16]/lineArea/inlineparent/@ipd"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/leader_toc.xml b/test/layoutengine/standard-testcases/leader_toc.xml index 1ac421de9..acd0daa90 100644 --- a/test/layoutengine/standard-testcases/leader_toc.xml +++ b/test/layoutengine/standard-testcases/leader_toc.xml @@ -1,153 +1,154 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:leader in a typical table of content scenario. - This example is taken from the spec section 6.6.1.1.4 - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block text-align-last="justify"> - <fo:basic-link internal-destination="N4">1. Chapter</fo:basic-link> - <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt" - leader-length.maximum="100%" leader-pattern="dots"> - </fo:leader> - <fo:page-number-citation ref-id="N4"> - </fo:page-number-citation> - </fo:block> - <fo:block start-indent="10mm" text-align-last="justify"> - <fo:basic-link internal-destination="N11">1.1 Section</fo:basic-link> - <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt" - leader-length.maximum="100%" leader-pattern="dots"> - </fo:leader> - <fo:page-number-citation ref-id="N11"> - </fo:page-number-citation> - </fo:block> - <fo:block start-indent="10mm" text-align-last="justify"> - <fo:basic-link internal-destination="N19">1.2 Section</fo:basic-link> - <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt" - leader-length.maximum="100%" leader-pattern="dots"> - </fo:leader> - <fo:page-number-citation ref-id="N19"> - </fo:page-number-citation> - </fo:block> - <fo:block text-align-last="justify"> - <fo:basic-link internal-destination="N28">2. Chapter</fo:basic-link> - <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt" - leader-length.maximum="100%" leader-pattern="dots"> - </fo:leader> - <fo:page-number-citation ref-id="N28"> - </fo:page-number-citation> - </fo:block> - <fo:block start-indent="10mm" text-align-last="justify"> - <fo:basic-link internal-destination="N35">2.1 Section</fo:basic-link> - <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt" - leader-length.maximum="100%" leader-pattern="dots"> - </fo:leader> - <fo:page-number-citation ref-id="N35"> - </fo:page-number-citation> - </fo:block> - <fo:block start-indent="10mm" text-align-last="justify"> - <fo:basic-link internal-destination="N43">2.2 Section</fo:basic-link> - <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt" - leader-length.maximum="100%" leader-pattern="dots"> - </fo:leader> - <fo:page-number-citation ref-id="N43"> - </fo:page-number-citation> - </fo:block> - - <fo:block id="N4">1. Chapter - </fo:block> - - <fo:block>Text - </fo:block> - - <fo:block id="N11">1.1 Section - </fo:block> - - <fo:block>Text - </fo:block> - - <fo:block id="N19">1.2 Section - </fo:block> - - <fo:block>Text - </fo:block> - - <fo:block id="N28">2. Chapter - </fo:block> - - <fo:block>Text - </fo:block> - - <fo:block id="N35">2.1 Section - </fo:block> - - <fo:block>Text - </fo:block> - - <fo:block id="N43">2.2 Section - </fo:block> - - <fo:block>Text - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/> - <eval expected="263812" xpath="//flow/block[1]/lineArea/inlineparent[2]/@ipd"/> - <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent[2]/@offset"/> - - <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/> - <eval expected="331654" xpath="//flow/block[2]/lineArea/@ipd"/> - <eval expected="231669" xpath="//flow/block[2]/lineArea/inlineparent[2]/@ipd"/> - <eval expected="5280" xpath="//flow/block[2]/lineArea/inlineparent[2]/@offset"/> - - <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/> - <eval expected="331654" xpath="//flow/block[3]/lineArea/@ipd"/> - <eval expected="231669" xpath="//flow/block[3]/lineArea/inlineparent[2]/@ipd"/> - <eval expected="5280" xpath="//flow/block[3]/lineArea/inlineparent[2]/@offset"/> - - <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/> - <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/> - <eval expected="263812" xpath="//flow/block[4]/lineArea/inlineparent[2]/@ipd"/> - <eval expected="5280" xpath="//flow/block[4]/lineArea/inlineparent[2]/@offset"/> - - <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/> - <eval expected="331654" xpath="//flow/block[5]/lineArea/@ipd"/> - <eval expected="231669" xpath="//flow/block[5]/lineArea/inlineparent[2]/@ipd"/> - <eval expected="5280" xpath="//flow/block[5]/lineArea/inlineparent[2]/@offset"/> - - <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/> - <eval expected="331654" xpath="//flow/block[6]/lineArea/@ipd"/> - <eval expected="231669" xpath="//flow/block[6]/lineArea/inlineparent[2]/@ipd"/> - <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent[2]/@offset"/> - </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>
+ This test checks fo:leader in a typical table of content scenario.
+ This example is taken from the spec section 6.6.1.1.4
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block text-align-last="justify">
+ <fo:basic-link internal-destination="N4">1. Chapter</fo:basic-link>
+ <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+ leader-length.maximum="100%" leader-pattern="dots">
+ </fo:leader>
+ <fo:page-number-citation ref-id="N4">
+ </fo:page-number-citation>
+ </fo:block>
+ <fo:block start-indent="10mm" text-align-last="justify">
+ <fo:basic-link internal-destination="N11">1.1 Section</fo:basic-link>
+ <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+ leader-length.maximum="100%" leader-pattern="dots">
+ </fo:leader>
+ <fo:page-number-citation ref-id="N11">
+ </fo:page-number-citation>
+ </fo:block>
+ <fo:block start-indent="10mm" text-align-last="justify">
+ <fo:basic-link internal-destination="N19">1.2 Section</fo:basic-link>
+ <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+ leader-length.maximum="100%" leader-pattern="dots">
+ </fo:leader>
+ <fo:page-number-citation ref-id="N19">
+ </fo:page-number-citation>
+ </fo:block>
+ <fo:block text-align-last="justify">
+ <fo:basic-link internal-destination="N28">2. Chapter</fo:basic-link>
+ <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+ leader-length.maximum="100%" leader-pattern="dots">
+ </fo:leader>
+ <fo:page-number-citation ref-id="N28">
+ </fo:page-number-citation>
+ </fo:block>
+ <fo:block start-indent="10mm" text-align-last="justify">
+ <fo:basic-link internal-destination="N35">2.1 Section</fo:basic-link>
+ <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+ leader-length.maximum="100%" leader-pattern="dots">
+ </fo:leader>
+ <fo:page-number-citation ref-id="N35">
+ </fo:page-number-citation>
+ </fo:block>
+ <fo:block start-indent="10mm" text-align-last="justify">
+ <fo:basic-link internal-destination="N43">2.2 Section</fo:basic-link>
+ <fo:leader leader-length.minimum="12pt" leader-length.optimum="40pt"
+ leader-length.maximum="100%" leader-pattern="dots">
+ </fo:leader>
+ <fo:page-number-citation ref-id="N43">
+ </fo:page-number-citation>
+ </fo:block>
+
+ <fo:block id="N4">1. Chapter
+ </fo:block>
+
+ <fo:block>Text
+ </fo:block>
+
+ <fo:block id="N11">1.1 Section
+ </fo:block>
+
+ <fo:block>Text
+ </fo:block>
+
+ <fo:block id="N19">1.2 Section
+ </fo:block>
+
+ <fo:block>Text
+ </fo:block>
+
+ <fo:block id="N28">2. Chapter
+ </fo:block>
+
+ <fo:block>Text
+ </fo:block>
+
+ <fo:block id="N35">2.1 Section
+ </fo:block>
+
+ <fo:block>Text
+ </fo:block>
+
+ <fo:block id="N43">2.2 Section
+ </fo:block>
+
+ <fo:block>Text
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="11100" xpath="//flow/block[1]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[1]/lineArea/@ipd"/>
+ <eval expected="263812" xpath="//flow/block[1]/lineArea/inlineparent[2]/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[1]/lineArea/inlineparent[2]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[2]/lineArea/@bpd"/>
+ <eval expected="331654" xpath="//flow/block[2]/lineArea/@ipd"/>
+ <eval expected="231669" xpath="//flow/block[2]/lineArea/inlineparent[2]/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[2]/lineArea/inlineparent[2]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[3]/lineArea/@bpd"/>
+ <eval expected="331654" xpath="//flow/block[3]/lineArea/@ipd"/>
+ <eval expected="231669" xpath="//flow/block[3]/lineArea/inlineparent[2]/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[3]/lineArea/inlineparent[2]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[4]/lineArea/@bpd"/>
+ <eval expected="360000" xpath="//flow/block[4]/lineArea/@ipd"/>
+ <eval expected="263812" xpath="//flow/block[4]/lineArea/inlineparent[2]/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[4]/lineArea/inlineparent[2]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[5]/lineArea/@bpd"/>
+ <eval expected="331654" xpath="//flow/block[5]/lineArea/@ipd"/>
+ <eval expected="231669" xpath="//flow/block[5]/lineArea/inlineparent[2]/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[5]/lineArea/inlineparent[2]/@offset"/>
+
+ <eval expected="11100" xpath="//flow/block[6]/lineArea/@bpd"/>
+ <eval expected="331654" xpath="//flow/block[6]/lineArea/@ipd"/>
+ <eval expected="231669" xpath="//flow/block[6]/lineArea/inlineparent[2]/@ipd"/>
+ <eval expected="5280" xpath="//flow/block[6]/lineArea/inlineparent[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/linearea_nonempty_1.xml b/test/layoutengine/standard-testcases/linearea_nonempty_1.xml index f8080ba0b..eaa380553 100644 --- a/test/layoutengine/standard-testcases/linearea_nonempty_1.xml +++ b/test/layoutengine/standard-testcases/linearea_nonempty_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_background-image.xml b/test/layoutengine/standard-testcases/list-block_background-image.xml index e4b81b117..431ab3edd 100644 --- a/test/layoutengine/standard-testcases/list-block_background-image.xml +++ b/test/layoutengine/standard-testcases/list-block_background-image.xml @@ -1,83 +1,84 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on lists (list-block). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img"> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 1</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 1: The whole list should have a centered background. - The whole list should have a centered background. - The whole list should have a centered background. - </fo:block> - </fo:list-item-body> - </fo:list-item> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 2</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 2: The whole list should have a centered background. - The whole list should have a centered background. - The whole list should have a centered background. - </fo:block> - </fo:list-item-body> - </fo:list-item> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 3</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 3: The whole list should have a centered background. - The whole list should have a centered background. - The whole list should have a centered background. - </fo:block> - </fo:list-item-body> - </fo:list-item> - </fo:list-block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="360000" xpath="//flow/block/@ipd"/> - <eval expected="172800" xpath="//flow/block/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=63360" xpath="//flow/block/@background"/> - </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>
+ This test checks background image on lists (list-block).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 1: The whole list should have a centered background.
+ The whole list should have a centered background.
+ The whole list should have a centered background.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 2: The whole list should have a centered background.
+ The whole list should have a centered background.
+ The whole list should have a centered background.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 3</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 3: The whole list should have a centered background.
+ The whole list should have a centered background.
+ The whole list should have a centered background.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="360000" xpath="//flow/block/@ipd"/>
+ <eval expected="172800" xpath="//flow/block/@bpd"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=63360" xpath="//flow/block/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/list-block_basic.xml b/test/layoutengine/standard-testcases/list-block_basic.xml index f6789e4f0..b1cf0c824 100644 --- a/test/layoutengine/standard-testcases/list-block_basic.xml +++ b/test/layoutengine/standard-testcases/list-block_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_border_padding.xml b/test/layoutengine/standard-testcases/list-block_border_padding.xml index c26d2a2bc..ffb9023aa 100644 --- a/test/layoutengine/standard-testcases/list-block_border_padding.xml +++ b/test/layoutengine/standard-testcases/list-block_border_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_keep-together.xml b/test/layoutengine/standard-testcases/list-block_keep-together.xml index 0192d3a19..bd11d2b23 100644 --- a/test/layoutengine/standard-testcases/list-block_keep-together.xml +++ b/test/layoutengine/standard-testcases/list-block_keep-together.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_keep-with-next.xml b/test/layoutengine/standard-testcases/list-block_keep-with-next.xml index 00f3f8294..e4c27ce4f 100644 --- a/test/layoutengine/standard-testcases/list-block_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/list-block_keep-with-next.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml b/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml index db02c67d9..62b0f634c 100644 --- a/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/list-block_keep-with-previous.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_padding_percentages.xml b/test/layoutengine/standard-testcases/list-block_padding_percentages.xml index 2b49e5dc7..2300eb84e 100644 --- a/test/layoutengine/standard-testcases/list-block_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/list-block_padding_percentages.xml @@ -1,75 +1,76 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative padding on lists (list-block). - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" margin="0pt" padding="5%" background-color="yellow"> - <fo:list-item background-color="white"> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 1</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 1: The whole list should have a 5% padding shown in yellow. - </fo:block> - </fo:list-item-body> - </fo:list-item> - <fo:list-item background-color="white"> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 2</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 2: The whole list should have a 5% padding shown in yellow. - </fo:block> - </fo:list-item-body> - </fo:list-item> - <fo:list-item background-color="white"> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 3</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 3: The whole list should have a 5% padding shown in yellow. - </fo:block> - </fo:list-item-body> - </fo:list-item> - </fo:list-block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="18000 18000 18000 18000" xpath="//flow/block/@bap"/> - <eval expected="18000" xpath="//flow/block/@start-indent"/> - <eval expected="18000" xpath="//flow/block/@end-indent"/> - <eval expected="color=#ffff00" xpath="//flow/block/@background"/> - </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>
+ This test checks relative padding on lists (list-block).
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in" margin="0pt" padding="5%" background-color="yellow">
+ <fo:list-item background-color="white">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 1: The whole list should have a 5% padding shown in yellow.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item background-color="white">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 2: The whole list should have a 5% padding shown in yellow.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item background-color="white">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 3</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 3: The whole list should have a 5% padding shown in yellow.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block/@bap"/>
+ <eval expected="18000" xpath="//flow/block/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block/@end-indent"/>
+ <eval expected="color=#ffff00" xpath="//flow/block/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/list-block_simple-page-master_margin.xml b/test/layoutengine/standard-testcases/list-block_simple-page-master_margin.xml index 696b03e2b..505ec3f4e 100644 --- a/test/layoutengine/standard-testcases/list-block_simple-page-master_margin.xml +++ b/test/layoutengine/standard-testcases/list-block_simple-page-master_margin.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_space-before_space-after_1.xml b/test/layoutengine/standard-testcases/list-block_space-before_space-after_1.xml index 2219cdfa1..39a538a2c 100644 --- a/test/layoutengine/standard-testcases/list-block_space-before_space-after_1.xml +++ b/test/layoutengine/standard-testcases/list-block_space-before_space-after_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-block_space-before_space-after_2.xml b/test/layoutengine/standard-testcases/list-block_space-before_space-after_2.xml index 293faebd8..db6ca7e42 100644 --- a/test/layoutengine/standard-testcases/list-block_space-before_space-after_2.xml +++ b/test/layoutengine/standard-testcases/list-block_space-before_space-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_background-image.xml b/test/layoutengine/standard-testcases/list-item_background-image.xml index fe0feac81..c6d7263a0 100644 --- a/test/layoutengine/standard-testcases/list-item_background-image.xml +++ b/test/layoutengine/standard-testcases/list-item_background-image.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/list-item_block_keep-with-next.xml b/test/layoutengine/standard-testcases/list-item_block_keep-with-next.xml index ea6ea83da..b9fbea994 100644 --- a/test/layoutengine/standard-testcases/list-item_block_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/list-item_block_keep-with-next.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml b/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml index 8f0916748..5c0a5da16 100644 --- a/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/list-item_block_keep-with-previous.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_break-before_break-after.xml b/test/layoutengine/standard-testcases/list-item_break-before_break-after.xml index b74f27497..b26784193 100644 --- a/test/layoutengine/standard-testcases/list-item_break-before_break-after.xml +++ b/test/layoutengine/standard-testcases/list-item_break-before_break-after.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_padding.xml b/test/layoutengine/standard-testcases/list-item_padding.xml index fa76cdef1..368ec32d4 100644 --- a/test/layoutengine/standard-testcases/list-item_padding.xml +++ b/test/layoutengine/standard-testcases/list-item_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_padding_percentages.xml b/test/layoutengine/standard-testcases/list-item_padding_percentages.xml index 1c56ac9b9..713bbdf36 100644 --- a/test/layoutengine/standard-testcases/list-item_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/list-item_padding_percentages.xml @@ -1,78 +1,79 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative padding widths on lists (list-item). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in"> - <fo:list-item margin="0pt" padding="5%" background-color="yellow"> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 1</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 1: We should have 5% padding around this whole yellow list item. - </fo:block> - </fo:list-item-body> - </fo:list-item> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 2</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 2: We should have no padding around this whole list item. - </fo:block> - </fo:list-item-body> - </fo:list-item> - <fo:list-item> - <fo:list-item-label end-indent="label-end()"> - <fo:block>label 3</fo:block> - </fo:list-item-label> - <fo:list-item-body start-indent="body-start()"> - <fo:block> - body 3: We should have no padding around this whole list item. - </fo:block> - </fo:list-item-body> - </fo:list-item> - </fo:list-block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="18000 18000 18000 18000" xpath="//flow/block/block/@bap"/> - <eval expected="18000" xpath="//flow/block/block/@start-indent"/> - <eval expected="18000" xpath="//flow/block/block/@end-indent"/> - <eval expected="color=#ffff00" xpath="//flow/block/block/@background"/> - </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>
+ This test checks relative padding widths on lists (list-item).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:list-block provisional-distance-between-starts="1in" provisional-label-separation="0.1in">
+ <fo:list-item margin="0pt" padding="5%" background-color="yellow">
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 1</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 1: We should have 5% padding around this whole yellow list item.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 2</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 2: We should have no padding around this whole list item.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ <fo:list-item>
+ <fo:list-item-label end-indent="label-end()">
+ <fo:block>label 3</fo:block>
+ </fo:list-item-label>
+ <fo:list-item-body start-indent="body-start()">
+ <fo:block>
+ body 3: We should have no padding around this whole list item.
+ </fo:block>
+ </fo:list-item-body>
+ </fo:list-item>
+ </fo:list-block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000 18000 18000 18000" xpath="//flow/block/block/@bap"/>
+ <eval expected="18000" xpath="//flow/block/block/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block/block/@end-indent"/>
+ <eval expected="color=#ffff00" xpath="//flow/block/block/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/list-item_space-before_space-after_1.xml b/test/layoutengine/standard-testcases/list-item_space-before_space-after_1.xml index 6e55cf008..b68eca91e 100644 --- a/test/layoutengine/standard-testcases/list-item_space-before_space-after_1.xml +++ b/test/layoutengine/standard-testcases/list-item_space-before_space-after_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_space-before_space-after_2.xml b/test/layoutengine/standard-testcases/list-item_space-before_space-after_2.xml index 15e501324..8a41d8080 100644 --- a/test/layoutengine/standard-testcases/list-item_space-before_space-after_2.xml +++ b/test/layoutengine/standard-testcases/list-item_space-before_space-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/list-item_space-before_space-after_3.xml b/test/layoutengine/standard-testcases/list-item_space-before_space-after_3.xml index 6b8a81a65..93f272f05 100644 --- a/test/layoutengine/standard-testcases/list-item_space-before_space-after_3.xml +++ b/test/layoutengine/standard-testcases/list-item_space-before_space-after_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/marker_bug.xml b/test/layoutengine/standard-testcases/marker_bug.xml index 4dc5cfd89..a0c0ab5a4 100644 --- a/test/layoutengine/standard-testcases/marker_bug.xml +++ b/test/layoutengine/standard-testcases/marker_bug.xml @@ -1,68 +1,69 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks for a bug with markers where white space is not removed. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body margin-top="1in" margin-bottom="1in"/> - <fo:region-before extent="1in"/> - <fo:region-after extent="1in"/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block background-color="yellow"> - <fo:retrieve-marker retrieve-class-name="m1" /> - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block background-color="yellow"> - <fo:retrieve-marker retrieve-class-name="m2" /> - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="red"> - <fo:marker marker-class-name="m1"> - <fo:block> - First marker with whitespace around - </fo:block> - </fo:marker> - </fo:block> - <fo:block background-color="green"><fo:marker marker-class-name="m2"><fo:block>Second marker with no whitespace around</fo:block></fo:marker></fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="72000" xpath="//regionBefore/@bpd"/> - <eval expected="14400" xpath="//regionBefore/block/@bpd"/> - <eval expected="14400" xpath="//regionBefore/block/block/@bpd"/> - <eval expected="1" xpath="count(//regionBefore/block/*/lineArea)"/> - - <eval expected="72000" xpath="//regionAfter/@bpd"/> - <eval expected="14400" xpath="//regionAfter/block/@bpd"/> - <eval expected="14400" xpath="//regionAfter/block/block/@bpd"/> - <eval expected="1" xpath="count(//regionAfter/block/*/lineArea)"/> - </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>
+ This test checks for a bug with markers where white space is not removed.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body margin-top="1in" margin-bottom="1in"/>
+ <fo:region-before extent="1in"/>
+ <fo:region-after extent="1in"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block background-color="yellow">
+ <fo:retrieve-marker retrieve-class-name="m1" />
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block background-color="yellow">
+ <fo:retrieve-marker retrieve-class-name="m2" />
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="red">
+ <fo:marker marker-class-name="m1">
+ <fo:block>
+ First marker with whitespace around
+ </fo:block>
+ </fo:marker>
+ </fo:block>
+ <fo:block background-color="green"><fo:marker marker-class-name="m2"><fo:block>Second marker with no whitespace around</fo:block></fo:marker></fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="72000" xpath="//regionBefore/@bpd"/>
+ <eval expected="14400" xpath="//regionBefore/block/@bpd"/>
+ <eval expected="14400" xpath="//regionBefore/block/block/@bpd"/>
+ <eval expected="1" xpath="count(//regionBefore/block/*/lineArea)"/>
+
+ <eval expected="72000" xpath="//regionAfter/@bpd"/>
+ <eval expected="14400" xpath="//regionAfter/block/@bpd"/>
+ <eval expected="14400" xpath="//regionAfter/block/block/@bpd"/>
+ <eval expected="1" xpath="count(//regionAfter/block/*/lineArea)"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/marker_font-size.xml b/test/layoutengine/standard-testcases/marker_font-size.xml index 26803dd0d..26a0a172c 100644 --- a/test/layoutengine/standard-testcases/marker_font-size.xml +++ b/test/layoutengine/standard-testcases/marker_font-size.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/marker_white-space-collapse.xml b/test/layoutengine/standard-testcases/marker_white-space-collapse.xml index 41bed86e1..645d34f4e 100644 --- a/test/layoutengine/standard-testcases/marker_white-space-collapse.xml +++ b/test/layoutengine/standard-testcases/marker_white-space-collapse.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/marker_white-space_static-content.xml b/test/layoutengine/standard-testcases/marker_white-space_static-content.xml index 51e7a992d..a90705721 100644 --- a/test/layoutengine/standard-testcases/marker_white-space_static-content.xml +++ b/test/layoutengine/standard-testcases/marker_white-space_static-content.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_1.xml b/test/layoutengine/standard-testcases/markers_1.xml index 757e0859b..ca518bbbf 100644 --- a/test/layoutengine/standard-testcases/markers_1.xml +++ b/test/layoutengine/standard-testcases/markers_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_2.xml b/test/layoutengine/standard-testcases/markers_2.xml index b430e5709..2faa7677f 100644 --- a/test/layoutengine/standard-testcases/markers_2.xml +++ b/test/layoutengine/standard-testcases/markers_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_3.xml b/test/layoutengine/standard-testcases/markers_3.xml index 3c16f1eee..069eda143 100644 --- a/test/layoutengine/standard-testcases/markers_3.xml +++ b/test/layoutengine/standard-testcases/markers_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_4.xml b/test/layoutengine/standard-testcases/markers_4.xml index 6ab5ff5bd..bef1c68d6 100644 --- a/test/layoutengine/standard-testcases/markers_4.xml +++ b/test/layoutengine/standard-testcases/markers_4.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_5a.xml b/test/layoutengine/standard-testcases/markers_5a.xml index 615f1a502..c3e1063ce 100644 --- a/test/layoutengine/standard-testcases/markers_5a.xml +++ b/test/layoutengine/standard-testcases/markers_5a.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_5b.xml b/test/layoutengine/standard-testcases/markers_5b.xml index 13324a5f9..a1cf9abfd 100644 --- a/test/layoutengine/standard-testcases/markers_5b.xml +++ b/test/layoutengine/standard-testcases/markers_5b.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_5c.xml b/test/layoutengine/standard-testcases/markers_5c.xml index e3a11af28..71349eb8b 100644 --- a/test/layoutengine/standard-testcases/markers_5c.xml +++ b/test/layoutengine/standard-testcases/markers_5c.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_5d.xml b/test/layoutengine/standard-testcases/markers_5d.xml index faf46d7df..0e8f21b1f 100644 --- a/test/layoutengine/standard-testcases/markers_5d.xml +++ b/test/layoutengine/standard-testcases/markers_5d.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_6a.xml b/test/layoutengine/standard-testcases/markers_6a.xml index 70d8e8c70..8f7a0509d 100644 --- a/test/layoutengine/standard-testcases/markers_6a.xml +++ b/test/layoutengine/standard-testcases/markers_6a.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_6b.xml b/test/layoutengine/standard-testcases/markers_6b.xml index a303f121e..9471a6291 100644 --- a/test/layoutengine/standard-testcases/markers_6b.xml +++ b/test/layoutengine/standard-testcases/markers_6b.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_7.xml b/test/layoutengine/standard-testcases/markers_7.xml index 429b23d11..3bb7af379 100644 --- a/test/layoutengine/standard-testcases/markers_7.xml +++ b/test/layoutengine/standard-testcases/markers_7.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_8.xml b/test/layoutengine/standard-testcases/markers_8.xml index 82dcb7706..f9de1bf02 100644 --- a/test/layoutengine/standard-testcases/markers_8.xml +++ b/test/layoutengine/standard-testcases/markers_8.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/markers_9.xml b/test/layoutengine/standard-testcases/markers_9.xml index 3ad9a245b..fd66dfb5e 100644 --- a/test/layoutengine/standard-testcases/markers_9.xml +++ b/test/layoutengine/standard-testcases/markers_9.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_1.xml b/test/layoutengine/standard-testcases/page-breaking_1.xml index 2a15045a2..0ed7fec53 100644 --- a/test/layoutengine/standard-testcases/page-breaking_1.xml +++ b/test/layoutengine/standard-testcases/page-breaking_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_2.xml b/test/layoutengine/standard-testcases/page-breaking_2.xml index cc1797f84..145603299 100644 --- a/test/layoutengine/standard-testcases/page-breaking_2.xml +++ b/test/layoutengine/standard-testcases/page-breaking_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_3.xml b/test/layoutengine/standard-testcases/page-breaking_3.xml index 00f6eb990..773cca05a 100644 --- a/test/layoutengine/standard-testcases/page-breaking_3.xml +++ b/test/layoutengine/standard-testcases/page-breaking_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_4.xml b/test/layoutengine/standard-testcases/page-breaking_4.xml index d4a2c207b..120ed7bca 100644 --- a/test/layoutengine/standard-testcases/page-breaking_4.xml +++ b/test/layoutengine/standard-testcases/page-breaking_4.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_4a.xml b/test/layoutengine/standard-testcases/page-breaking_4a.xml index c0e70ecdb..4c28c3dc0 100644 --- a/test/layoutengine/standard-testcases/page-breaking_4a.xml +++ b/test/layoutengine/standard-testcases/page-breaking_4a.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_5.xml b/test/layoutengine/standard-testcases/page-breaking_5.xml index eaad25a03..ffd337c92 100644 --- a/test/layoutengine/standard-testcases/page-breaking_5.xml +++ b/test/layoutengine/standard-testcases/page-breaking_5.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-breaking_6.xml b/test/layoutengine/standard-testcases/page-breaking_6.xml index 8ce6da3cd..59fe119b7 100644 --- a/test/layoutengine/standard-testcases/page-breaking_6.xml +++ b/test/layoutengine/standard-testcases/page-breaking_6.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml b/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml index 86b713ea7..64dedc079 100644 --- a/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml +++ b/test/layoutengine/standard-testcases/page-height_indefinite_simple.xml @@ -1,52 +1,53 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - Simple test for page-height="indefinite". The page-heights should - correspond to the sum of the line-heights of the laid out blocks. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="auto" page-height="indefinite"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block line-height="24pt">page1 - block1</fo:block> - <fo:block line-height="24pt">page1 - block2</fo:block> - <fo:block line-height="24pt">page1 - block3</fo:block> - <fo:block break-before="page" line-height="30pt">page2 - block1</fo:block> - <fo:block line-height="30pt">page2 - block2</fo:block> - <fo:block line-height="30pt">page2 - block3</fo:block> - <fo:block break-before="page" line-height="60pt">page3 - block3</fo:block> - <fo:block line-height="60pt">page3 - block2</fo:block> - <fo:block line-height="60pt">page3 - block3</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="72000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpd"/> - <eval expected="90000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpd"/> - <eval expected="180000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpd"/> - </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>
+ Simple test for page-height="indefinite". The page-heights should
+ correspond to the sum of the line-heights of the laid out blocks.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="auto" page-height="indefinite">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block line-height="24pt">page1 - block1</fo:block>
+ <fo:block line-height="24pt">page1 - block2</fo:block>
+ <fo:block line-height="24pt">page1 - block3</fo:block>
+ <fo:block break-before="page" line-height="30pt">page2 - block1</fo:block>
+ <fo:block line-height="30pt">page2 - block2</fo:block>
+ <fo:block line-height="30pt">page2 - block3</fo:block>
+ <fo:block break-before="page" line-height="60pt">page3 - block3</fo:block>
+ <fo:block line-height="60pt">page3 - block2</fo:block>
+ <fo:block line-height="60pt">page3 - block3</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="72000" xpath="//pageViewport[@nr=1]/page/regionViewport/@bpd"/>
+ <eval expected="90000" xpath="//pageViewport[@nr=2]/page/regionViewport/@bpd"/>
+ <eval expected="180000" xpath="//pageViewport[@nr=3]/page/regionViewport/@bpd"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number-citation-last_basic.xml b/test/layoutengine/standard-testcases/page-number-citation-last_basic.xml index b038aae03..33423bd2a 100644 --- a/test/layoutengine/standard-testcases/page-number-citation-last_basic.xml +++ b/test/layoutengine/standard-testcases/page-number-citation-last_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml b/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml index 39cf3b3c3..38728606c 100644 --- a/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml +++ b/test/layoutengine/standard-testcases/page-number-citation-last_complex.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml b/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml index 51fc27f57..0d06bb706 100644 --- a/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml +++ b/test/layoutengine/standard-testcases/page-number-citation-last_page-sequence.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation_background-color.xml b/test/layoutengine/standard-testcases/page-number-citation_background-color.xml index 2edf06916..2a6853990 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_background-color.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_background-color.xml @@ -1,43 +1,44 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number-citation with background-color property. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body" font-size="10pt" id="ref"> - <fo:block background-color="silver" id="ref"> - To emphasize a page number citation <fo:page-number-citation ref-id="ref" background-color="yellow" /> highlight it. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - </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>
+ This test checks fo:page-number-citation with background-color property.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt" id="ref">
+ <fo:block background-color="silver" id="ref">
+ To emphasize a page number citation <fo:page-number-citation ref-id="ref" background-color="yellow" /> highlight it.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_background-image.xml b/test/layoutengine/standard-testcases/page-number-citation_background-image.xml index 4cbf84105..20246526e 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_background-image.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_background-image.xml @@ -1,49 +1,50 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number-citation with background-image property. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block font-size="24pt" id="ref"> - Page number citation <fo:page-number-citation font-size="96pt" ref-id="ref" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" /> - Page number citation <fo:page-number-citation font-size="48pt" ref-id="ref" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" /> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- currently not working because of late ipd adjustment after the image is positioned --> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/> - </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>
+ This test checks fo:page-number-citation with background-image property.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-size="24pt" id="ref">
+ Page number citation <fo:page-number-citation font-size="96pt" ref-id="ref" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+ Page number citation <fo:page-number-citation font-size="48pt" ref-id="ref" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- currently not working because of late ipd adjustment after the image is positioned -->
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_basic.xml b/test/layoutengine/standard-testcases/page-number-citation_basic.xml index 786603e34..af934ec3a 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_basic.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml b/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml index ed65a507c..a92c4d9c3 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_border_padding.xml @@ -1,98 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number-citation with border and padding properties. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" id="ref"> - Page number citation <fo:page-number-citation ref-id="ref" border="solid 1pt red" background-color="yellow" /> with a 1pt border. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt"> - Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" /> with 5pt border and padding. - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt"> - Page number citation <fo:page-number-citation ref-id="ref" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/> with unsymmetric borders and padding. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt"> - Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/> with border and padding in a smaller font. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/> - <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/> - - <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/> - <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/> - - <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/> - <eval expected="17560" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/> - <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/> - - <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/> - <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/> - <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/> - <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/> - </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>
+ This test checks fo:page-number-citation with border and padding properties.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" id="ref">
+ Page number citation <fo:page-number-citation ref-id="ref" border="solid 1pt red" background-color="yellow" /> with a 1pt border.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+ Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" /> with 5pt border and padding.
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+ Page number citation <fo:page-number-citation ref-id="ref" border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/> with unsymmetric borders and padding.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+ Page number citation <fo:page-number-citation ref-id="ref" border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/> with border and padding in a smaller font.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>
+ <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>
+
+ <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>
+ <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>
+
+ <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
+ <eval expected="17560" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>
+
+ <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>
+ <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+ <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>
+ <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number-citation_complex_1.xml b/test/layoutengine/standard-testcases/page-number-citation_complex_1.xml index a0642281c..bcf1061bf 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_complex_1.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_complex_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml b/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml index 6d4252bc1..17fa20aa8 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_complex_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation_forward-ref.xml b/test/layoutengine/standard-testcases/page-number-citation_forward-ref.xml index 81d70aaac..49fe3e19a 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_forward-ref.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_forward-ref.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml b/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml index b8f5315a1..0c443dbf7 100644 --- a/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml +++ b/test/layoutengine/standard-testcases/page-number-citation_vertical-align.xml @@ -1,59 +1,60 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number-citation with vertical-align property. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt" id="ref"> - Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" background-color="yellow" /> vertical-align not specified - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="baseline" background-color="yellow" /> vertical-align="baseline" - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="top" background-color="yellow" /> vertical-align="top" - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="middle" background-color="yellow" /> vertical-align="middle" - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="bottom" background-color="yellow" /> vertical-align="bottom" - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/> - <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/> - <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/> - <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/> - </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>
+ This test checks fo:page-number-citation with vertical-align property.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt" id="ref">
+ Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" background-color="yellow" /> vertical-align not specified
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="baseline" background-color="yellow" /> vertical-align="baseline"
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="top" background-color="yellow" /> vertical-align="top"
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="middle" background-color="yellow" /> vertical-align="middle"
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page citation <fo:page-number-citation ref-id="ref" font-size="10pt" vertical-align="bottom" background-color="yellow" /> vertical-align="bottom"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+ <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+ <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+ <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number_background-color.xml b/test/layoutengine/standard-testcases/page-number_background-color.xml index c052bb4c4..f7f61b770 100644 --- a/test/layoutengine/standard-testcases/page-number_background-color.xml +++ b/test/layoutengine/standard-testcases/page-number_background-color.xml @@ -1,43 +1,44 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number with background-color property. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver"> - To emphasize a page number <fo:page-number background-color="yellow" /> highlight it. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - </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>
+ This test checks fo:page-number with background-color property.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver">
+ To emphasize a page number <fo:page-number background-color="yellow" /> highlight it.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number_background-image.xml b/test/layoutengine/standard-testcases/page-number_background-image.xml index 08d2e1484..1835fd287 100644 --- a/test/layoutengine/standard-testcases/page-number_background-image.xml +++ b/test/layoutengine/standard-testcases/page-number_background-image.xml @@ -1,48 +1,49 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number with background-image property. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block font-size="24pt"> - Page <fo:page-number font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" /> - Page <fo:page-number font-size="48pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" /> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/> - </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>
+ This test checks fo:page-number with background-image property.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block font-size="24pt">
+ Page <fo:page-number font-size="96pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+ Page <fo:page-number font-size="48pt" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img" />
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=3648,vertical=21360" xpath="//flow/block[1]/lineArea/text[2]/@background"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=-9696,vertical=-840" xpath="//flow/block[1]/lineArea/text[4]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number_basic.xml b/test/layoutengine/standard-testcases/page-number_basic.xml index 46077fa66..cdee92d96 100644 --- a/test/layoutengine/standard-testcases/page-number_basic.xml +++ b/test/layoutengine/standard-testcases/page-number_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number_border_padding.xml b/test/layoutengine/standard-testcases/page-number_border_padding.xml index cffa2eda1..9bbacc8a6 100644 --- a/test/layoutengine/standard-testcases/page-number_border_padding.xml +++ b/test/layoutengine/standard-testcases/page-number_border_padding.xml @@ -1,98 +1,99 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number with border and padding properties. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en"> - <fo:flow flow-name="xsl-region-body" font-size="10pt"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt"> - Page number <fo:page-number border="solid 1pt red" background-color="yellow" /> with a 1pt border. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt"> - Page number <fo:page-number border="solid 5pt red" padding="5pt" background-color="yellow" /> with 5pt border and padding. - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt"> - Page number <fo:page-number border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/> with unsymmetric borders and padding. - </fo:block> - <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt"> - Page number <fo:page-number border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/> with border and padding in a smaller font. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/> - <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/> - - <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/> - <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/> - <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/> - - <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/> - <eval expected="5560" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/> - <eval expected="17560" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/> - <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/> - <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/> - <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/> - <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/> - - <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/> - <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/> - <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/> - <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/> - <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/> - <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/> - </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>
+ This test checks fo:page-number with border and padding properties.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="5pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true" language="en">
+ <fo:flow flow-name="xsl-region-body" font-size="10pt">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+ Page number <fo:page-number border="solid 1pt red" background-color="yellow" /> with a 1pt border.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt">
+ Page number <fo:page-number border="solid 5pt red" padding="5pt" background-color="yellow" /> with 5pt border and padding.
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt">
+ Page number <fo:page-number border-style="solid" border-width="1pt 2pt 3pt 4pt" border-color="red" padding="1pt 2pt 3pt 4pt" background-color="yellow" character="c"/> with unsymmetric borders and padding.
+ </fo:block>
+ <fo:block background-color="silver" margin="10pt 0pt 10pt 0pt" font-size="20pt">
+ Page number <fo:page-number border="solid 5pt red" padding="5pt" background-color="yellow" font-size="8pt" character="b"/> with border and padding in a smaller font.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[1]/lineArea/text[2]/@ipd"/>
+ <eval expected="7560" xpath="//flow/block[1]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[1]/lineArea/text[2]/@border-start"/>
+
+ <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[2]/lineArea/text[2]/@ipd"/>
+ <eval expected="25560" xpath="//flow/block[2]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[2]/lineArea/text[2]/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[2]/lineArea/text[2]/@padding-start"/>
+
+ <eval expected="7180" xpath="//flow/block[3]/lineArea/text[2]/@baseline"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+ <eval expected="5560" xpath="//flow/block[3]/lineArea/text[2]/@ipd"/>
+ <eval expected="17560" xpath="//flow/block[3]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,3000)" xpath="//flow/block[3]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,1000)" xpath="//flow/block[3]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,2000)" xpath="//flow/block[3]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,4000)" xpath="//flow/block[3]/lineArea/text[2]/@border-start"/>
+ <eval expected="3000" xpath="//flow/block[3]/lineArea/text[2]/@padding-after"/>
+ <eval expected="1000" xpath="//flow/block[3]/lineArea/text[2]/@padding-before"/>
+ <eval expected="2000" xpath="//flow/block[3]/lineArea/text[2]/@padding-end"/>
+ <eval expected="4000" xpath="//flow/block[3]/lineArea/text[2]/@padding-start"/>
+
+ <eval expected="5744" xpath="//flow/block[4]/lineArea/text[2]/@baseline"/>
+ <eval expected="8616" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+ <eval expected="4448" xpath="//flow/block[4]/lineArea/text[2]/@ipd"/>
+ <eval expected="24448" xpath="//flow/block[4]/lineArea/text[2]/@ipda"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-after"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-before"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-end"/>
+ <eval expected="(solid,#ff0000,5000)" xpath="//flow/block[4]/lineArea/text[2]/@border-start"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-after"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-before"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-end"/>
+ <eval expected="5000" xpath="//flow/block[4]/lineArea/text[2]/@padding-start"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-number_initial-page-number_1.xml b/test/layoutengine/standard-testcases/page-number_initial-page-number_1.xml index 365ee1944..92bf1aca9 100644 --- a/test/layoutengine/standard-testcases/page-number_initial-page-number_1.xml +++ b/test/layoutengine/standard-testcases/page-number_initial-page-number_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml b/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml index 0d4a7e21f..d743ef769 100644 --- a/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml +++ b/test/layoutengine/standard-testcases/page-number_initial-page-number_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/page-number_vertical-align.xml b/test/layoutengine/standard-testcases/page-number_vertical-align.xml index a4605027a..7a85a821d 100644 --- a/test/layoutengine/standard-testcases/page-number_vertical-align.xml +++ b/test/layoutengine/standard-testcases/page-number_vertical-align.xml @@ -1,59 +1,60 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks fo:page-number with vertical-align property. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page <fo:page-number font-size="10pt" background-color="yellow" /> vertical-align not specified - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page <fo:page-number font-size="10pt" vertical-align="baseline" background-color="yellow" /> vertical-align="baseline" - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page <fo:page-number font-size="10pt" vertical-align="top" background-color="yellow" /> vertical-align="top" - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page <fo:page-number font-size="10pt" vertical-align="middle" background-color="yellow" /> vertical-align="middle" - </fo:block> - <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt"> - Page <fo:page-number font-size="10pt" vertical-align="bottom" background-color="yellow" /> vertical-align="bottom" - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/> - <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/> - <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/> - <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/> - <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/> - </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>
+ This test checks fo:page-number with vertical-align property.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page <fo:page-number font-size="10pt" background-color="yellow" /> vertical-align not specified
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page <fo:page-number font-size="10pt" vertical-align="baseline" background-color="yellow" /> vertical-align="baseline"
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page <fo:page-number font-size="10pt" vertical-align="top" background-color="yellow" /> vertical-align="top"
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page <fo:page-number font-size="10pt" vertical-align="middle" background-color="yellow" /> vertical-align="middle"
+ </fo:block>
+ <fo:block background-color="silver" margin="2pt 0pt 2pt 0pt" font-size="20pt">
+ Page <fo:page-number font-size="10pt" vertical-align="bottom" background-color="yellow" /> vertical-align="bottom"
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7180" xpath="//flow/block[1]/lineArea/text[2]/@offset"/>
+ <eval expected="7180" xpath="//flow/block[2]/lineArea/text[2]/@offset"/>
+ <eval expected="0" xpath="//flow/block[3]/lineArea/text[2]/@offset"/>
+ <eval expected="4565" xpath="//flow/block[4]/lineArea/text[2]/@offset"/>
+ <eval expected="9250" xpath="//flow/block[5]/lineArea/text[2]/@offset"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/page-position_last_1.xml b/test/layoutengine/standard-testcases/page-position_last_1.xml index 793ff851d..dd9f6566e 100644 --- a/test/layoutengine/standard-testcases/page-position_last_1.xml +++ b/test/layoutengine/standard-testcases/page-position_last_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-production_empty_block_only.xml b/test/layoutengine/standard-testcases/page-production_empty_block_only.xml index 56cf16638..6c54a26ef 100644 --- a/test/layoutengine/standard-testcases/page-production_empty_block_only.xml +++ b/test/layoutengine/standard-testcases/page-production_empty_block_only.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-sequence_force-page-count_auto.xml b/test/layoutengine/standard-testcases/page-sequence_force-page-count_auto.xml index 4673fa97c..b5945fae5 100644 --- a/test/layoutengine/standard-testcases/page-sequence_force-page-count_auto.xml +++ b/test/layoutengine/standard-testcases/page-sequence_force-page-count_auto.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/page-sequence_force-page-count_noauto.xml b/test/layoutengine/standard-testcases/page-sequence_force-page-count_noauto.xml index 9476c7d6f..26368717d 100644 --- a/test/layoutengine/standard-testcases/page-sequence_force-page-count_noauto.xml +++ b/test/layoutengine/standard-testcases/page-sequence_force-page-count_noauto.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/ps-extension_1.xml b/test/layoutengine/standard-testcases/ps-extension_1.xml index beadbef00..83459c959 100644 --- a/test/layoutengine/standard-testcases/ps-extension_1.xml +++ b/test/layoutengine/standard-testcases/ps-extension_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_background-image.xml b/test/layoutengine/standard-testcases/region-body_background-image.xml index 0038b3c13..f5c0fae8f 100644 --- a/test/layoutengine/standard-testcases/region-body_background-image.xml +++ b/test/layoutengine/standard-testcases/region-body_background-image.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_1.xml b/test/layoutengine/standard-testcases/region-body_column-count_1.xml index 451d7141c..824675ca4 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_1.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_2.xml b/test/layoutengine/standard-testcases/region-body_column-count_2.xml index 3f76f0ed7..86c319a4f 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_2.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml b/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml index aacb350e4..5cecc6bb4 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_balance_2col.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml b/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml index 5e131b1b1..b6dbf6bd4 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_balance_4col.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml index 7978a7eca..cd02fe183 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_bug36356.xml @@ -1,59 +1,60 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks multi-column documents. Checks a problem described in Bugzilla #36356. - The balancing algorithm does not seem to always find the right breaking points. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="320pt" page-height="4in"> - <fo:region-body column-count="3" column-gap="10pt"/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:block margin="5pt"> - <fo:block>line1</fo:block> - <fo:block>line2</fo:block> - <fo:block>line3</fo:block> - <fo:block>line4</fo:block> - <fo:block>line5</fo:block> - <fo:block>line6</fo:block> - </fo:block> - <fo:block margin="5pt" span="all"> - <fo:block>This line is spanned over all columns.</fo:block> - </fo:block> - <fo:block margin="5pt"> - <fo:block>line1</fo:block> - <fo:block>line2</fo:block> - <fo:block>line3</fo:block> - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- 33800 = 2 * 5000 + 2 * 14400 --> - <eval expected="38800" xpath="//mainReference/span[1]/@bpd"/> - <eval expected="3" xpath="count(//mainReference/span[1]/flow)"/> - </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>
+ This test checks multi-column documents. Checks a problem described in Bugzilla #36356.
+ The balancing algorithm does not seem to always find the right breaking points.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="320pt" page-height="4in">
+ <fo:region-body column-count="3" column-gap="10pt"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block margin="5pt">
+ <fo:block>line1</fo:block>
+ <fo:block>line2</fo:block>
+ <fo:block>line3</fo:block>
+ <fo:block>line4</fo:block>
+ <fo:block>line5</fo:block>
+ <fo:block>line6</fo:block>
+ </fo:block>
+ <fo:block margin="5pt" span="all">
+ <fo:block>This line is spanned over all columns.</fo:block>
+ </fo:block>
+ <fo:block margin="5pt">
+ <fo:block>line1</fo:block>
+ <fo:block>line2</fo:block>
+ <fo:block>line3</fo:block>
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- 33800 = 2 * 5000 + 2 * 14400 -->
+ <eval expected="38800" xpath="//mainReference/span[1]/@bpd"/>
+ <eval expected="3" xpath="count(//mainReference/span[1]/flow)"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml index 9055b63d4..3bde6f331 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_bug37468.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml index 82985e591..01302463d 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_bug37813.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml index add696573..090976d7e 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_bug37828.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_bug38054.xml b/test/layoutengine/standard-testcases/region-body_column-count_bug38054.xml index 46cc23f02..3407ef69b 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_bug38054.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_bug38054.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_footnote.xml b/test/layoutengine/standard-testcases/region-body_column-count_footnote.xml index 57edcd97e..b69d2f14c 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_footnote.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_footnote.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_span_1.xml b/test/layoutengine/standard-testcases/region-body_column-count_span_1.xml index 5ad931f41..d3c2b87f6 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_span_1.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_span_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_span_2.xml b/test/layoutengine/standard-testcases/region-body_column-count_span_2.xml index 06b372125..54579ed9b 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_span_2.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_span_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml b/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml index b523a29b7..3744b2e70 100644 --- a/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml +++ b/test/layoutengine/standard-testcases/region-body_column-count_span_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region-body_display-align.xml b/test/layoutengine/standard-testcases/region-body_display-align.xml index d06e7dcc6..8c1e341ca 100644 --- a/test/layoutengine/standard-testcases/region-body_display-align.xml +++ b/test/layoutengine/standard-testcases/region-body_display-align.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/region_display-align_table.xml b/test/layoutengine/standard-testcases/region_display-align_table.xml index 27119f600..5aea73ec0 100644 --- a/test/layoutengine/standard-testcases/region_display-align_table.xml +++ b/test/layoutengine/standard-testcases/region_display-align_table.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/region_side_space-resolution.xml b/test/layoutengine/standard-testcases/region_side_space-resolution.xml index 912fa6e16..aac9456c0 100644 --- a/test/layoutengine/standard-testcases/region_side_space-resolution.xml +++ b/test/layoutengine/standard-testcases/region_side_space-resolution.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/simple-page-master_margin_1.xml b/test/layoutengine/standard-testcases/simple-page-master_margin_1.xml index 2e3fe49fe..ac3b9f824 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_margin_1.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_margin_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/simple-page-master_margin_2.xml b/test/layoutengine/standard-testcases/simple-page-master_margin_2.xml index 8b621ce84..fedbda118 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_margin_2.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_margin_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml index b1a734133..5a4077bb4 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_margin_region-body_margin_relative.xml @@ -1,106 +1,107 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%"> - <fo:region-body margin="5%" background-color="yellow" /> - <fo:region-before extent="5%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="5%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margins on all regions and the page master. - The page size is 5in x 3in. This gives top and bottom margins of 0.25in and - left and right margins 0.15in. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="288000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="10800 36000 10800 288000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="288000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="288000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="194400 36000 10800 288000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="288000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="172800" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="288000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="21600 36000 172800 288000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="172800" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="288000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%">
+ <fo:region-body margin="5%" background-color="yellow" />
+ <fo:region-before extent="5%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="5%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margins on all regions and the page master.
+ The page size is 5in x 3in. This gives top and bottom margins of 0.25in and
+ left and right margins 0.15in.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="10800 36000 10800 288000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="194400 36000 10800 288000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="172800" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="21600 36000 172800 288000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="172800" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="288000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation.xml index e64e095fa..e89602774 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml index c68c3aa6a..cffbf14e8 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_region-body_margin_relative.xml @@ -1,111 +1,112 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference not rotated. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[1.0 0.0 0.0 1.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference not rotated.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="10800 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="183600 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 10800.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 21600.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml index 3269fd9dd..3c5171d28 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_0_writing-mode_rl_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference not rotated - and a rl writing-mode. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 194400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference not rotated
+ and a rl writing-mode.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 194400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml index 363edc6ed..e7980afdc 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="180"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference rotated by - 180 degrees. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="180">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 180 degrees.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="194400 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="10800 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 205200.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[-1.0 -0.0 0.0 -1.0 194400.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml index f17c83ed1..b18878a1f 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_180_writing-mode_rl_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="180" writing-mode="rl"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference rotated by - 180 degrees and a rl writing-mode. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="10800 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 10800.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="183600 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 10800.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[1.0 0.0 0.0 -1.0 21600.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="180" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 180 degrees and a rl writing-mode.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 306000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 -1.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="10800 36000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 -1.0 10800.0 306000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="183600 36000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 -1.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 18000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 -1.0 10800.0 36000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 -1.0 21600.0 306000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml index e6145ac6c..7646d1d29 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="270"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference rotated by - 270 degrees. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="21600 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 183600.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="21600 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 21600.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 183600.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="270">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 270 degrees.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="21600 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 183600.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="21600 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 183600.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 21600.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="21600 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 183600.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml index b3808fd4f..26880f095 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_270_writing-mode_rl_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="270" writing-mode="rl"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference rotated by - 270 degrees and a rl writing-mode. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[-0.0 -1.0 -1.0 0.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="21600 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="21600 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[-0.0 -1.0 -1.0 0.0 21600.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="270" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 270 degrees and a rl writing-mode.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="183600 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[-0.0 -1.0 -1.0 0.0 205200.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="21600 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="21600 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[-0.0 -1.0 -1.0 0.0 21600.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="21600 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[-0.0 -1.0 -1.0 0.0 183600.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml index 959484c4c..01c0eaecd 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="90"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference rotated by - 90 degrees. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[0.0 -1.0 1.0 0.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="32400 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[0.0 -1.0 1.0 0.0 32400.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="32400 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[0.0 -1.0 1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[0.0 -1.0 1.0 0.0 194400.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[0.0 -1.0 1.0 0.0 32400.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="90">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="5%" margin-right="10%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 90 degrees.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 10800.0 342000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="32400 324000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 32400.0 342000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="32400 18000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 194400.0 342000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[0.0 -1.0 1.0 0.0 32400.0 324000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml index ac7635645..bbf2a022d 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_reference-orientation_90_writing-mode_rl_region-body_margin_relative.xml @@ -1,112 +1,113 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" /> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" /> - <fo:region-end extent="10%" background-color="orange" /> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference rotated by - 90 degrees and a rl writing-mode. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[0.0 1.0 1.0 0.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="32400 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[0.0 1.0 1.0 0.0 32400.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="32400 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[0.0 1.0 1.0 0.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[0.0 1.0 1.0 0.0 194400.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[0.0 1.0 1.0 0.0 32400.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="90" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" />
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" />
+ <fo:region-end extent="10%" background-color="orange" />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference rotated by
+ 90 degrees and a rl writing-mode.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 21600 324000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 10800.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="32400 18000 162000 18000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="18000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 32400.0 18000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="32400 306000 162000 36000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="36000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 32400.0 306000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="194400 18000 10800 324000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="324000" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 194400.0 18000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 36000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[0.0 1.0 1.0 0.0 32400.0 36000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/simple-page-master_regions.xml b/test/layoutengine/standard-testcases/simple-page-master_regions.xml index 9a9fbd849..63813012e 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_regions.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_regions.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml b/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml index b5383093f..4de877c91 100644 --- a/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml +++ b/test/layoutengine/standard-testcases/simple-page-master_writing-mode_rl_region-body_writing-mode-lr.xml @@ -1,113 +1,114 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative margin on region (region-body). - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl"> - <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" writing-mode="lr"/> - <fo:region-before extent="10%" background-color="blue" precedence="true" /> - <fo:region-after extent="5%" background-color="green" precedence="true" /> - <fo:region-start extent="5%" background-color="red" writing-mode="tb"/> - <fo:region-end extent="10%" background-color="orange" writing-mode="tb"/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:static-content flow-name="xsl-region-before"> - <fo:block> - r e g i o n b e f o r e - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-after"> - <fo:block> - r e g i o n a f t e r - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-start"> - <fo:block> - r e g i o n s t a r t top - bottom - </fo:block> - </fo:static-content> - <fo:static-content flow-name="xsl-region-end"> - <fo:block> - r e g i o n e n d top - bottom - </fo:block> - </fo:static-content> - <fo:flow flow-name="xsl-region-body"> - <fo:block> - Demonstrates relative 5% margin on the page master, 10% margin on regions before - and end and 5% margin on regions start and after. Corresponding margins are set - on the region body. The page size is 5in x 3in with the page reference not rotated - and a rl writing-mode on the page master, a normal writing mode on the region-body - and tb writing mode on start and end regions. - </fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- region before --> - <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/> - <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/> - <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/> - <!-- region start --> - <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/> - <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/> - <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/> - <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@ipd"/> - <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/> - <!-- region end --> - <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/> - <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/> - <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/> - <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/> - <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@bpd"/> - <eval expected="[0.0 1.0 -1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/> - <!-- region after --> - <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/> - <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/> - <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/> - <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/> - <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/> - <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/> - <!-- region body --> - <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/> - <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/> - <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/> - <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/> - <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/> - <eval expected="[1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/> - </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>
+ This test checks relative margin on region (region-body).
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="3in" page-height="5in" margin="5%" reference-orientation="0" writing-mode="rl">
+ <fo:region-body margin-top="10%" margin-bottom="5%" margin-left="10%" margin-right="5%" background-color="yellow" writing-mode="lr"/>
+ <fo:region-before extent="10%" background-color="blue" precedence="true" />
+ <fo:region-after extent="5%" background-color="green" precedence="true" />
+ <fo:region-start extent="5%" background-color="red" writing-mode="tb"/>
+ <fo:region-end extent="10%" background-color="orange" writing-mode="tb"/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:static-content flow-name="xsl-region-before">
+ <fo:block>
+ r e g i o n b e f o r e
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-after">
+ <fo:block>
+ r e g i o n a f t e r
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-start">
+ <fo:block>
+ r e g i o n s t a r t top - bottom
+ </fo:block>
+ </fo:static-content>
+ <fo:static-content flow-name="xsl-region-end">
+ <fo:block>
+ r e g i o n e n d top - bottom
+ </fo:block>
+ </fo:static-content>
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>
+ Demonstrates relative 5% margin on the page master, 10% margin on regions before
+ and end and 5% margin on regions start and after. Corresponding margins are set
+ on the region body. The page size is 5in x 3in with the page reference not rotated
+ and a rl writing-mode on the page master, a normal writing mode on the region-body
+ and tb writing mode on start and end regions.
+ </fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- region before -->
+ <eval expected="color=#0000ff" xpath="//page/regionViewport[1]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/@bpd"/>
+ <eval expected="10800 18000 194400 36000" xpath="//page/regionViewport[1]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[1]/regionBefore/@ipd"/>
+ <eval expected="36000" xpath="//page/regionViewport[1]/regionBefore/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 18000.0]" xpath="//page/regionViewport[1]/regionBefore/@ctm"/>
+ <!-- region start -->
+ <eval expected="color=#ff0000" xpath="//page/regionViewport[2]/@background"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/@bpd"/>
+ <eval expected="194400 54000 10800 270000" xpath="//page/regionViewport[2]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[2]/regionStart/@ipd"/>
+ <eval expected="10800" xpath="//page/regionViewport[2]/regionStart/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 205200.0 54000.0]" xpath="//page/regionViewport[2]/regionStart/@ctm"/>
+ <!-- region end -->
+ <eval expected="color=#ffa500" xpath="//page/regionViewport[3]/@background"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/@bpd"/>
+ <eval expected="10800 54000 21600 270000" xpath="//page/regionViewport[3]/@rect"/>
+ <eval expected="270000" xpath="//page/regionViewport[3]/regionEnd/@ipd"/>
+ <eval expected="21600" xpath="//page/regionViewport[3]/regionEnd/@bpd"/>
+ <eval expected="[0.0 1.0 -1.0 0.0 32400.0 54000.0]" xpath="//page/regionViewport[3]/regionEnd/@ctm"/>
+ <!-- region after -->
+ <eval expected="color=#008000" xpath="//page/regionViewport[4]/@background"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/@bpd"/>
+ <eval expected="10800 324000 194400 18000" xpath="//page/regionViewport[4]/@rect"/>
+ <eval expected="194400" xpath="//page/regionViewport[4]/regionAfter/@ipd"/>
+ <eval expected="18000" xpath="//page/regionViewport[4]/regionAfter/@bpd"/>
+ <eval expected="[-1.0 0.0 0.0 1.0 205200.0 324000.0]" xpath="//page/regionViewport[4]/regionAfter/@ctm"/>
+ <!-- region body -->
+ <eval expected="color=#ffff00" xpath="//page/regionViewport[5]/@background"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/@bpd"/>
+ <eval expected="32400 54000 162000 270000" xpath="//page/regionViewport[5]/@rect"/>
+ <eval expected="162000" xpath="//page/regionViewport[5]/regionBody/@ipd"/>
+ <eval expected="270000" xpath="//page/regionViewport[5]/regionBody/@bpd"/>
+ <eval expected="[1.0 0.0 0.0 1.0 32400.0 54000.0]" xpath="//page/regionViewport[5]/regionBody/@ctm"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-body_background-image.xml b/test/layoutengine/standard-testcases/table-body_background-image.xml index d212685cd..ffe122098 100644 --- a/test/layoutengine/standard-testcases/table-body_background-image.xml +++ b/test/layoutengine/standard-testcases/table-body_background-image.xml @@ -1,109 +1,110 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on a fo:table-body. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table> - <fo:table-column column-number="1" /> - <fo:table-column column-number="2" /> - <fo:table-column column-number="3" /> - <fo:table-header> - <fo:table-row> - <fo:table-cell> - <fo:block>Header Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-body background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img"> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 1 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 2 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 3 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 3 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 3 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 4 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 4 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 4 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <fo:block>Table with centered background image on body</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- backgrounds on table-body are not supported at the time this test - was written. Therefore no checks! --> - </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>
+ This test checks background image on a fo:table-body.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table>
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table with centered background image on body</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- backgrounds on table-body are not supported at the time this test
+ was written. Therefore no checks! -->
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-body_basic_1.xml b/test/layoutengine/standard-testcases/table-body_basic_1.xml index 815642d7a..5f7011979 100644 --- a/test/layoutengine/standard-testcases/table-body_basic_1.xml +++ b/test/layoutengine/standard-testcases/table-body_basic_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-body_basic_2.xml b/test/layoutengine/standard-testcases/table-body_basic_2.xml index e066308ee..dbea5e4dd 100644 --- a/test/layoutengine/standard-testcases/table-body_basic_2.xml +++ b/test/layoutengine/standard-testcases/table-body_basic_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-border-separate3.xml b/test/layoutengine/standard-testcases/table-border-separate3.xml index 12d7e85d5..6003d72f4 100644 --- a/test/layoutengine/standard-testcases/table-border-separate3.xml +++ b/test/layoutengine/standard-testcases/table-border-separate3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_background-image.xml b/test/layoutengine/standard-testcases/table-cell_background-image.xml index f64663990..7bb180571 100644 --- a/test/layoutengine/standard-testcases/table-cell_background-image.xml +++ b/test/layoutengine/standard-testcases/table-cell_background-image.xml @@ -1,130 +1,131 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative positioned background images on a fo:table-cell. - </p> - </info> - <variables> - <img>../../resources/images/box1.png</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="15pt"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table border-collapse="separate"> - <fo:table-column /> - <fo:table-column /> - <fo:table-column /> - <fo:table-body> - <fo:table-row> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" - background-image="##img" - background-position-horizontal="right" - background-repeat="no-repeat"> - <fo:block>image in top right corner</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" - background-image="##img" - background-position-horizontal="right" - background-position-vertical="center" - background-repeat="no-repeat"> - <fo:block>image in center right</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" - background-image="##img" - background-position-horizontal="right" - background-position-vertical="bottom" - background-repeat="no-repeat"> - <fo:block>image in bottom right corner</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" - background-image="##img" - background-position-horizontal="center" - background-repeat="no-repeat"> - <fo:block>image in top center</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" - background-image="##img" - background-position-horizontal="center" - background-position-vertical="center" - background-repeat="no-repeat"> - <fo:block>image in center</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" - background-image="##img" - background-position-horizontal="center" - background-position-vertical="bottom" - background-repeat="no-repeat"> - <fo:block>image in bottom center</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green" - background-image="##img" - background-repeat="no-repeat"> - <fo:block>image in top left</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow" - background-image="##img" - background-position-vertical="center" - background-repeat="no-repeat"> - <fo:block>image in center left</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue" - background-image="##img" - background-position-vertical="bottom" - background-repeat="no-repeat"> - <fo:block>image in bottom left</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- first cell in row 1 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/> - <!-- second cell in row 1 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/> - <!-- third cell in row 1 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/> - <!-- first cell in row 2 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/> - <!-- second cell in row 2 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/> - <!-- third cell in row 2 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/> - <!-- first cell in row 3 --> - <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/> - <!-- second cell in row 3 --> - <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/> - <!-- third cell in row 3 --> - <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@background"/> - </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>
+ This test checks relative positioned background images on a fo:table-cell.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/box1.png</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in" margin="15pt">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table border-collapse="separate">
+ <fo:table-column />
+ <fo:table-column />
+ <fo:table-column />
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue"
+ background-image="##img"
+ background-position-horizontal="right"
+ background-repeat="no-repeat">
+ <fo:block>image in top right corner</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green"
+ background-image="##img"
+ background-position-horizontal="right"
+ background-position-vertical="center"
+ background-repeat="no-repeat">
+ <fo:block>image in center right</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow"
+ background-image="##img"
+ background-position-horizontal="right"
+ background-position-vertical="bottom"
+ background-repeat="no-repeat">
+ <fo:block>image in bottom right corner</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow"
+ background-image="##img"
+ background-position-horizontal="center"
+ background-repeat="no-repeat">
+ <fo:block>image in top center</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue"
+ background-image="##img"
+ background-position-horizontal="center"
+ background-position-vertical="center"
+ background-repeat="no-repeat">
+ <fo:block>image in center</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green"
+ background-image="##img"
+ background-position-horizontal="center"
+ background-position-vertical="bottom"
+ background-repeat="no-repeat">
+ <fo:block>image in bottom center</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="green"
+ background-image="##img"
+ background-repeat="no-repeat">
+ <fo:block>image in top left</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="yellow"
+ background-image="##img"
+ background-position-vertical="center"
+ background-repeat="no-repeat">
+ <fo:block>image in center left</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="5pt 10pt 20pt 15pt" height="1in" background-color="blue"
+ background-image="##img"
+ background-position-vertical="bottom"
+ background-repeat="no-repeat">
+ <fo:block>image in bottom left</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- first cell in row 1 -->
+ <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=0" xpath="//flow/block/block[1]/@background"/>
+ <!-- second cell in row 1 -->
+ <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=28495" xpath="//flow/block/block[2]/@background"/>
+ <!-- third cell in row 1 -->
+ <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=69991,vertical=56991" xpath="//flow/block/block[3]/@background"/>
+ <!-- first cell in row 2 -->
+ <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=0" xpath="//flow/block/block[4]/@background"/>
+ <!-- second cell in row 2 -->
+ <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=28495" xpath="//flow/block/block[5]/@background"/>
+ <!-- third cell in row 2 -->
+ <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=34995,vertical=56991" xpath="//flow/block/block[6]/@background"/>
+ <!-- first cell in row 3 -->
+ <eval expected="color=#008000,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=0" xpath="//flow/block/block[7]/@background"/>
+ <!-- second cell in row 3 -->
+ <eval expected="color=#ffff00,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=28495" xpath="//flow/block/block[8]/@background"/>
+ <!-- third cell in row 3 -->
+ <eval expected="color=#0000ff,url=../../resources/images/box1.png,repeat=no-repeat,horiz=0,vertical=56991" xpath="//flow/block/block[9]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-cell_block_break-before.xml b/test/layoutengine/standard-testcases/table-cell_block_break-before.xml index e4df0baec..9508b136d 100644 --- a/test/layoutengine/standard-testcases/table-cell_block_break-before.xml +++ b/test/layoutengine/standard-testcases/table-cell_block_break-before.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml b/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml index 055f1cdd2..45df7e337 100644 --- a/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/table-cell_block_keep-with-next.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml b/test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml index 0ba566d37..00257a10a 100644 --- a/test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/table-cell_block_keep-with-previous.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml b/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml index 18a041c20..84504cbc4 100644 --- a/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml +++ b/test/layoutengine/standard-testcases/table-cell_block_margin_percentage.xml @@ -1,81 +1,82 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks basic tables with percentages in cells. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table table-layout="fixed" width="100%"> - <fo:table-column column-width="2in"/> - <fo:table-column column-width="3in"/> - <fo:table-body> - <fo:table-row> - <fo:table-cell> - <fo:block margin="10%">cell1</fo:block> - </fo:table-cell> - <fo:table-cell background-color="yellow"> - <fo:block margin-left="5%" margin-right="5%">cell2</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- table dimensions --> - <eval expected="360000" xpath="//flow/block[1]/@ipd"/> - <eval expected="43200" xpath="//flow/block[1]/@bpd"/> - - <!-- cell 1 --> - <true xpath="//flow/block[1]/block[1]/@is-reference-area"/> - <eval expected="144000" xpath="//flow/block[1]/block[1]/@ipd"/> - <eval expected="43200" xpath="//flow/block[1]/block[1]/@bpd"/> - <eval expected="115200" xpath="//flow/block[1]/block[1]/block[1]/@ipd"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@bpd"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-before"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-after"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@start-indent"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-start"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@end-indent"/> - <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-end"/> - - <!-- cell 2 --> - <true xpath="//flow/block[1]/block[2]/@is-reference-area"/> - <eval expected="144000" xpath="//flow/block[1]/block[2]/@left-offset"/> - <eval expected="216000" xpath="//flow/block[1]/block[2]/@ipd"/> - <eval expected="43200" xpath="//flow/block[1]/block[2]/@bpd"/> - <eval expected="194400" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/> - <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/> - <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@start-indent"/> - <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-start"/> - <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@end-indent"/> - <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-end"/> - </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>
+ This test checks basic tables with percentages in cells.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format" xmlns:svg="http://www.w3.org/2000/svg">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table table-layout="fixed" width="100%">
+ <fo:table-column column-width="2in"/>
+ <fo:table-column column-width="3in"/>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block margin="10%">cell1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell background-color="yellow">
+ <fo:block margin-left="5%" margin-right="5%">cell2</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- table dimensions -->
+ <eval expected="360000" xpath="//flow/block[1]/@ipd"/>
+ <eval expected="43200" xpath="//flow/block[1]/@bpd"/>
+
+ <!-- cell 1 -->
+ <true xpath="//flow/block[1]/block[1]/@is-reference-area"/>
+ <eval expected="144000" xpath="//flow/block[1]/block[1]/@ipd"/>
+ <eval expected="43200" xpath="//flow/block[1]/block[1]/@bpd"/>
+ <eval expected="115200" xpath="//flow/block[1]/block[1]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@bpd"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-before"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-after"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@start-indent"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-start"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@end-indent"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[1]/block[1]/@space-end"/>
+
+ <!-- cell 2 -->
+ <true xpath="//flow/block[1]/block[2]/@is-reference-area"/>
+ <eval expected="144000" xpath="//flow/block[1]/block[2]/@left-offset"/>
+ <eval expected="216000" xpath="//flow/block[1]/block[2]/@ipd"/>
+ <eval expected="43200" xpath="//flow/block[1]/block[2]/@bpd"/>
+ <eval expected="194400" xpath="//flow/block[1]/block[2]/block[1]/@ipd"/>
+ <eval expected="14400" xpath="//flow/block[1]/block[2]/block[1]/@bpd"/>
+ <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@start-indent"/>
+ <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-start"/>
+ <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@end-indent"/>
+ <eval expected="10800" xpath="//flow/block[1]/block[2]/block[1]/@space-end"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-cell_border_padding_conditionality.xml b/test/layoutengine/standard-testcases/table-cell_border_padding_conditionality.xml index f3a189219..09f9fa6db 100644 --- a/test/layoutengine/standard-testcases/table-cell_border_padding_conditionality.xml +++ b/test/layoutengine/standard-testcases/table-cell_border_padding_conditionality.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_column-number.xml b/test/layoutengine/standard-testcases/table-cell_column-number.xml index 39c4af464..ef5ab5c9e 100644 --- a/test/layoutengine/standard-testcases/table-cell_column-number.xml +++ b/test/layoutengine/standard-testcases/table-cell_column-number.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_display-align.xml b/test/layoutengine/standard-testcases/table-cell_display-align.xml index fc3f3c5f6..083808572 100644 --- a/test/layoutengine/standard-testcases/table-cell_display-align.xml +++ b/test/layoutengine/standard-testcases/table-cell_display-align.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_display-align_page-break.xml b/test/layoutengine/standard-testcases/table-cell_display-align_page-break.xml index e2b922206..123bf1ef8 100644 --- a/test/layoutengine/standard-testcases/table-cell_display-align_page-break.xml +++ b/test/layoutengine/standard-testcases/table-cell_display-align_page-break.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_empty_area_with_marker.xml b/test/layoutengine/standard-testcases/table-cell_empty_area_with_marker.xml index 73392bee8..56c265033 100644 --- a/test/layoutengine/standard-testcases/table-cell_empty_area_with_marker.xml +++ b/test/layoutengine/standard-testcases/table-cell_empty_area_with_marker.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_height.xml b/test/layoutengine/standard-testcases/table-cell_height.xml index b573106f1..8bd23af51 100644 --- a/test/layoutengine/standard-testcases/table-cell_height.xml +++ b/test/layoutengine/standard-testcases/table-cell_height.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_height_page-break.xml b/test/layoutengine/standard-testcases/table-cell_height_page-break.xml index b27d30d7f..6f0f64328 100644 --- a/test/layoutengine/standard-testcases/table-cell_height_page-break.xml +++ b/test/layoutengine/standard-testcases/table-cell_height_page-break.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_number-columns-spanned.xml b/test/layoutengine/standard-testcases/table-cell_number-columns-spanned.xml index f903a2eb4..d57737f0b 100644 --- a/test/layoutengine/standard-testcases/table-cell_number-columns-spanned.xml +++ b/test/layoutengine/standard-testcases/table-cell_number-columns-spanned.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_number-rows-spanned.xml b/test/layoutengine/standard-testcases/table-cell_number-rows-spanned.xml index 6ab88f664..a09ef1f4d 100644 --- a/test/layoutengine/standard-testcases/table-cell_number-rows-spanned.xml +++ b/test/layoutengine/standard-testcases/table-cell_number-rows-spanned.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_number-rows-spanned_bug38397.xml b/test/layoutengine/standard-testcases/table-cell_number-rows-spanned_bug38397.xml index a6bbb5c99..d326d87b3 100644 --- a/test/layoutengine/standard-testcases/table-cell_number-rows-spanned_bug38397.xml +++ b/test/layoutengine/standard-testcases/table-cell_number-rows-spanned_bug38397.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml b/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml index b7178c940..acb795a62 100644 --- a/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/table-cell_padding_percentages.xml @@ -1,64 +1,65 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative padding on a fo:table-cell. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table> - <fo:table-column column-number="1" /> - <fo:table-column column-number="2" /> - <fo:table-column column-number="3" /> - <fo:table-body> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 1 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell margin="0pt" padding="2%" background-color="yellow"> - <fo:block>Row 1 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <fo:block>Table a yellow cell having 2% padding.</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="7200 7200 7200 7200" xpath="//flow/block/block[2]/@bap"/> - <eval expected="color=#ffff00" xpath="//flow/block/block[2]/@background"/> - <eval expected="7200" xpath="//flow/block/block[2]/block/@start-indent"/> - <eval expected="7200" xpath="//flow/block/block[2]/block/@end-indent"/> - <eval expected="7200" xpath="//flow/block/block[2]/block/@space-start"/> - <eval expected="7200" xpath="//flow/block/block[2]/block/@space-end"/> - </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>
+ This test checks relative padding on a fo:table-cell.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table>
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell margin="0pt" padding="2%" background-color="yellow">
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table a yellow cell having 2% padding.</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="7200 7200 7200 7200" xpath="//flow/block/block[2]/@bap"/>
+ <eval expected="color=#ffff00" xpath="//flow/block/block[2]/@background"/>
+ <eval expected="7200" xpath="//flow/block/block[2]/block/@start-indent"/>
+ <eval expected="7200" xpath="//flow/block/block[2]/block/@end-indent"/>
+ <eval expected="7200" xpath="//flow/block/block[2]/block/@space-start"/>
+ <eval expected="7200" xpath="//flow/block/block[2]/block/@space-end"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-cell_page-break_span.xml b/test/layoutengine/standard-testcases/table-cell_page-break_span.xml index 406cd1946..a31c67986 100644 --- a/test/layoutengine/standard-testcases/table-cell_page-break_span.xml +++ b/test/layoutengine/standard-testcases/table-cell_page-break_span.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_space-before_space_after.xml b/test/layoutengine/standard-testcases/table-cell_space-before_space_after.xml index ab941f989..d6d73ac2c 100644 --- a/test/layoutengine/standard-testcases/table-cell_space-before_space_after.xml +++ b/test/layoutengine/standard-testcases/table-cell_space-before_space_after.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_starts-row_ends-row.xml b/test/layoutengine/standard-testcases/table-cell_starts-row_ends-row.xml index fbf509e7e..721a7e32a 100644 --- a/test/layoutengine/standard-testcases/table-cell_starts-row_ends-row.xml +++ b/test/layoutengine/standard-testcases/table-cell_starts-row_ends-row.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-cell_various-combinations.xml b/test/layoutengine/standard-testcases/table-cell_various-combinations.xml index 4936798e0..39aa15986 100644 --- a/test/layoutengine/standard-testcases/table-cell_various-combinations.xml +++ b/test/layoutengine/standard-testcases/table-cell_various-combinations.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-column_column-number.xml b/test/layoutengine/standard-testcases/table-column_column-number.xml index c298efb63..9c159cb3f 100644 --- a/test/layoutengine/standard-testcases/table-column_column-number.xml +++ b/test/layoutengine/standard-testcases/table-column_column-number.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-column_column-width.xml b/test/layoutengine/standard-testcases/table-column_column-width.xml index 615181994..9cef77bec 100644 --- a/test/layoutengine/standard-testcases/table-column_column-width.xml +++ b/test/layoutengine/standard-testcases/table-column_column-width.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-column_column-width_proportional-column-width.xml b/test/layoutengine/standard-testcases/table-column_column-width_proportional-column-width.xml index 47eb64972..d35d7c45f 100644 --- a/test/layoutengine/standard-testcases/table-column_column-width_proportional-column-width.xml +++ b/test/layoutengine/standard-testcases/table-column_column-width_proportional-column-width.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-column_first-row-width.xml b/test/layoutengine/standard-testcases/table-column_first-row-width.xml index 21d8dabbc..3f56b3290 100644 --- a/test/layoutengine/standard-testcases/table-column_first-row-width.xml +++ b/test/layoutengine/standard-testcases/table-column_first-row-width.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-column_gap.xml b/test/layoutengine/standard-testcases/table-column_gap.xml index df4d775bd..3aa539c80 100644 --- a/test/layoutengine/standard-testcases/table-column_gap.xml +++ b/test/layoutengine/standard-testcases/table-column_gap.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-footer_omit-footer-at-break.xml b/test/layoutengine/standard-testcases/table-footer_omit-footer-at-break.xml index bf3fbd740..7b2cc6904 100644 --- a/test/layoutengine/standard-testcases/table-footer_omit-footer-at-break.xml +++ b/test/layoutengine/standard-testcases/table-footer_omit-footer-at-break.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-header_background-image.xml b/test/layoutengine/standard-testcases/table-header_background-image.xml index 1101b3f95..f4867c9da 100644 --- a/test/layoutengine/standard-testcases/table-header_background-image.xml +++ b/test/layoutengine/standard-testcases/table-header_background-image.xml @@ -1,100 +1,101 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on a fo:table-header and footer. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table> - <fo:table-column column-number="1" /> - <fo:table-column column-number="2" /> - <fo:table-column column-number="3" /> - <fo:table-header background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img"> - <fo:table-row> - <fo:table-cell> - <fo:block>Header Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-footer background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img"> - <fo:table-row> - <fo:table-cell> - <fo:block>Footer Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Footer Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Footer Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-footer> - <fo:table-body background-color="blue"> - <fo:table-row height="4in" background-color="blue"> - <fo:table-cell> - <fo:block>Row 1 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row height="4in" background-color="blue"> - <fo:table-cell> - <fo:block>Row 2 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <fo:block>Table with centered background image in header and footer</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <!-- backgrounds on table-header/footer are not supported at the time this test - was written. Therefore no checks! --> - </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>
+ This test checks background image on a fo:table-header and footer.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table>
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-footer background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Footer Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Footer Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Footer Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-footer>
+ <fo:table-body background-color="blue">
+ <fo:table-row height="4in" background-color="blue">
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row height="4in" background-color="blue">
+ <fo:table-cell>
+ <fo:block>Row 2 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table with centered background image in header and footer</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <!-- backgrounds on table-header/footer are not supported at the time this test
+ was written. Therefore no checks! -->
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-header_bug37875.xml b/test/layoutengine/standard-testcases/table-header_bug37875.xml index 83ae5f171..80f47190f 100644 --- a/test/layoutengine/standard-testcases/table-header_bug37875.xml +++ b/test/layoutengine/standard-testcases/table-header_bug37875.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-header_in_bc_bug.xml b/test/layoutengine/standard-testcases/table-header_in_bc_bug.xml index 78890023d..2131e81b8 100644 --- a/test/layoutengine/standard-testcases/table-header_in_bc_bug.xml +++ b/test/layoutengine/standard-testcases/table-header_in_bc_bug.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-header_omit-header-at-break.xml b/test/layoutengine/standard-testcases/table-header_omit-header-at-break.xml index 7f42e710c..6834deeac 100644 --- a/test/layoutengine/standard-testcases/table-header_omit-header-at-break.xml +++ b/test/layoutengine/standard-testcases/table-header_omit-header-at-break.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-header_table-footer_1.xml b/test/layoutengine/standard-testcases/table-header_table-footer_1.xml index 244c7827c..df45e328b 100644 --- a/test/layoutengine/standard-testcases/table-header_table-footer_1.xml +++ b/test/layoutengine/standard-testcases/table-header_table-footer_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-header_table-footer_2.xml b/test/layoutengine/standard-testcases/table-header_table-footer_2.xml index e79420f7e..9cf3db4c0 100644 --- a/test/layoutengine/standard-testcases/table-header_table-footer_2.xml +++ b/test/layoutengine/standard-testcases/table-header_table-footer_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-header_table-footer_3.xml b/test/layoutengine/standard-testcases/table-header_table-footer_3.xml index 28900405d..48c27a53e 100644 --- a/test/layoutengine/standard-testcases/table-header_table-footer_3.xml +++ b/test/layoutengine/standard-testcases/table-header_table-footer_3.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_background-image.xml b/test/layoutengine/standard-testcases/table-row_background-image.xml index 2f05e343a..2145b43e8 100644 --- a/test/layoutengine/standard-testcases/table-row_background-image.xml +++ b/test/layoutengine/standard-testcases/table-row_background-image.xml @@ -1,88 +1,89 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on a fo:table-row. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table> - <fo:table-column column-number="1" /> - <fo:table-column column-number="2" /> - <fo:table-column column-number="3" /> - <fo:table-header> - <fo:table-row> - <fo:table-cell> - <fo:block>Header Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-body> - <fo:table-row height="1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img"> - <fo:table-cell> - <fo:block>Row 1 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 2 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <fo:block>Table with centered background image on row 1</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="360000" xpath="//flow/block/block[4]/@ipd"/> - <eval expected="72000" xpath="//flow/block/block[4]/@bpd"/> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block[4]/@background"/> - </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>
+ This test checks background image on a fo:table-row.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table>
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row height="1in" background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table with centered background image on row 1</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="360000" xpath="//flow/block/block[4]/@ipd"/>
+ <eval expected="72000" xpath="//flow/block/block[4]/@bpd"/>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block/block[4]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table-row_break-before.xml b/test/layoutengine/standard-testcases/table-row_break-before.xml index 693f27775..9918ec5ed 100644 --- a/test/layoutengine/standard-testcases/table-row_break-before.xml +++ b/test/layoutengine/standard-testcases/table-row_break-before.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_break-before_break-after_1.xml b/test/layoutengine/standard-testcases/table-row_break-before_break-after_1.xml index ca3357e44..9f55ae581 100644 --- a/test/layoutengine/standard-testcases/table-row_break-before_break-after_1.xml +++ b/test/layoutengine/standard-testcases/table-row_break-before_break-after_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_break-before_break-after_2.xml b/test/layoutengine/standard-testcases/table-row_break-before_break-after_2.xml index d939c2599..93b495d56 100644 --- a/test/layoutengine/standard-testcases/table-row_break-before_break-after_2.xml +++ b/test/layoutengine/standard-testcases/table-row_break-before_break-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_height.xml b/test/layoutengine/standard-testcases/table-row_height.xml index 693436e41..b158113f6 100644 --- a/test/layoutengine/standard-testcases/table-row_height.xml +++ b/test/layoutengine/standard-testcases/table-row_height.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_keep-together.xml b/test/layoutengine/standard-testcases/table-row_keep-together.xml index 51069ba76..067c4daf6 100644 --- a/test/layoutengine/standard-testcases/table-row_keep-together.xml +++ b/test/layoutengine/standard-testcases/table-row_keep-together.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-next.xml b/test/layoutengine/standard-testcases/table-row_keep-with-next.xml index 26382587d..5ceedb932 100644 --- a/test/layoutengine/standard-testcases/table-row_keep-with-next.xml +++ b/test/layoutengine/standard-testcases/table-row_keep-with-next.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml b/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml index 620780100..466634552 100644 --- a/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml +++ b/test/layoutengine/standard-testcases/table-row_keep-with-previous.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_background-image.xml b/test/layoutengine/standard-testcases/table_background-image.xml index 2a8f1984c..78968dd03 100644 --- a/test/layoutengine/standard-testcases/table_background-image.xml +++ b/test/layoutengine/standard-testcases/table_background-image.xml @@ -1,108 +1,109 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks background image on a fo:table. - </p> - </info> - <variables> - <img>../../resources/images/bgimg300dpi.jpg</img> - </variables> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img"> - <fo:table-column column-number="1" /> - <fo:table-column column-number="2" /> - <fo:table-column column-number="3" /> - <fo:table-header> - <fo:table-row> - <fo:table-cell> - <fo:block>Header Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-body> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 1 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 2 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 2 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 3 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 3 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 3 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 4 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 4 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 4 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <fo:block>Table with centered background image</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/> - </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>
+ This test checks background image on a fo:table.
+ </p>
+ </info>
+ <variables>
+ <img>../../resources/images/bgimg300dpi.jpg</img>
+ </variables>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table background-color="yellow" background-repeat="no-repeat" background-position-horizontal="center" background-position-vertical="center" background-image="##img">
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 2 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 3 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 4 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table with centered background image</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="color=#ffff00,url=../../resources/images/bgimg300dpi.jpg,repeat=no-repeat,horiz=156960,vertical=12960" xpath="//flow/block[1]/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table_basic.xml b/test/layoutengine/standard-testcases/table_basic.xml index 9637febb6..590498eb8 100644 --- a/test/layoutengine/standard-testcases/table_basic.xml +++ b/test/layoutengine/standard-testcases/table_basic.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml b/test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml index 515b51346..052eaa1c9 100644 --- a/test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml +++ b/test/layoutengine/standard-testcases/table_border-collapse_collapse_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml b/test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml index e14a830cc..cd2575822 100644 --- a/test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml +++ b/test/layoutengine/standard-testcases/table_border-collapse_collapse_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border-collapse_separate_1.xml b/test/layoutengine/standard-testcases/table_border-collapse_separate_1.xml index 9d9e97552..d0b11c1b0 100644 --- a/test/layoutengine/standard-testcases/table_border-collapse_separate_1.xml +++ b/test/layoutengine/standard-testcases/table_border-collapse_separate_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_1.xml b/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_1.xml index 9b742802d..a00db4e5b 100644 --- a/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_1.xml +++ b/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml b/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml index 10f090666..74062c456 100644 --- a/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml +++ b/test/layoutengine/standard-testcases/table_border-collapse_separate_border-spacing_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border-width_conditionality.xml b/test/layoutengine/standard-testcases/table_border-width_conditionality.xml index 06904327d..1fc9c8767 100644 --- a/test/layoutengine/standard-testcases/table_border-width_conditionality.xml +++ b/test/layoutengine/standard-testcases/table_border-width_conditionality.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border_padding.xml b/test/layoutengine/standard-testcases/table_border_padding.xml index 4ee5713ea..7099d5dd1 100644 --- a/test/layoutengine/standard-testcases/table_border_padding.xml +++ b/test/layoutengine/standard-testcases/table_border_padding.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_border_padding_2.xml b/test/layoutengine/standard-testcases/table_border_padding_2.xml index 84f7f91e9..0e9a9e21f 100644 --- a/test/layoutengine/standard-testcases/table_border_padding_2.xml +++ b/test/layoutengine/standard-testcases/table_border_padding_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_break-before_break-after.xml b/test/layoutengine/standard-testcases/table_break-before_break-after.xml index af2df2e0b..b85e0ea62 100644 --- a/test/layoutengine/standard-testcases/table_break-before_break-after.xml +++ b/test/layoutengine/standard-testcases/table_break-before_break-after.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_bug36403.xml b/test/layoutengine/standard-testcases/table_bug36403.xml index e67439213..8d8e8950b 100644 --- a/test/layoutengine/standard-testcases/table_bug36403.xml +++ b/test/layoutengine/standard-testcases/table_bug36403.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_bug37270.xml b/test/layoutengine/standard-testcases/table_bug37270.xml index c3d8cf6ae..e2554d40a 100644 --- a/test/layoutengine/standard-testcases/table_bug37270.xml +++ b/test/layoutengine/standard-testcases/table_bug37270.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_in_footnote.xml b/test/layoutengine/standard-testcases/table_in_footnote.xml index 0c187e4fa..8d6e35a6c 100644 --- a/test/layoutengine/standard-testcases/table_in_footnote.xml +++ b/test/layoutengine/standard-testcases/table_in_footnote.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_in_marker_bug39560.xml b/test/layoutengine/standard-testcases/table_in_marker_bug39560.xml index aa5e88770..b3632bcd9 100644 --- a/test/layoutengine/standard-testcases/table_in_marker_bug39560.xml +++ b/test/layoutengine/standard-testcases/table_in_marker_bug39560.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_keep-together.xml b/test/layoutengine/standard-testcases/table_keep-together.xml index 5c0d563ed..dc3a6f0c0 100644 --- a/test/layoutengine/standard-testcases/table_keep-together.xml +++ b/test/layoutengine/standard-testcases/table_keep-together.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_margin_space-before_space-after.xml b/test/layoutengine/standard-testcases/table_margin_space-before_space-after.xml index ddf51a9f2..2d59e8e32 100644 --- a/test/layoutengine/standard-testcases/table_margin_space-before_space-after.xml +++ b/test/layoutengine/standard-testcases/table_margin_space-before_space-after.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_overconstrained_ipd.xml b/test/layoutengine/standard-testcases/table_overconstrained_ipd.xml index e222db591..c48f1fbae 100644 --- a/test/layoutengine/standard-testcases/table_overconstrained_ipd.xml +++ b/test/layoutengine/standard-testcases/table_overconstrained_ipd.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_padding_percentages.xml b/test/layoutengine/standard-testcases/table_padding_percentages.xml index 73345c44a..091ed49da 100644 --- a/test/layoutengine/standard-testcases/table_padding_percentages.xml +++ b/test/layoutengine/standard-testcases/table_padding_percentages.xml @@ -1,74 +1,75 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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> - This test checks relative padding on a fo:table. - </p> - </info> - <fo> - <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> - <fo:layout-master-set> - <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in"> - <fo:region-body/> - </fo:simple-page-master> - </fo:layout-master-set> - <fo:page-sequence master-reference="normal" white-space-collapse="true"> - <fo:flow flow-name="xsl-region-body"> - <fo:table margin="0pt" padding="5%" background-color="yellow" border-collapse="separate"> - <fo:table-column column-number="1" /> - <fo:table-column column-number="2" /> - <fo:table-column column-number="3" /> - <fo:table-header> - <fo:table-row> - <fo:table-cell> - <fo:block>Header Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Header Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-header> - <fo:table-body> - <fo:table-row> - <fo:table-cell> - <fo:block>Row 1 Col 1</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 2</fo:block> - </fo:table-cell> - <fo:table-cell> - <fo:block>Row 1 Col 3</fo:block> - </fo:table-cell> - </fo:table-row> - </fo:table-body> - </fo:table> - <fo:block>Table on yellow background with 5% padding</fo:block> - </fo:flow> - </fo:page-sequence> - </fo:root> - </fo> - <checks> - <eval expected="18000" xpath="//flow/block/@start-indent"/> - <eval expected="18000" xpath="//flow/block/@end-indent"/> - <eval expected="color=#ffff00" xpath="//flow/block/@background"/> - </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>
+ This test checks relative padding on a fo:table.
+ </p>
+ </info>
+ <fo>
+ <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format">
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="normal" page-width="5in" page-height="5in">
+ <fo:region-body/>
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:page-sequence master-reference="normal" white-space-collapse="true">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:table margin="0pt" padding="5%" background-color="yellow" border-collapse="separate">
+ <fo:table-column column-number="1" />
+ <fo:table-column column-number="2" />
+ <fo:table-column column-number="3" />
+ <fo:table-header>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Header Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Header Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-header>
+ <fo:table-body>
+ <fo:table-row>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 1</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 2</fo:block>
+ </fo:table-cell>
+ <fo:table-cell>
+ <fo:block>Row 1 Col 3</fo:block>
+ </fo:table-cell>
+ </fo:table-row>
+ </fo:table-body>
+ </fo:table>
+ <fo:block>Table on yellow background with 5% padding</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+ </fo:root>
+ </fo>
+ <checks>
+ <eval expected="18000" xpath="//flow/block/@start-indent"/>
+ <eval expected="18000" xpath="//flow/block/@end-indent"/>
+ <eval expected="color=#ffff00" xpath="//flow/block/@background"/>
+ </checks>
+</testcase>
diff --git a/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml b/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml index c151d293f..8b0f18359 100644 --- a/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml +++ b/test/layoutengine/standard-testcases/table_space-before_space-after_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_space-before_space-after_2.xml b/test/layoutengine/standard-testcases/table_space-before_space-after_2.xml index 5b889b538..48446287a 100644 --- a/test/layoutengine/standard-testcases/table_space-before_space-after_2.xml +++ b/test/layoutengine/standard-testcases/table_space-before_space-after_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_table-layout_fixed_1.xml b/test/layoutengine/standard-testcases/table_table-layout_fixed_1.xml index 7d1ebbaad..0ff2173fb 100644 --- a/test/layoutengine/standard-testcases/table_table-layout_fixed_1.xml +++ b/test/layoutengine/standard-testcases/table_table-layout_fixed_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml b/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml index 0f9674608..3ca02190e 100644 --- a/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml +++ b/test/layoutengine/standard-testcases/table_table-layout_fixed_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/table_width.xml b/test/layoutengine/standard-testcases/table_width.xml index 8897ab5a1..b5151d31b 100644 --- a/test/layoutengine/standard-testcases/table_width.xml +++ b/test/layoutengine/standard-testcases/table_width.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/layoutengine/standard-testcases/text-decoration_1.xml b/test/layoutengine/standard-testcases/text-decoration_1.xml index bfa9b8c6c..d193672b2 100644 --- a/test/layoutengine/standard-testcases/text-decoration_1.xml +++ b/test/layoutengine/standard-testcases/text-decoration_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/text-decoration_2.xml b/test/layoutengine/standard-testcases/text-decoration_2.xml index c481f6d2f..bc0ab4482 100644 --- a/test/layoutengine/standard-testcases/text-decoration_2.xml +++ b/test/layoutengine/standard-testcases/text-decoration_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/title_empty.xml b/test/layoutengine/standard-testcases/title_empty.xml index 6726bdcc9..2bcb90d31 100644 --- a/test/layoutengine/standard-testcases/title_empty.xml +++ b/test/layoutengine/standard-testcases/title_empty.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/title_linefeed-treatment.xml b/test/layoutengine/standard-testcases/title_linefeed-treatment.xml index 631df4f47..ea2360b3c 100644 --- a/test/layoutengine/standard-testcases/title_linefeed-treatment.xml +++ b/test/layoutengine/standard-testcases/title_linefeed-treatment.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/title_non-empty.xml b/test/layoutengine/standard-testcases/title_non-empty.xml index 381e88665..095b9980c 100644 --- a/test/layoutengine/standard-testcases/title_non-empty.xml +++ b/test/layoutengine/standard-testcases/title_non-empty.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/wrapper_block.xml b/test/layoutengine/standard-testcases/wrapper_block.xml index cec9d6e90..295b7b968 100644 --- a/test/layoutengine/standard-testcases/wrapper_block.xml +++ b/test/layoutengine/standard-testcases/wrapper_block.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/wrapper_inline.xml b/test/layoutengine/standard-testcases/wrapper_inline.xml index 2fdfd9837..ca7be3bbc 100644 --- a/test/layoutengine/standard-testcases/wrapper_inline.xml +++ b/test/layoutengine/standard-testcases/wrapper_inline.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/wrapper_inline_block.xml b/test/layoutengine/standard-testcases/wrapper_inline_block.xml index 689fba616..b94a76e27 100644 --- a/test/layoutengine/standard-testcases/wrapper_inline_block.xml +++ b/test/layoutengine/standard-testcases/wrapper_inline_block.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/wrapper_text-transform_1.xml b/test/layoutengine/standard-testcases/wrapper_text-transform_1.xml index 827113678..886d94c7b 100644 --- a/test/layoutengine/standard-testcases/wrapper_text-transform_1.xml +++ b/test/layoutengine/standard-testcases/wrapper_text-transform_1.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/standard-testcases/wrapper_text-transform_2.xml b/test/layoutengine/standard-testcases/wrapper_text-transform_2.xml index cb82e3f8f..e296ef183 100644 --- a/test/layoutengine/standard-testcases/wrapper_text-transform_2.xml +++ b/test/layoutengine/standard-testcases/wrapper_text-transform_2.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/testcase2checks.xsl b/test/layoutengine/testcase2checks.xsl index 3391ffb08..00fc9d47b 100644 --- a/test/layoutengine/testcase2checks.xsl +++ b/test/layoutengine/testcase2checks.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/layoutengine/testcase2fo.xsl b/test/layoutengine/testcase2fo.xsl index 2cc701077..0b677471d 100644 --- a/test/layoutengine/testcase2fo.xsl +++ b/test/layoutengine/testcase2fo.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/resources/fonts/glb12.ttf.xml b/test/resources/fonts/glb12.ttf.xml index b4dff29c2..162131704 100644 --- a/test/resources/fonts/glb12.ttf.xml +++ b/test/resources/fonts/glb12.ttf.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2006 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/resources/images/img-w-size.svg b/test/resources/images/img-w-size.svg index 503490b79..b8d716002 100644 --- a/test/resources/images/img-w-size.svg +++ b/test/resources/images/img-w-size.svg @@ -1,25 +1,26 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd"> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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$ --> -<!-- This SVG is the same as img.svg but with an intrinsic size. --> -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="16pt" height="16pt"> - <g style="fill:red; stroke:#000000"> - <rect x="0" y="0" width="15" height="15"/> - <rect x="5" y="5" width="15" height="15"/> - </g> -</svg> +<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<!--
+ 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$ -->
+<!-- This SVG is the same as img.svg but with an intrinsic size. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20" width="16pt" height="16pt">
+ <g style="fill:red; stroke:#000000">
+ <rect x="0" y="0" width="15" height="15"/>
+ <rect x="5" y="5" width="15" height="15"/>
+ </g>
+</svg>
diff --git a/test/resources/images/img.svg b/test/resources/images/img.svg index 84fafa12a..714aaeda5 100644 --- a/test/resources/images/img.svg +++ b/test/resources/images/img.svg @@ -1,24 +1,25 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd"> -<!-- - Copyright 2005 The Apache Software Foundation - - Licensed 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$ --> -<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"> - <g style="fill:red; stroke:#000000"> - <rect x="0" y="0" width="15" height="15"/> - <rect x="5" y="5" width="15" height="15"/> - </g> -</svg> +<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1 Tiny//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11-tiny.dtd">
+<!--
+ 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$ -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20">
+ <g style="fill:red; stroke:#000000">
+ <rect x="0" y="0" width="15" height="15"/>
+ <rect x="5" y="5" width="15" height="15"/>
+ </g>
+</svg>
diff --git a/test/xml/uri-resolution1.fo b/test/xml/uri-resolution1.fo index 821f28334..136a04eb9 100644 --- a/test/xml/uri-resolution1.fo +++ b/test/xml/uri-resolution1.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/xml/uri-resolution2.fo b/test/xml/uri-resolution2.fo index 72f718445..5bc21c877 100644 --- a/test/xml/uri-resolution2.fo +++ b/test/xml/uri-resolution2.fo @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?>
<!--
- Copyright 2005 The Apache Software Foundation
-
- Licensed 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
+ 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
diff --git a/test/xsl/copy.xsl b/test/xsl/copy.xsl index e436bac62..d036bf740 100644 --- a/test/xsl/copy.xsl +++ b/test/xsl/copy.xsl @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="UTF-8" ?> <!-- - Copyright 2001-2002,2004 The Apache Software Foundation - - Licensed 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 + 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 diff --git a/test/xsl/doc.xsl b/test/xsl/doc.xsl index edc8f72af..c84cec5a3 100644 --- a/test/xsl/doc.xsl +++ b/test/xsl/doc.xsl @@ -1,10 +1,11 @@ <?xml version="1.0"?> <!-- - Copyright 2001-2002,2004 The Apache Software Foundation - - Licensed 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 + 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 |
