FOP-3094: Allow bookmarks before declarations

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1904294 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 59 insertions, 1 deletions

diff --git a/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java b/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
index 3b895b372..495cc1ee8 100644
--- a/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
+++ b/fop-core/src/main/java/org/apache/fop/fo/pagination/Root.java
@@ -137,7 +137,7 @@ public class Root extends FObj implements CommonAccessibilityHolder {
                     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");
diff --git a/fop/test/layoutengine/standard-testcases/bookmarks_3.xml b/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
new file mode 100644
index 000000000..a83279cbb
--- /dev/null
+++ b/fop/test/layoutengine/standard-testcases/bookmarks_3.xml
@@ -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>