Author: ssteiner
Date: Tue Sep 27 07:11:14 2022
New Revision: 1904294
URL: http://svn.apache.org/viewvc?rev=1904294&view=rev
Log:
FOP-3094: Allow bookmarks before declarations
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
(with props)
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
Modified:
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java?rev=1904294&r1=1904293&r2=1904294&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
(original)
+++
xmlgraphics/fop/trunk/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
Tue Sep 27 07:11:14 2022
@@ -137,7 +137,7 @@ public class Root extends FObj implement
nodesOutOfOrderError(loc, "fo:layout-master-set",
"fo:declarations");
} else if (declarations != null) {
tooManyNodesError(loc, "fo:declarations");
- } else if (bookmarkTree != null) {
+ } else if (bookmarkTree != null &&
getUserAgent().validateStrictly()) {
nodesOutOfOrderError(loc, "fo:declarations",
"fo:bookmark-tree");
} else if (pageSequenceFound) {
nodesOutOfOrderError(loc, "fo:declarations",
"fo:page-sequence");
Added:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/bookmarks_3.xml?rev=1904294&view=auto
==============================================================================
---
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
(added)
+++
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
Tue Sep 27 07:11:14 2022
@@ -0,0 +1,58 @@
+<?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>
+ Test declarations and bookmark-tree
+ </p>
+ </info>
+ <cfg>
+ <strict-validation>false</strict-validation>
+ </cfg>
+ <fo>
+<fo:root xmlns:fo="http://www.w3.org/1999/XSL/Format";
xmlns:fox="http://xmlgraphics.apache.org/fop/extensions";>
+ <fo:layout-master-set>
+ <fo:simple-page-master master-name="simple" page-height="27.9cm"
page-width="21.6cm">
+ <fo:region-body />
+ </fo:simple-page-master>
+ </fo:layout-master-set>
+ <fo:bookmark-tree>
+ <fo:bookmark internal-destination="B1">
+ <fo:bookmark-title>Welcome</fo:bookmark-title>
+ </fo:bookmark>
+ </fo:bookmark-tree>
+ <fo:declarations>
+ <pdf:info xmlns:pdf="http://xmlgraphics.apache.org/fop/extensions/pdf";>
+ <pdf:name key="MyProperty">MyValue</pdf:name>
+ <pdf:name key="MyOtherProperty">MyOtherValue</pdf:name>
+ </pdf:info>
+ </fo:declarations>
+ <fo:page-sequence master-reference="simple">
+ <fo:flow flow-name="xsl-region-body">
+ <fo:block>test1</fo:block>
+ <fo:block id="B1" break-before="page">test2</fo:block>
+ </fo:flow>
+ </fo:page-sequence>
+</fo:root>
+ </fo>
+ <checks>
+ <eval expected="2" xpath="count(//pageViewport)"/>
+ <eval expected="Welcome" xpath="//bookmarkTree/bookmark[1]/@title"/>
+ </checks>
+</testcase>
Propchange:
xmlgraphics/fop/trunk/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscr...@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-h...@xmlgraphics.apache.org
