Browse Source
Fixed SVN Props
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@815383 13f79535-47bb-0310-9956-ffa450edef68tags/fop-1_0
Maximilian Berger
14 years ago
50 changed files with 233 additions and 226 deletions
+ 10
- 3
fixsvnprops.sh
View File
| @@ -1,7 +1,14 @@ | |||
| #!/bin/sh | |||
| #!/bin/bash | |||
| find . -name \*.java -exec svn ps svn:keywords "Id" '{}' \; | |||
| find . -name \*.xml -exec svn ps svn:keywords "Revision Id" '{}' \; | |||
| for i in $(find . -name \*.java) | |||
| do | |||
| svn pg svn:keywords $i | grep Id > /dev/null || svn ps svn:keywords "Id" $i | |||
| done | |||
| for i in $(find . -name \*.xml) | |||
| do | |||
| svn pg svn:keywords $i | grep "Revision Id" > /dev/null || svn ps svn:keywords "Revision Id" $i | |||
| done | |||
| find . -name \*.java -exec svn ps svn:eol-style native '{}' \; | |||
| find . -name \*.xml -exec svn ps svn:eol-style native '{}' \; | |||
+ 2
- 2
src/documentation/content/xdocs/quickstartguide.xml
View File
| @@ -15,13 +15,13 @@ | |||
| See the License for the specific language governing permissions and | |||
| limitations under the License. | |||
| --> | |||
| <!-- $Id: gethelp.xml 627324 2008-02-13 09:35:01Z maxberger $ --> | |||
| <!-- $Id$ --> | |||
| <!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V1.3//EN" "http://forrest.apache.org/dtd/document-v13.dtd"> | |||
| <document> | |||
| <header> | |||
| <title>FOP: Quick Start Guide</title> | |||
| <subtitle>Everything you need to start using and appreciating Apache FOP quickly.</subtitle> | |||
| <version>$Revision: 627324 $</version> | |||
| <version>$Revision$</version> | |||
| </header> | |||
| <body> | |||
| <section id="essentials"> | |||
+ 1
- 1
src/documentation/content/xdocs/trunk/events.xml
View File
| @@ -20,7 +20,7 @@ | |||
| <document> | |||
| <header> | |||
| <title>Events/Processing Feedback</title> | |||
| <version>$Revision: 634267 $</version> | |||
| <version>$Revision$</version> | |||
| </header> | |||
| <body> | |||
| <section id="introduction"> | |||
+ 1
- 1
src/java/org/apache/fop/afp/AFPDataObjectInfo.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp; | |||
+ 1
- 1
src/java/org/apache/fop/afp/AFPImageObjectInfo.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp; | |||
+ 1
- 1
src/java/org/apache/fop/afp/AFPResourceInfo.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/AbstractGraphicsCoord.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/AbstractGraphicsDrawingOrderContainer.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsBox.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsChainedSegment.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsCharacterString.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsData.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsFillet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsFullArc.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsLine.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetArcParameters.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetCharacterSet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetCurrentPosition.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetLineType.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetLineWidth.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetPatternSymbol.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.goca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/AbstractEnvironmentGroup.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/AbstractResourceEnvironmentGroupContainer.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/AbstractResourceGroupContainer.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/InterchangeSet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/MapDataResource.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/ObjectContainer.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/PageSegment.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/PreprocessPresentationObject.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/Registry.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/ResourceEnvironmentGroup.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/ResourceObject.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/triplets/AbstractTriplet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca.triplets; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/triplets/FullyQualifiedNameTriplet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca.triplets; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/triplets/MeasurementUnitsTriplet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca.triplets; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/triplets/ObjectAreaSizeTriplet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca.triplets; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/triplets/ObjectClassificationTriplet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca.triplets; | |||
+ 1
- 1
src/java/org/apache/fop/afp/modca/triplets/ResourceObjectTypeTriplet.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.afp.modca.triplets; | |||
+ 23
- 23
src/java/org/apache/fop/events/EventFormatter_de.xml
View File
| @@ -1,23 +1,23 @@ | |||
| <?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$ --> | |||
| <catalogue xml:lang="de"> | |||
| <message key="locator">[ (Siehe Position {loc})| (Siehe {#gatherContextInfo})| (Keine Kontextinformationen verfügbar)]</message> | |||
| <message key="org.apache.fop.fo.FOValidationEventProducer.tooManyNodes">In "{elementName}" darf nur ein einziges "{offendingNode}" vorkommen!{{locator}}</message> | |||
| <message key="org.apache.fop.fo.FOValidationEventProducer.missingProperty">Dem Element "{elementName}" fehlt ein verlangtes Property "{propertyName}"!{{locator}}</message> | |||
| </catalogue> | |||
| <?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$ --> | |||
| <catalogue xml:lang="de"> | |||
| <message key="locator">[ (Siehe Position {loc})| (Siehe {#gatherContextInfo})| (Keine Kontextinformationen verfügbar)]</message> | |||
| <message key="org.apache.fop.fo.FOValidationEventProducer.tooManyNodes">In "{elementName}" darf nur ein einziges "{offendingNode}" vorkommen!{{locator}}</message> | |||
| <message key="org.apache.fop.fo.FOValidationEventProducer.missingProperty">Dem Element "{elementName}" fehlt ein verlangtes Property "{propertyName}"!{{locator}}</message> | |||
| </catalogue> | |||
+ 1
- 1
src/java/org/apache/fop/fo/flow/table/TableBody.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.fo.flow.table; | |||
+ 1
- 1
src/java/org/apache/fop/fo/flow/table/TablePart.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: TableBody.java 655614 2008-05-12 19:37:39Z vhennebert $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.fo.flow.table; | |||
+ 1
- 1
src/java/org/apache/fop/fonts/FontAdder.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.fonts; | |||
+ 1
- 1
src/java/org/apache/fop/fonts/FontDetector.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.fonts; | |||
+ 1
- 1
src/java/org/apache/fop/fonts/FontInfoConfigurator.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.fonts; | |||
+ 1
- 1
src/java/org/apache/fop/render/AbstractConfigurator.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.render; | |||
+ 1
- 1
src/java/org/apache/fop/render/DummyPercentBaseContext.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.render; | |||
+ 1
- 1
src/java/org/apache/fop/render/afp/extensions/AFPExtensionAttachment.java
View File
| @@ -15,7 +15,7 @@ | |||
| * limitations under the License. | |||
| */ | |||
| /* $Id: $ */ | |||
| /* $Id$ */ | |||
| package org.apache.fop.render.afp.extensions; | |||
+ 77
- 77
test/layoutengine/standard-testcases/marker_white-space_npe.xml
View File
| @@ -1,77 +1,77 @@ | |||
| <?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 potential NPE after white-space handling | |||
| for retrieved markers with only inline content. | |||
| </p> | |||
| </info> | |||
| <fo> | |||
| <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
| <fo:layout-master-set> | |||
| <fo:simple-page-master margin-right="6mm" margin-left="7mm" margin-bottom="4mm" margin-top="5mm" page-width="210mm" page-height="297mm" master-name="letterPageFront"> | |||
| <fo:region-body margin-right="59mm" margin-left="8mm" margin-top="53mm" margin-bottom="57mm" region-name="letterPageBody"/> | |||
| <fo:region-after precedence="false" extent="52mm" region-name="letterPageFooter"/> | |||
| <fo:region-end precedence="true" extent="49mm" region-name="letterPageSidebar"/> | |||
| </fo:simple-page-master> | |||
| </fo:layout-master-set> | |||
| <fo:page-sequence initial-page-number="1" page-break-before="right" master-reference="letterPageFront"> | |||
| <fo:flow flow-name="letterPageBody"> | |||
| <fo:block>page 1</fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| <fo:page-sequence master-reference="letterPageFront"> | |||
| <fo:static-content flow-name="letterPageFooter"> | |||
| <fo:block text-align="right" margin-right="1cm" margin-left="8mm"> | |||
| <fo:retrieve-marker retrieve-position="last-ending-within-page" retrieve-boundary="page-sequence" retrieve-class-name="statementFooterMarker"/> | |||
| </fo:block> | |||
| </fo:static-content> | |||
| <fo:flow flow-name="letterPageBody"> | |||
| <fo:block> | |||
| <fo:block font="bold 16pt Arial"> | |||
| <fo:block> | |||
| <fo:marker marker-class-name="statementFooterMarker"> | |||
| <fo:inline font-family="HelveticaNeue-LightCond" font-size="11pt" line-height="13pt" text-align="right">Test Marker</fo:inline> | |||
| </fo:marker> | |||
| </fo:block> | |||
| </fo:block> | |||
| <fo:block break-before="page"> | |||
| <fo:block> | |||
| <fo:marker marker-class-name="statementFooterMarker"/> | |||
| </fo:block> | |||
| </fo:block> | |||
| </fo:block> | |||
| <fo:block id="TH_LastPage"/> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| <fo:page-sequence master-reference="letterPageFront"> | |||
| <fo:static-content flow-name="letterPageSidebar"> | |||
| <fo:block-container height="284mm"> | |||
| <fo:block> </fo:block> | |||
| </fo:block-container> | |||
| </fo:static-content> | |||
| <fo:flow break-before="odd-page" flow-name="letterPageBody"> | |||
| <fo:block>last page</fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| </fo:root> | |||
| </fo> | |||
| <checks /><!-- none except the default; simply check for non-occurrence of NPE --> | |||
| </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 potential NPE after white-space handling | |||
| for retrieved markers with only inline content. | |||
| </p> | |||
| </info> | |||
| <fo> | |||
| <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
| <fo:layout-master-set> | |||
| <fo:simple-page-master margin-right="6mm" margin-left="7mm" margin-bottom="4mm" margin-top="5mm" page-width="210mm" page-height="297mm" master-name="letterPageFront"> | |||
| <fo:region-body margin-right="59mm" margin-left="8mm" margin-top="53mm" margin-bottom="57mm" region-name="letterPageBody"/> | |||
| <fo:region-after precedence="false" extent="52mm" region-name="letterPageFooter"/> | |||
| <fo:region-end precedence="true" extent="49mm" region-name="letterPageSidebar"/> | |||
| </fo:simple-page-master> | |||
| </fo:layout-master-set> | |||
| <fo:page-sequence initial-page-number="1" page-break-before="right" master-reference="letterPageFront"> | |||
| <fo:flow flow-name="letterPageBody"> | |||
| <fo:block>page 1</fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| <fo:page-sequence master-reference="letterPageFront"> | |||
| <fo:static-content flow-name="letterPageFooter"> | |||
| <fo:block text-align="right" margin-right="1cm" margin-left="8mm"> | |||
| <fo:retrieve-marker retrieve-position="last-ending-within-page" retrieve-boundary="page-sequence" retrieve-class-name="statementFooterMarker"/> | |||
| </fo:block> | |||
| </fo:static-content> | |||
| <fo:flow flow-name="letterPageBody"> | |||
| <fo:block> | |||
| <fo:block font="bold 16pt Arial"> | |||
| <fo:block> | |||
| <fo:marker marker-class-name="statementFooterMarker"> | |||
| <fo:inline font-family="HelveticaNeue-LightCond" font-size="11pt" line-height="13pt" text-align="right">Test Marker</fo:inline> | |||
| </fo:marker> | |||
| </fo:block> | |||
| </fo:block> | |||
| <fo:block break-before="page"> | |||
| <fo:block> | |||
| <fo:marker marker-class-name="statementFooterMarker"/> | |||
| </fo:block> | |||
| </fo:block> | |||
| </fo:block> | |||
| <fo:block id="TH_LastPage"/> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| <fo:page-sequence master-reference="letterPageFront"> | |||
| <fo:static-content flow-name="letterPageSidebar"> | |||
| <fo:block-container height="284mm"> | |||
| <fo:block> </fo:block> | |||
| </fo:block-container> | |||
| </fo:static-content> | |||
| <fo:flow break-before="odd-page" flow-name="letterPageBody"> | |||
| <fo:block>last page</fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| </fo:root> | |||
| </fo> | |||
| <checks /><!-- none except the default; simply check for non-occurrence of NPE --> | |||
| </testcase> | |||
+ 76
- 76
test/layoutengine/standard-testcases/page-number-citation-last_break-after_bug45702.xml
View File
| @@ -1,76 +1,76 @@ | |||
| <?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 correct resolution of page-number-citation-last, in | |||
| case a break-after is set on the last child block to the block carrying the id. | |||
| (see also Bugzilla #45702) | |||
| </p> | |||
| </info> | |||
| <fo> | |||
| <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
| <fo:layout-master-set> | |||
| <fo:simple-page-master master-name="A4" page-height="29.7cm" page-width="21cm" margin="2cm"> | |||
| <fo:region-body margin-top="0cm" region-name="xsl-region-body"/> | |||
| </fo:simple-page-master> | |||
| </fo:layout-master-set> | |||
| <fo:page-sequence master-reference="A4" id="toc"> | |||
| <fo:flow flow-name="xsl-region-body"> | |||
| <fo:block> | |||
| PS : from <fo:page-number-citation id="pnc.page-sequence" ref-id="page-sequence"/> to <fo:page-number-citation-last id="pncl.page-sequence" ref-id="page-sequence"/> | |||
| </fo:block> | |||
| <fo:block> | |||
| toc : from <fo:page-number-citation id="pnc.toc" ref-id="toc"/> to <fo:page-number-citation-last id="pncl.toc" ref-id="toc"/> | |||
| </fo:block> | |||
| <fo:block> | |||
| block-1 : from <fo:page-number-citation id="pnc.block-1" ref-id="block-1"/> to <fo:page-number-citation-last id="pncl.block-1" ref-id="block-1"/> | |||
| </fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| <fo:page-sequence master-reference="A4" id="page-sequence"> | |||
| <fo:flow flow-name="xsl-region-body"> | |||
| <fo:block id="block-1"> | |||
| <fo:block padding="1pt">two blocks, with break-after specified on the last one</fo:block> | |||
| <fo:block break-before="page">XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX </fo:block> | |||
| <fo:block break-before="page" break-after="page">XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX </fo:block> | |||
| </fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| </fo:root> | |||
| </fo> | |||
| <checks> | |||
| <eval expected="1" xpath="/areaTree/pageSequence[1]//text[@prod-id='pnc.toc']/word" /> | |||
| <eval expected="1" xpath="/areaTree/pageSequence[1]//text[@prod-id='pncl.toc']/word" /> | |||
| <eval expected="2" xpath="/areaTree/pageSequence[1]//text[@prod-id='pnc.page-sequence']/word" /> | |||
| <eval expected="4" xpath="/areaTree/pageSequence[1]//text[@prod-id='pncl.page-sequence']/word" /> | |||
| <eval expected="2" xpath="/areaTree/pageSequence[1]//text[@prod-id='pnc.block-1']/word" /> | |||
| <eval expected="4" xpath="/areaTree/pageSequence[1]//text[@prod-id='pncl.block-1']/word" /> | |||
| </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 correct resolution of page-number-citation-last, in | |||
| case a break-after is set on the last child block to the block carrying the id. | |||
| (see also Bugzilla #45702) | |||
| </p> | |||
| </info> | |||
| <fo> | |||
| <fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format"> | |||
| <fo:layout-master-set> | |||
| <fo:simple-page-master master-name="A4" page-height="29.7cm" page-width="21cm" margin="2cm"> | |||
| <fo:region-body margin-top="0cm" region-name="xsl-region-body"/> | |||
| </fo:simple-page-master> | |||
| </fo:layout-master-set> | |||
| <fo:page-sequence master-reference="A4" id="toc"> | |||
| <fo:flow flow-name="xsl-region-body"> | |||
| <fo:block> | |||
| PS : from <fo:page-number-citation id="pnc.page-sequence" ref-id="page-sequence"/> to <fo:page-number-citation-last id="pncl.page-sequence" ref-id="page-sequence"/> | |||
| </fo:block> | |||
| <fo:block> | |||
| toc : from <fo:page-number-citation id="pnc.toc" ref-id="toc"/> to <fo:page-number-citation-last id="pncl.toc" ref-id="toc"/> | |||
| </fo:block> | |||
| <fo:block> | |||
| block-1 : from <fo:page-number-citation id="pnc.block-1" ref-id="block-1"/> to <fo:page-number-citation-last id="pncl.block-1" ref-id="block-1"/> | |||
| </fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| <fo:page-sequence master-reference="A4" id="page-sequence"> | |||
| <fo:flow flow-name="xsl-region-body"> | |||
| <fo:block id="block-1"> | |||
| <fo:block padding="1pt">two blocks, with break-after specified on the last one</fo:block> | |||
| <fo:block break-before="page">XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX </fo:block> | |||
| <fo:block break-before="page" break-after="page">XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX | |||
| XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX XXXXXXXXXX </fo:block> | |||
| </fo:block> | |||
| </fo:flow> | |||
| </fo:page-sequence> | |||
| </fo:root> | |||
| </fo> | |||
| <checks> | |||
| <eval expected="1" xpath="/areaTree/pageSequence[1]//text[@prod-id='pnc.toc']/word" /> | |||
| <eval expected="1" xpath="/areaTree/pageSequence[1]//text[@prod-id='pncl.toc']/word" /> | |||
| <eval expected="2" xpath="/areaTree/pageSequence[1]//text[@prod-id='pnc.page-sequence']/word" /> | |||
| <eval expected="4" xpath="/areaTree/pageSequence[1]//text[@prod-id='pncl.page-sequence']/word" /> | |||
| <eval expected="2" xpath="/areaTree/pageSequence[1]//text[@prod-id='pnc.block-1']/word" /> | |||
| <eval expected="4" xpath="/areaTree/pageSequence[1]//text[@prod-id='pncl.block-1']/word" /> | |||
| </checks> | |||
| </testcase> | |||
Loading…