This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new b3c07148aa pre-commit clean up `.mod` files (#360)
b3c07148aa is described below
commit b3c07148aa3d81915c7b0a38783ae09bf2408212
Author: John Bampton <[email protected]>
AuthorDate: Fri Apr 25 03:48:05 2025 +1000
pre-commit clean up `.mod` files (#360)
Enforce 3 hooks:
- end-of-file-fixer
- mixed-line-ending
- trailing-whitespace
---
.pre-commit-config.yaml | 6 +-
.../qa-wrapper/results/baseline/xml-base/chart.mod | 12 +-
.../results/baseline/xml-base/datastyl.mod | 8 +-
.../results/baseline/xml-base/drawing.mod | 8 +-
.../results/baseline/xml-base/dtypes.mod | 8 +-
.../qa-wrapper/results/baseline/xml-base/form.mod | 9 +-
.../qa-wrapper/results/baseline/xml-base/meta.mod | 8 +-
.../results/baseline/xml-base/nmspace.mod | 8 +-
.../results/baseline/xml-base/office.mod | 10 +-
.../results/baseline/xml-base/script.mod | 8 +-
.../results/baseline/xml-base/settings.mod | 8 +-
.../qa-wrapper/results/baseline/xml-base/style.mod | 8 +-
.../qa-wrapper/results/baseline/xml-base/table.mod | 8 +-
.../qa-wrapper/results/baseline/xml-base/text.mod | 157 ++++++++++-----------
.../source/palmtests/qa/comparator/dtd/chart.mod | 12 +-
.../palmtests/qa/comparator/dtd/datastyl.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/drawing.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/dtypes.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/form.mod | 9 +-
.../source/palmtests/qa/comparator/dtd/meta.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/nmspace.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/office.mod | 10 +-
.../source/palmtests/qa/comparator/dtd/script.mod | 8 +-
.../palmtests/qa/comparator/dtd/settings.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/style.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/table.mod | 8 +-
.../source/palmtests/qa/comparator/dtd/text.mod | 157 ++++++++++-----------
main/xmloff/dtd/chart.mod | 12 +-
main/xmloff/dtd/datastyl.mod | 8 +-
main/xmloff/dtd/defs.mod | 11 +-
main/xmloff/dtd/drawing.mod | 8 +-
main/xmloff/dtd/dtypes.mod | 8 +-
main/xmloff/dtd/form.mod | 8 +-
main/xmloff/dtd/meta.mod | 8 +-
main/xmloff/dtd/nmspace.mod | 8 +-
main/xmloff/dtd/office.mod | 8 +-
main/xmloff/dtd/script.mod | 8 +-
main/xmloff/dtd/settings.mod | 8 +-
main/xmloff/dtd/style.mod | 8 +-
main/xmloff/dtd/table.mod | 8 +-
main/xmloff/dtd/text.mod | 157 ++++++++++-----------
41 files changed, 394 insertions(+), 400 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1455018bc4..8b4dc6b1f0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,12 +33,12 @@ repos:
- id: check-merge-conflict
- id: check-vcs-permalinks
- id: end-of-file-fixer
- files:
(m|M)akefile$|\.(asp|bat|c|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|m|md|mk|mm|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xml|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$
+ files:
(m|M)akefile$|\.(asp|bat|c|cxx|dxp|el|h|hrc|hxx|idl|in|ini|java|m|md|mk|mm|mod|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xml|xsd|xslt?|ya?ml)$|^ext_libraries/.*$|^test/.*$
- id: fix-byte-order-marker
- id: mixed-line-ending
- files:
^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|dxp|el|h|hrc|idl|in|ini|m|md|mk|mm|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$
+ files:
^main/.*\.(c|h)xx$|^main/.*\.java$|\.(asp|c|dxp|el|h|hrc|idl|in|ini|m|md|mk|mm|mod|pas|php|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|xslt?|ya?ml)$|^main/accessibility/.*$|^main/afms/.*$|^main/animations/.*$|^main/apache-commons/.*$|^test/testgui/.*$
- id: trailing-whitespace
- files:
\.(asp|bat|el|hrc|in|ini|m|mm|pas|php|pl|pm|rc|sh|xcs|xdl|xmi|xsd|ya?ml)$
+ files:
\.(asp|bat|el|hrc|in|ini|m|mm|mod|pas|php|pl|pm|rc|sh|xcs|xdl|xmi|xsd|ya?ml)$
- repo: https://github.com/codespell-project/codespell
rev: v2.4.1
hooks:
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod
index 8420ede780..eae6428cb5 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/chart.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -154,8 +154,8 @@
chart:overlap %integer; #IMPLIED
text:line-break %boolean; "true"
chart:display-label %boolean; "true"
- chart:label-arrangement
(side-by-side|stagger-even|stagger-odd) "side-by-side"
- chart:visible %boolean; "true"
+ chart:label-arrangement
(side-by-side|stagger-even|stagger-odd) "side-by-side"
+ chart:visible %boolean; "true"
chart:link-data-style-to-source %boolean; "true" >
<!ELEMENT chart:grid EMPTY>
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod
index 2c6aa5cb8f..998b7d5ff3 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/datastyl.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod
index 0416e337a6..3029e592cb 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/drawing.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod
index 4573b24536..32760d66a8 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/dtypes.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/form.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/form.mod
index eb2b23f60e..9b7b4051e2 100644
--- a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/form.mod
+++ b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/form.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -301,4 +301,3 @@
<!ATTLIST form:property form:property-name CDATA #REQUIRED>
<!ATTLIST form:property form:property-type
(boolean|short|int|long|double|string) #REQUIRED>
<!ELEMENT form:property-value (#PCDATA)>
-
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod
index f41a9fda24..6a24dff7d9 100644
--- a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod
+++ b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/meta.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod
index d7738d7e4f..e41020a505 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/nmspace.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.mod
index 51498a044c..77d98dd27f 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/office.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -182,7 +182,7 @@
<!ELEMENT office:master-styles
(draw:layer-set?,style:handout-master?,style:master-page*) >
<!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?,
- text:user-field-decls?,
text:dde-connection-decls?,
+ text:user-field-decls?,
text:dde-connection-decls?,
text:alphabetical-index-auto-mark-file?" >
<!ENTITY % change-marks "text:change | text:change-start | text:change-end">
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/script.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/script.mod
index 79f6ddbf6f..fca25a89b0 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/script.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/script.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod
index f048c48969..94d7cd5052 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/settings.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/style.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/style.mod
index 87136e5bc5..ccaf9eae21 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/style.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/style.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/table.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/table.mod
index c3cda9ec47..cb6b3c8677 100644
---
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/table.mod
+++
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/table.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git
a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/text.mod
b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/text.mod
index 77e10b86b9..1b9d56ea98 100644
--- a/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/text.mod
+++ b/main/xmerge/source/palmtests/qa-wrapper/results/baseline/xml-base/text.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -27,12 +27,12 @@
text:page-continuation |
text:sender-firstname |
text:sender-lastname |
- text:sender-initials |
+ text:sender-initials |
text:sender-title |
text:sender-position |
- text:sender-email |
+ text:sender-email |
text:sender-phone-private |
- text:sender-fax |
+ text:sender-fax |
text:sender-company |
text:sender-phone-work |
text:sender-street |
@@ -43,13 +43,13 @@
text:author-name |
text:author-initials |
text:placeholder |
- text:variable-set |
- text:variable-get |
- text:variable-input |
- text:user-field-get |
- text:user-field-input |
- text:sequence |
- text:expression |
+ text:variable-set |
+ text:variable-get |
+ text:variable-input |
+ text:user-field-get |
+ text:user-field-input |
+ text:sequence |
+ text:expression |
text:text-input |
text:database-display |
text:database-next |
@@ -106,7 +106,7 @@
text:bookmark|text:bookmark-start|text:bookmark-end|
text:reference-mark|text:reference-mark-start|
text:reference-mark-end|%fields;|%shape;|
- text:toc-mark-start |
text:toc-mark-end |
+ text:toc-mark-start |
text:toc-mark-end |
text:toc-mark |
text:user-index-mark-start |
text:user-index-mark-end |
text:user-index-mark |
text:alphabetical-index-mark-start |
@@ -228,8 +228,8 @@
<!ATTLIST text:outline-level-style text:start-value %positiveInteger;
"1">
-<!ENTITY % field-declarations "text:variable-decls?,
-
text:user-field-decls?,
+<!ENTITY % field-declarations "text:variable-decls?,
+
text:user-field-decls?,
text:sequence-decls?">
<!ENTITY % variableName "CDATA">
@@ -246,7 +246,7 @@
text:string-value
%string; #IMPLIED
text:currency CDATA
#IMPLIED" >
-<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
+<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
style:num-letter-sync %boolean;
"false"'>
@@ -390,7 +390,7 @@
<!ELEMENT text:text-input (#PCDATA)>
<!ATTLIST text:text-input text:description %string; #IMPLIED>
-<!ENTITY % database-table "text:database-name CDATA #REQUIRED
+<!ENTITY % database-table "text:database-name CDATA #REQUIRED
text:table-name CDATA
#REQUIRED">
<!ELEMENT text:database-display (#PCDATA)>
@@ -495,12 +495,12 @@
<!ELEMENT text:chapter (#PCDATA)>
<!ATTLIST text:chapter text:display (name|number|number-and-name|
-
plain-number-and-name|plain-number)
+
plain-number-and-name|plain-number)
"number-and-name">
<!ATTLIST text:chapter text:outline-level %integer; "1">
<!ELEMENT text:file-name (#PCDATA)>
-<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
+<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
"full">
<!ATTLIST text:file-name text:fixed %boolean; "false">
@@ -582,10 +582,10 @@
<!ATTLIST text:object-count style:num-letter-sync %boolean; "false">
<!ELEMENT text:bibliography-mark (#PCDATA)>
-<!ATTLIST text:bibliography-mark text:bibiliographic-type
- ( article | book | booklet | conference | custom1 | custom2 | custom3 |
- custom4 | custom5 | email | inbook | incollection | inproceedings |
- journal | manual | mastersthesis | misc | phdthesis | proceedings |
+<!ATTLIST text:bibliography-mark text:bibiliographic-type
+ ( article | book | booklet | conference | custom1 | custom2 | custom3 |
+ custom4 | custom5 | email | inbook | incollection | inproceedings |
+ journal | manual | mastersthesis | misc | phdthesis | proceedings |
techreport | unpublished | www ) #REQUIRED >
<!ATTLIST text:bibliography-mark text:identifier CDATA #IMPLIED>
<!ATTLIST text:bibliography-mark text:address CDATA #IMPLIED>
@@ -650,7 +650,7 @@
<!ATTLIST text:footnotes-configuration text:footnotes-position (document|page)
"page">
<!ATTLIST text:footnotes-configuration text:start-numbering-at
(document|chapter|page) "document">
-<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
+<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
<!ELEMENT text:footnote-continuation-notice-backward (#PCDATA)>
<!ELEMENT text:endnotes-configuration EMPTY>
@@ -664,7 +664,7 @@
<!ATTLIST text:endnotes-configuration text:default-style-name %styleName;
#IMPLIED>
<!ATTLIST text:endnotes-configuration text:master-page-name %styleName;
#IMPLIED>
-<!-- Validity constraint: text:footnote and text:endnote elements may not
+<!-- Validity constraint: text:footnote and text:endnote elements may not
contain other text:footnote or text:endnote elements, even though the
DTD
allows this (via the %text; in the foot-/endnote-body).
Unfortunately, this constraint cannot be easily specified in the DTD.
@@ -712,21 +712,21 @@
<!ATTLIST text:section-source text:section-name %string; #IMPLIED>
<!ATTLIST text:section-source text:filter-name %string; #IMPLIED>
-<!ELEMENT text:table-of-content (text:table-of-content-source,
+<!ELEMENT text:table-of-content (text:table-of-content-source,
text:index-body) >
<!ATTLIST text:table-of-content text:style-name %styleName; #IMPLIED>
<!ATTLIST text:table-of-content text:protected %boolean; "false">
-<!ELEMENT text:table-of-content-source (text:index-title-template? ,
+<!ELEMENT text:table-of-content-source (text:index-title-template? ,
text:table-of-content-entry-template*,
text:index-source-styles* ) >
<!ATTLIST text:table-of-content-source text:outline-level %integer; #IMPLIED>
<!ATTLIST text:table-of-content-source text:use-index-marks %boolean; "true">
-<!ATTLIST text:table-of-content-source text:use-index-source-styles
+<!ATTLIST text:table-of-content-source text:use-index-source-styles
%boolean; "false">
-<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
+<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
"document">
-<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
+<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:table-of-content-source fo:language %string; #IMPLIED>
<!ATTLIST text:table-of-content-source fo:country %string; #IMPLIED>
@@ -739,53 +739,53 @@
text:index-entry-tab-stop |
text:index-entry-link-start |
text:index-entry-link-end)* >
-<!ATTLIST text:table-of-content-entry-template text:outline-level
+<!ATTLIST text:table-of-content-entry-template text:outline-level
%integer; #REQUIRED>
-<!ATTLIST text:table-of-content-entry-template text:style-name
+<!ATTLIST text:table-of-content-entry-template text:style-name
%styleName; #REQUIRED>
-<!ELEMENT text:illustration-index
+<!ELEMENT text:illustration-index
(text:illustration-index-source, text:index-body)>
<!ATTLIST text:illustration-index text:style-name %styleName; #IMPLIED>
<!ATTLIST text:illustration-index text:protected %boolean; "false">
<!ELEMENT text:illustration-index-source (text:index-title-template?,
text:illustration-index-entry-template?) >
-<!ATTLIST text:illustration-index-source text:index-scope
+<!ATTLIST text:illustration-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
+<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:illustration-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:illustration-index-source text:caption-sequence-name
+<!ATTLIST text:illustration-index-source text:caption-sequence-name
%string; #IMPLIED>
-<!ATTLIST text:illustration-index-source text:caption-sequence-format
+<!ATTLIST text:illustration-index-source text:caption-sequence-format
(text|category-and-value|caption) "text">
<!ATTLIST text:illustration-index-source fo:language %string; #IMPLIED>
<!ATTLIST text:illustration-index-source fo:country %string; #IMPLIED>
<!ATTLIST text:illustration-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:illustration-index-entry-template
+<!ELEMENT text:illustration-index-entry-template
(
text:index-entry-page-number |
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:illustration-index-entry-template text:style-name
+<!ATTLIST text:illustration-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:table-index (text:table-index-source, text:index-body)>
<!ATTLIST text:table-index text:style-name %styleName; #IMPLIED>
<!ATTLIST text:table-index text:protected %boolean; "false">
-<!ELEMENT text:table-index-source (text:index-title-template?,
+<!ELEMENT text:table-index-source (text:index-title-template?,
text:table-index-entry-template?) >
-<!ATTLIST text:table-index-source text:index-scope
+<!ATTLIST text:table-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:table-index-source text:relative-tab-stop-position
+<!ATTLIST text:table-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:table-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:table-index-source text:caption-sequence-name
+<!ATTLIST text:table-index-source text:caption-sequence-name
%string; #IMPLIED>
-<!ATTLIST text:table-index-source text:caption-sequence-format
+<!ATTLIST text:table-index-source text:caption-sequence-format
(text|category-and-value|caption) "text">
<!ATTLIST text:table-index-source fo:language %string; #IMPLIED>
<!ATTLIST text:table-index-source fo:country %string; #IMPLIED>
@@ -795,7 +795,7 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:table-index-entry-template text:style-name
+<!ATTLIST text:table-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:object-index ( text:object-index-source, text:index-body ) >
@@ -804,11 +804,11 @@
<!ELEMENT text:object-index-source ( text:index-title-template?,
text:object-index-entry-template? ) >
-<!ATTLIST text:object-index-source text:index-scope
+<!ATTLIST text:object-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:object-index-source text:relative-tab-stop-position
+<!ATTLIST text:object-index-source text:relative-tab-stop-position
%boolean; "true">
-<!ATTLIST text:object-index-source text:use-spreadsheet-objects
+<!ATTLIST text:object-index-source text:use-spreadsheet-objects
%boolean; "false">
<!ATTLIST text:object-index-source text:use-draw-objects %boolean; "false">
<!ATTLIST text:object-index-source text:use-chart-objects %boolean; "false">
@@ -822,7 +822,7 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:object-index-entry-template text:style-name
+<!ATTLIST text:object-index-entry-template text:style-name
%styleName; #REQUIRED >
<!ELEMENT text:user-index (text:user-index-source, text:index-body) >
@@ -832,7 +832,7 @@
<!ELEMENT text:user-index-source ( text:index-title-template?,
text:user-index-entry-template*,
text:index-source-styles* ) >
-<!ATTLIST text:user-index-source text:index-scope
+<!ATTLIST text:user-index-source text:index-scope
(document|chapter) "document">
<!ATTLIST text:user-index-source text:relative-tab-stop-position
%boolean; "true">
@@ -841,7 +841,7 @@
<!ATTLIST text:user-index-source text:use-tables %boolean; "false">
<!ATTLIST text:user-index-source text:use-floating-frames %boolean; "false">
<!ATTLIST text:user-index-source text:use-objects %boolean; "false">
-<!ATTLIST text:user-index-source text:use-index-source-styles
+<!ATTLIST text:user-index-source text:use-index-source-styles
%boolean; "false">
<!ATTLIST text:user-index-source text:copy-outline-level %boolean; "false">
<!ATTLIST text:user-index-source fo:language %string; #IMPLIED>
@@ -856,21 +856,21 @@
<!ATTLIST text:user-index-entry-template text:outline-level %integer;
#REQUIRED>
<!ATTLIST text:user-index-entry-template text:style-name %styleName; #REQUIRED>
-<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
+<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
text:index-body)>
<!ATTLIST text:alphabetical-index text:style-name %styleName; #IMPLIED>
<!ATTLIST text:alphabetical-index text:protected %boolean; "false">
-<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
+<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
text:alphabetical-index-entry-template* ) >
-<!ATTLIST text:alphabetical-index-source text:index-scope
+<!ATTLIST text:alphabetical-index-source text:index-scope
(document|chapter) "document">
<!ATTLIST text:alphabetical-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:alphabetical-index-source text:ignore-case %boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
+<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
%styleName; #IMPLIED>
-<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
+<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:combine-entries
%boolean; "true">
@@ -878,7 +878,7 @@
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:combine-entries-with-pp
%boolean; "true">
-<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
+<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:capitalize-entries
%boolean; "false">
@@ -893,9 +893,9 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:alphabetical-index-entry-template text:outline-level
+<!ATTLIST text:alphabetical-index-entry-template text:outline-level
(1|2|3|separator) #REQUIRED>
-<!ATTLIST text:alphabetical-index-entry-template text:style-name
+<!ATTLIST text:alphabetical-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:alphabetical-index-auto-mark-file EMPTY>
@@ -912,20 +912,20 @@
<!ELEMENT text:bibliography-entry-template ( text:index-entry-span |
text:index-entry-tab-stop |
text:index-entry-bibliography )* >
-<!ATTLIST text:bibliography-entry-template text:bibliography-type
- ( article | book | booklet | conference |
custom1 | custom2 |
+<!ATTLIST text:bibliography-entry-template text:bibliography-type
+ ( article | book | booklet | conference |
custom1 | custom2 |
custom3 | custom4 | custom5 | email | inbook
| incollection |
- inproceedings | journal | manual |
mastersthesis | misc |
- phdthesis | proceedings | techreport |
unpublished | www )
+ inproceedings | journal | manual |
mastersthesis | misc |
+ phdthesis | proceedings | techreport |
unpublished | www )
#REQUIRED >
-<!ATTLIST text:bibliography-entry-template text:style-name
+<!ATTLIST text:bibliography-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:index-body %sectionText; >
-<!--
+<!--
Validity constraint: text:index-title elements may appear only in
-indices, and there may be only one text:index-title element.
+indices, and there may be only one text:index-title element.
-->
<!ELEMENT text:index-title %sectionText; >
<!ATTLIST text:index-title text:style-name %styleName; #IMPLIED>
@@ -939,7 +939,7 @@ indices, and there may be only one text:index-title element.
<!ELEMENT text:index-entry-chapter EMPTY>
<!ATTLIST text:index-entry-chapter text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
+<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
"number-and-name" >
<!ELEMENT text:index-entry-text EMPTY>
@@ -955,11 +955,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:index-entry-bibliography text:style-name %styleName; #IMPLIED>
<!ATTLIST text:index-entry-bibliography text:bibliography-data-field
( address | annote |
author | bibiliographic_type |
- booktitle | chapter |
custom1 | custom2 |
+ booktitle | chapter |
custom1 | custom2 |
custom3 | custom4 |
custom5 | edition | editor |
howpublished |
identifier | institution | isbn |
journal | month |
note | number | organizations |
- pages | publisher |
report_type | school |
+ pages | publisher |
report_type | school |
series | title | url
| volume | year ) #REQUIRED>
@@ -1030,11 +1030,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:bibliography-configuration text:sort-algorithm %string;
#IMPLIED>
<!ELEMENT text:sort-key EMPTY>
-<!ATTLIST text:sort-key text:key ( address | annote | author |
- bibiliographic_type | booktitle | chapter | custom1 | custom2 |
- custom3 | custom4 | custom5 | edition | editor | howpublished |
- identifier | institution | isbn | journal | month | note | number |
- organizations | pages | publisher | report_type | school | series |
+<!ATTLIST text:sort-key text:key ( address | annote | author |
+ bibiliographic_type | booktitle | chapter | custom1 | custom2 |
+ custom3 | custom4 | custom5 | edition | editor | howpublished |
+ identifier | institution | isbn | journal | month | note | number |
+ organizations | pages | publisher | report_type | school | series |
title | url | volume | year ) #REQUIRED>
<!ATTLIST text:sort-key text:sort-ascending %boolean; "true">
@@ -1084,12 +1084,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:tracked-changes text:track-changes %boolean; "true">
<!ATTLIST text:tracked-changes text:protection-key CDATA #IMPLIED>
-<!ELEMENT text:changed-region (text:insertion |
- (text:deletion,
text:insertion?) |
+<!ELEMENT text:changed-region (text:insertion |
+ (text:deletion,
text:insertion?) |
text:format-change) >
<!ATTLIST text:changed-region text:id ID #REQUIRED>
<!ELEMENT text:insertion (office:change-info, %sectionText;)>
<!ELEMENT text:deletion (office:change-info, %sectionText;)>
<!ELEMENT text:format-change (office:change-info)>
-
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/chart.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/chart.mod
index 8420ede780..eae6428cb5 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/chart.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/chart.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -154,8 +154,8 @@
chart:overlap %integer; #IMPLIED
text:line-break %boolean; "true"
chart:display-label %boolean; "true"
- chart:label-arrangement
(side-by-side|stagger-even|stagger-odd) "side-by-side"
- chart:visible %boolean; "true"
+ chart:label-arrangement
(side-by-side|stagger-even|stagger-odd) "side-by-side"
+ chart:visible %boolean; "true"
chart:link-data-style-to-source %boolean; "true" >
<!ELEMENT chart:grid EMPTY>
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/datastyl.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/datastyl.mod
index 2c6aa5cb8f..998b7d5ff3 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/datastyl.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/datastyl.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/drawing.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/drawing.mod
index 0416e337a6..3029e592cb 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/drawing.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/drawing.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/dtypes.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/dtypes.mod
index 4573b24536..32760d66a8 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/dtypes.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/dtypes.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/form.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/form.mod
index eb2b23f60e..9b7b4051e2 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/form.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/form.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -301,4 +301,3 @@
<!ATTLIST form:property form:property-name CDATA #REQUIRED>
<!ATTLIST form:property form:property-type
(boolean|short|int|long|double|string) #REQUIRED>
<!ELEMENT form:property-value (#PCDATA)>
-
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/meta.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/meta.mod
index f41a9fda24..6a24dff7d9 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/meta.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/meta.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/nmspace.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/nmspace.mod
index d7738d7e4f..e41020a505 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/nmspace.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/nmspace.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/office.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/office.mod
index 51498a044c..77d98dd27f 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/office.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/office.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -182,7 +182,7 @@
<!ELEMENT office:master-styles
(draw:layer-set?,style:handout-master?,style:master-page*) >
<!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?,
- text:user-field-decls?,
text:dde-connection-decls?,
+ text:user-field-decls?,
text:dde-connection-decls?,
text:alphabetical-index-auto-mark-file?" >
<!ENTITY % change-marks "text:change | text:change-start | text:change-end">
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/script.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/script.mod
index 79f6ddbf6f..fca25a89b0 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/script.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/script.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/settings.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/settings.mod
index f048c48969..94d7cd5052 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/settings.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/settings.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/style.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/style.mod
index 87136e5bc5..ccaf9eae21 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/style.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/style.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/table.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/table.mod
index c3cda9ec47..cb6b3c8677 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/table.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/table.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmerge/source/palmtests/qa/comparator/dtd/text.mod
b/main/xmerge/source/palmtests/qa/comparator/dtd/text.mod
index 77e10b86b9..1b9d56ea98 100644
--- a/main/xmerge/source/palmtests/qa/comparator/dtd/text.mod
+++ b/main/xmerge/source/palmtests/qa/comparator/dtd/text.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -27,12 +27,12 @@
text:page-continuation |
text:sender-firstname |
text:sender-lastname |
- text:sender-initials |
+ text:sender-initials |
text:sender-title |
text:sender-position |
- text:sender-email |
+ text:sender-email |
text:sender-phone-private |
- text:sender-fax |
+ text:sender-fax |
text:sender-company |
text:sender-phone-work |
text:sender-street |
@@ -43,13 +43,13 @@
text:author-name |
text:author-initials |
text:placeholder |
- text:variable-set |
- text:variable-get |
- text:variable-input |
- text:user-field-get |
- text:user-field-input |
- text:sequence |
- text:expression |
+ text:variable-set |
+ text:variable-get |
+ text:variable-input |
+ text:user-field-get |
+ text:user-field-input |
+ text:sequence |
+ text:expression |
text:text-input |
text:database-display |
text:database-next |
@@ -106,7 +106,7 @@
text:bookmark|text:bookmark-start|text:bookmark-end|
text:reference-mark|text:reference-mark-start|
text:reference-mark-end|%fields;|%shape;|
- text:toc-mark-start |
text:toc-mark-end |
+ text:toc-mark-start |
text:toc-mark-end |
text:toc-mark |
text:user-index-mark-start |
text:user-index-mark-end |
text:user-index-mark |
text:alphabetical-index-mark-start |
@@ -228,8 +228,8 @@
<!ATTLIST text:outline-level-style text:start-value %positiveInteger;
"1">
-<!ENTITY % field-declarations "text:variable-decls?,
-
text:user-field-decls?,
+<!ENTITY % field-declarations "text:variable-decls?,
+
text:user-field-decls?,
text:sequence-decls?">
<!ENTITY % variableName "CDATA">
@@ -246,7 +246,7 @@
text:string-value
%string; #IMPLIED
text:currency CDATA
#IMPLIED" >
-<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
+<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
style:num-letter-sync %boolean;
"false"'>
@@ -390,7 +390,7 @@
<!ELEMENT text:text-input (#PCDATA)>
<!ATTLIST text:text-input text:description %string; #IMPLIED>
-<!ENTITY % database-table "text:database-name CDATA #REQUIRED
+<!ENTITY % database-table "text:database-name CDATA #REQUIRED
text:table-name CDATA
#REQUIRED">
<!ELEMENT text:database-display (#PCDATA)>
@@ -495,12 +495,12 @@
<!ELEMENT text:chapter (#PCDATA)>
<!ATTLIST text:chapter text:display (name|number|number-and-name|
-
plain-number-and-name|plain-number)
+
plain-number-and-name|plain-number)
"number-and-name">
<!ATTLIST text:chapter text:outline-level %integer; "1">
<!ELEMENT text:file-name (#PCDATA)>
-<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
+<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
"full">
<!ATTLIST text:file-name text:fixed %boolean; "false">
@@ -582,10 +582,10 @@
<!ATTLIST text:object-count style:num-letter-sync %boolean; "false">
<!ELEMENT text:bibliography-mark (#PCDATA)>
-<!ATTLIST text:bibliography-mark text:bibiliographic-type
- ( article | book | booklet | conference | custom1 | custom2 | custom3 |
- custom4 | custom5 | email | inbook | incollection | inproceedings |
- journal | manual | mastersthesis | misc | phdthesis | proceedings |
+<!ATTLIST text:bibliography-mark text:bibiliographic-type
+ ( article | book | booklet | conference | custom1 | custom2 | custom3 |
+ custom4 | custom5 | email | inbook | incollection | inproceedings |
+ journal | manual | mastersthesis | misc | phdthesis | proceedings |
techreport | unpublished | www ) #REQUIRED >
<!ATTLIST text:bibliography-mark text:identifier CDATA #IMPLIED>
<!ATTLIST text:bibliography-mark text:address CDATA #IMPLIED>
@@ -650,7 +650,7 @@
<!ATTLIST text:footnotes-configuration text:footnotes-position (document|page)
"page">
<!ATTLIST text:footnotes-configuration text:start-numbering-at
(document|chapter|page) "document">
-<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
+<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
<!ELEMENT text:footnote-continuation-notice-backward (#PCDATA)>
<!ELEMENT text:endnotes-configuration EMPTY>
@@ -664,7 +664,7 @@
<!ATTLIST text:endnotes-configuration text:default-style-name %styleName;
#IMPLIED>
<!ATTLIST text:endnotes-configuration text:master-page-name %styleName;
#IMPLIED>
-<!-- Validity constraint: text:footnote and text:endnote elements may not
+<!-- Validity constraint: text:footnote and text:endnote elements may not
contain other text:footnote or text:endnote elements, even though the
DTD
allows this (via the %text; in the foot-/endnote-body).
Unfortunately, this constraint cannot be easily specified in the DTD.
@@ -712,21 +712,21 @@
<!ATTLIST text:section-source text:section-name %string; #IMPLIED>
<!ATTLIST text:section-source text:filter-name %string; #IMPLIED>
-<!ELEMENT text:table-of-content (text:table-of-content-source,
+<!ELEMENT text:table-of-content (text:table-of-content-source,
text:index-body) >
<!ATTLIST text:table-of-content text:style-name %styleName; #IMPLIED>
<!ATTLIST text:table-of-content text:protected %boolean; "false">
-<!ELEMENT text:table-of-content-source (text:index-title-template? ,
+<!ELEMENT text:table-of-content-source (text:index-title-template? ,
text:table-of-content-entry-template*,
text:index-source-styles* ) >
<!ATTLIST text:table-of-content-source text:outline-level %integer; #IMPLIED>
<!ATTLIST text:table-of-content-source text:use-index-marks %boolean; "true">
-<!ATTLIST text:table-of-content-source text:use-index-source-styles
+<!ATTLIST text:table-of-content-source text:use-index-source-styles
%boolean; "false">
-<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
+<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
"document">
-<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
+<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:table-of-content-source fo:language %string; #IMPLIED>
<!ATTLIST text:table-of-content-source fo:country %string; #IMPLIED>
@@ -739,53 +739,53 @@
text:index-entry-tab-stop |
text:index-entry-link-start |
text:index-entry-link-end)* >
-<!ATTLIST text:table-of-content-entry-template text:outline-level
+<!ATTLIST text:table-of-content-entry-template text:outline-level
%integer; #REQUIRED>
-<!ATTLIST text:table-of-content-entry-template text:style-name
+<!ATTLIST text:table-of-content-entry-template text:style-name
%styleName; #REQUIRED>
-<!ELEMENT text:illustration-index
+<!ELEMENT text:illustration-index
(text:illustration-index-source, text:index-body)>
<!ATTLIST text:illustration-index text:style-name %styleName; #IMPLIED>
<!ATTLIST text:illustration-index text:protected %boolean; "false">
<!ELEMENT text:illustration-index-source (text:index-title-template?,
text:illustration-index-entry-template?) >
-<!ATTLIST text:illustration-index-source text:index-scope
+<!ATTLIST text:illustration-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
+<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:illustration-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:illustration-index-source text:caption-sequence-name
+<!ATTLIST text:illustration-index-source text:caption-sequence-name
%string; #IMPLIED>
-<!ATTLIST text:illustration-index-source text:caption-sequence-format
+<!ATTLIST text:illustration-index-source text:caption-sequence-format
(text|category-and-value|caption) "text">
<!ATTLIST text:illustration-index-source fo:language %string; #IMPLIED>
<!ATTLIST text:illustration-index-source fo:country %string; #IMPLIED>
<!ATTLIST text:illustration-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:illustration-index-entry-template
+<!ELEMENT text:illustration-index-entry-template
(
text:index-entry-page-number |
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:illustration-index-entry-template text:style-name
+<!ATTLIST text:illustration-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:table-index (text:table-index-source, text:index-body)>
<!ATTLIST text:table-index text:style-name %styleName; #IMPLIED>
<!ATTLIST text:table-index text:protected %boolean; "false">
-<!ELEMENT text:table-index-source (text:index-title-template?,
+<!ELEMENT text:table-index-source (text:index-title-template?,
text:table-index-entry-template?) >
-<!ATTLIST text:table-index-source text:index-scope
+<!ATTLIST text:table-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:table-index-source text:relative-tab-stop-position
+<!ATTLIST text:table-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:table-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:table-index-source text:caption-sequence-name
+<!ATTLIST text:table-index-source text:caption-sequence-name
%string; #IMPLIED>
-<!ATTLIST text:table-index-source text:caption-sequence-format
+<!ATTLIST text:table-index-source text:caption-sequence-format
(text|category-and-value|caption) "text">
<!ATTLIST text:table-index-source fo:language %string; #IMPLIED>
<!ATTLIST text:table-index-source fo:country %string; #IMPLIED>
@@ -795,7 +795,7 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:table-index-entry-template text:style-name
+<!ATTLIST text:table-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:object-index ( text:object-index-source, text:index-body ) >
@@ -804,11 +804,11 @@
<!ELEMENT text:object-index-source ( text:index-title-template?,
text:object-index-entry-template? ) >
-<!ATTLIST text:object-index-source text:index-scope
+<!ATTLIST text:object-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:object-index-source text:relative-tab-stop-position
+<!ATTLIST text:object-index-source text:relative-tab-stop-position
%boolean; "true">
-<!ATTLIST text:object-index-source text:use-spreadsheet-objects
+<!ATTLIST text:object-index-source text:use-spreadsheet-objects
%boolean; "false">
<!ATTLIST text:object-index-source text:use-draw-objects %boolean; "false">
<!ATTLIST text:object-index-source text:use-chart-objects %boolean; "false">
@@ -822,7 +822,7 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:object-index-entry-template text:style-name
+<!ATTLIST text:object-index-entry-template text:style-name
%styleName; #REQUIRED >
<!ELEMENT text:user-index (text:user-index-source, text:index-body) >
@@ -832,7 +832,7 @@
<!ELEMENT text:user-index-source ( text:index-title-template?,
text:user-index-entry-template*,
text:index-source-styles* ) >
-<!ATTLIST text:user-index-source text:index-scope
+<!ATTLIST text:user-index-source text:index-scope
(document|chapter) "document">
<!ATTLIST text:user-index-source text:relative-tab-stop-position
%boolean; "true">
@@ -841,7 +841,7 @@
<!ATTLIST text:user-index-source text:use-tables %boolean; "false">
<!ATTLIST text:user-index-source text:use-floating-frames %boolean; "false">
<!ATTLIST text:user-index-source text:use-objects %boolean; "false">
-<!ATTLIST text:user-index-source text:use-index-source-styles
+<!ATTLIST text:user-index-source text:use-index-source-styles
%boolean; "false">
<!ATTLIST text:user-index-source text:copy-outline-level %boolean; "false">
<!ATTLIST text:user-index-source fo:language %string; #IMPLIED>
@@ -856,21 +856,21 @@
<!ATTLIST text:user-index-entry-template text:outline-level %integer;
#REQUIRED>
<!ATTLIST text:user-index-entry-template text:style-name %styleName; #REQUIRED>
-<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
+<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
text:index-body)>
<!ATTLIST text:alphabetical-index text:style-name %styleName; #IMPLIED>
<!ATTLIST text:alphabetical-index text:protected %boolean; "false">
-<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
+<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
text:alphabetical-index-entry-template* ) >
-<!ATTLIST text:alphabetical-index-source text:index-scope
+<!ATTLIST text:alphabetical-index-source text:index-scope
(document|chapter) "document">
<!ATTLIST text:alphabetical-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:alphabetical-index-source text:ignore-case %boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
+<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
%styleName; #IMPLIED>
-<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
+<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:combine-entries
%boolean; "true">
@@ -878,7 +878,7 @@
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:combine-entries-with-pp
%boolean; "true">
-<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
+<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:capitalize-entries
%boolean; "false">
@@ -893,9 +893,9 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:alphabetical-index-entry-template text:outline-level
+<!ATTLIST text:alphabetical-index-entry-template text:outline-level
(1|2|3|separator) #REQUIRED>
-<!ATTLIST text:alphabetical-index-entry-template text:style-name
+<!ATTLIST text:alphabetical-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:alphabetical-index-auto-mark-file EMPTY>
@@ -912,20 +912,20 @@
<!ELEMENT text:bibliography-entry-template ( text:index-entry-span |
text:index-entry-tab-stop |
text:index-entry-bibliography )* >
-<!ATTLIST text:bibliography-entry-template text:bibliography-type
- ( article | book | booklet | conference |
custom1 | custom2 |
+<!ATTLIST text:bibliography-entry-template text:bibliography-type
+ ( article | book | booklet | conference |
custom1 | custom2 |
custom3 | custom4 | custom5 | email | inbook
| incollection |
- inproceedings | journal | manual |
mastersthesis | misc |
- phdthesis | proceedings | techreport |
unpublished | www )
+ inproceedings | journal | manual |
mastersthesis | misc |
+ phdthesis | proceedings | techreport |
unpublished | www )
#REQUIRED >
-<!ATTLIST text:bibliography-entry-template text:style-name
+<!ATTLIST text:bibliography-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:index-body %sectionText; >
-<!--
+<!--
Validity constraint: text:index-title elements may appear only in
-indices, and there may be only one text:index-title element.
+indices, and there may be only one text:index-title element.
-->
<!ELEMENT text:index-title %sectionText; >
<!ATTLIST text:index-title text:style-name %styleName; #IMPLIED>
@@ -939,7 +939,7 @@ indices, and there may be only one text:index-title element.
<!ELEMENT text:index-entry-chapter EMPTY>
<!ATTLIST text:index-entry-chapter text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
+<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
"number-and-name" >
<!ELEMENT text:index-entry-text EMPTY>
@@ -955,11 +955,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:index-entry-bibliography text:style-name %styleName; #IMPLIED>
<!ATTLIST text:index-entry-bibliography text:bibliography-data-field
( address | annote |
author | bibiliographic_type |
- booktitle | chapter |
custom1 | custom2 |
+ booktitle | chapter |
custom1 | custom2 |
custom3 | custom4 |
custom5 | edition | editor |
howpublished |
identifier | institution | isbn |
journal | month |
note | number | organizations |
- pages | publisher |
report_type | school |
+ pages | publisher |
report_type | school |
series | title | url
| volume | year ) #REQUIRED>
@@ -1030,11 +1030,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:bibliography-configuration text:sort-algorithm %string;
#IMPLIED>
<!ELEMENT text:sort-key EMPTY>
-<!ATTLIST text:sort-key text:key ( address | annote | author |
- bibiliographic_type | booktitle | chapter | custom1 | custom2 |
- custom3 | custom4 | custom5 | edition | editor | howpublished |
- identifier | institution | isbn | journal | month | note | number |
- organizations | pages | publisher | report_type | school | series |
+<!ATTLIST text:sort-key text:key ( address | annote | author |
+ bibiliographic_type | booktitle | chapter | custom1 | custom2 |
+ custom3 | custom4 | custom5 | edition | editor | howpublished |
+ identifier | institution | isbn | journal | month | note | number |
+ organizations | pages | publisher | report_type | school | series |
title | url | volume | year ) #REQUIRED>
<!ATTLIST text:sort-key text:sort-ascending %boolean; "true">
@@ -1084,12 +1084,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:tracked-changes text:track-changes %boolean; "true">
<!ATTLIST text:tracked-changes text:protection-key CDATA #IMPLIED>
-<!ELEMENT text:changed-region (text:insertion |
- (text:deletion,
text:insertion?) |
+<!ELEMENT text:changed-region (text:insertion |
+ (text:deletion,
text:insertion?) |
text:format-change) >
<!ATTLIST text:changed-region text:id ID #REQUIRED>
<!ELEMENT text:insertion (office:change-info, %sectionText;)>
<!ELEMENT text:deletion (office:change-info, %sectionText;)>
<!ELEMENT text:format-change (office:change-info)>
-
diff --git a/main/xmloff/dtd/chart.mod b/main/xmloff/dtd/chart.mod
index 771c4beb8d..0a7f7719f3 100644
--- a/main/xmloff/dtd/chart.mod
+++ b/main/xmloff/dtd/chart.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -178,7 +178,7 @@
chart:display-label %boolean; "true"
chart:label-arrangement
(side-by-side|stagger-even|stagger-odd) "side-by-side"
chart:text-overlap %boolean; "false"
- chart:visible %boolean; "true"
+ chart:visible %boolean; "true"
chart:link-data-style-to-source %boolean; "true" >
<!ELEMENT chart:grid EMPTY>
@@ -247,7 +247,7 @@
<!-- general text properties -->
-<!ATTLIST style:properties
+<!ATTLIST style:properties
text:rotation-angle %integer; "0" >
<!-- symbol properties -->
diff --git a/main/xmloff/dtd/datastyl.mod b/main/xmloff/dtd/datastyl.mod
index 9071abf20d..5bc650237a 100644
--- a/main/xmloff/dtd/datastyl.mod
+++ b/main/xmloff/dtd/datastyl.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/defs.mod b/main/xmloff/dtd/defs.mod
index 982f99d5cd..e341136a89 100644
--- a/main/xmloff/dtd/defs.mod
+++ b/main/xmloff/dtd/defs.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -32,7 +32,7 @@
<!-- (optional) text declarations; used before the first paragraph -->
<!ENTITY % text-decls "text:variable-decls?, text:sequence-decls?,
- text:user-field-decls?,
text:dde-connection-decls?,
+ text:user-field-decls?,
text:dde-connection-decls?,
text:alphabetical-index-auto-mark-file?" >
<!-- define the types of text which may occur inside of sections -->
@@ -49,4 +49,3 @@
text:table-index|text:object-index|text:user-index|
text:alphabetical-index|text:bibliography|
text:index-title|%change-marks;)* )">
-
diff --git a/main/xmloff/dtd/drawing.mod b/main/xmloff/dtd/drawing.mod
index 67aa061cab..ff0f00e673 100644
--- a/main/xmloff/dtd/drawing.mod
+++ b/main/xmloff/dtd/drawing.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/dtypes.mod b/main/xmloff/dtd/dtypes.mod
index c212aa596a..8c9e5524f4 100644
--- a/main/xmloff/dtd/dtypes.mod
+++ b/main/xmloff/dtd/dtypes.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/form.mod b/main/xmloff/dtd/form.mod
index 06332080b8..88e76f81b9 100644
--- a/main/xmloff/dtd/form.mod
+++ b/main/xmloff/dtd/form.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/meta.mod b/main/xmloff/dtd/meta.mod
index f41a9fda24..6a24dff7d9 100644
--- a/main/xmloff/dtd/meta.mod
+++ b/main/xmloff/dtd/meta.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/nmspace.mod b/main/xmloff/dtd/nmspace.mod
index 155dea2d9f..390d4056d4 100644
--- a/main/xmloff/dtd/nmspace.mod
+++ b/main/xmloff/dtd/nmspace.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/office.mod b/main/xmloff/dtd/office.mod
index fa5a1e530c..9ae92b999b 100644
--- a/main/xmloff/dtd/office.mod
+++ b/main/xmloff/dtd/office.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/script.mod b/main/xmloff/dtd/script.mod
index 7296066e02..a2057f591e 100644
--- a/main/xmloff/dtd/script.mod
+++ b/main/xmloff/dtd/script.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/settings.mod b/main/xmloff/dtd/settings.mod
index f048c48969..94d7cd5052 100644
--- a/main/xmloff/dtd/settings.mod
+++ b/main/xmloff/dtd/settings.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/style.mod b/main/xmloff/dtd/style.mod
index f009839a91..4df84f6c57 100644
--- a/main/xmloff/dtd/style.mod
+++ b/main/xmloff/dtd/style.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/table.mod b/main/xmloff/dtd/table.mod
index 5aca3a41e8..1e1099953c 100644
--- a/main/xmloff/dtd/table.mod
+++ b/main/xmloff/dtd/table.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
diff --git a/main/xmloff/dtd/text.mod b/main/xmloff/dtd/text.mod
index 51a34c83e3..1e41da67d2 100644
--- a/main/xmloff/dtd/text.mod
+++ b/main/xmloff/dtd/text.mod
@@ -1,5 +1,5 @@
<!--***********************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this 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.
- *
+ *
***********************************************************-->
@@ -27,12 +27,12 @@
text:page-continuation |
text:sender-firstname |
text:sender-lastname |
- text:sender-initials |
+ text:sender-initials |
text:sender-title |
text:sender-position |
- text:sender-email |
+ text:sender-email |
text:sender-phone-private |
- text:sender-fax |
+ text:sender-fax |
text:sender-company |
text:sender-phone-work |
text:sender-street |
@@ -43,13 +43,13 @@
text:author-name |
text:author-initials |
text:placeholder |
- text:variable-set |
- text:variable-get |
- text:variable-input |
- text:user-field-get |
- text:user-field-input |
- text:sequence |
- text:expression |
+ text:variable-set |
+ text:variable-get |
+ text:variable-input |
+ text:user-field-get |
+ text:user-field-input |
+ text:sequence |
+ text:expression |
text:text-input |
text:database-display |
text:database-next |
@@ -106,7 +106,7 @@
text:bookmark|text:bookmark-start|text:bookmark-end|
text:reference-mark|text:reference-mark-start|
text:reference-mark-end|%fields;|%shape;|
- text:toc-mark-start | text:toc-mark-end |
+ text:toc-mark-start | text:toc-mark-end |
text:toc-mark | text:user-index-mark-start |
text:user-index-mark-end |
text:user-index-mark |
text:alphabetical-index-mark-start |
@@ -230,8 +230,8 @@
<!ATTLIST text:outline-level-style text:start-value %positiveInteger;
"1">
-<!ENTITY % field-declarations "text:variable-decls?,
-
text:user-field-decls?,
+<!ENTITY % field-declarations "text:variable-decls?,
+
text:user-field-decls?,
text:sequence-decls?">
<!ENTITY % variableName "CDATA">
@@ -248,7 +248,7 @@
text:boolean-value
%boolean; #IMPLIED
text:string-value
%string; #IMPLIED" >
-<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
+<!ENTITY % numFormat 'style:num-format CDATA #IMPLIED
style:num-letter-sync %boolean;
"false"'>
@@ -393,7 +393,7 @@
<!ELEMENT text:text-input (#PCDATA)>
<!ATTLIST text:text-input text:description %string; #IMPLIED>
-<!ENTITY % database-table "text:database-name CDATA #REQUIRED
+<!ENTITY % database-table "text:database-name CDATA #REQUIRED
text:table-name CDATA
#REQUIRED
text:table-type
(table|query|command) #IMPLIED">
@@ -502,12 +502,12 @@
<!ELEMENT text:chapter (#PCDATA)>
<!ATTLIST text:chapter text:display (name|number|number-and-name|
-
plain-number-and-name|plain-number)
+
plain-number-and-name|plain-number)
"number-and-name">
<!ATTLIST text:chapter text:outline-level %integer; "1">
<!ELEMENT text:file-name (#PCDATA)>
-<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
+<!ATTLIST text:file-name text:display (full|path|name|name-and-extension)
"full">
<!ATTLIST text:file-name text:fixed %boolean; "false">
@@ -589,10 +589,10 @@
<!ATTLIST text:object-count style:num-letter-sync %boolean; "false">
<!ELEMENT text:bibliography-mark (#PCDATA)>
-<!ATTLIST text:bibliography-mark text:bibliography-type
- ( article | book | booklet | conference | custom1 | custom2 | custom3 |
- custom4 | custom5 | email | inbook | incollection | inproceedings |
- journal | manual | mastersthesis | misc | phdthesis | proceedings |
+<!ATTLIST text:bibliography-mark text:bibliography-type
+ ( article | book | booklet | conference | custom1 | custom2 | custom3 |
+ custom4 | custom5 | email | inbook | incollection | inproceedings |
+ journal | manual | mastersthesis | misc | phdthesis | proceedings |
techreport | unpublished | www ) #REQUIRED >
<!ATTLIST text:bibliography-mark text:identifier CDATA #IMPLIED>
<!ATTLIST text:bibliography-mark text:address CDATA #IMPLIED>
@@ -657,7 +657,7 @@
<!ATTLIST text:footnotes-configuration text:footnotes-position (document|page)
"page">
<!ATTLIST text:footnotes-configuration text:start-numbering-at
(document|chapter|page) "document">
-<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
+<!ELEMENT text:footnote-continuation-notice-forward (#PCDATA)>
<!ELEMENT text:footnote-continuation-notice-backward (#PCDATA)>
<!ELEMENT text:endnotes-configuration EMPTY>
@@ -671,7 +671,7 @@
<!ATTLIST text:endnotes-configuration text:default-style-name %styleName;
#IMPLIED>
<!ATTLIST text:endnotes-configuration text:master-page-name %styleName;
#IMPLIED>
-<!-- Validity constraint: text:footnote and text:endnote elements may not
+<!-- Validity constraint: text:footnote and text:endnote elements may not
contain other text:footnote or text:endnote elements, even though the
DTD
allows this (via the %text; in the foot-/endnote-body).
Unfortunately, this constraint cannot be easily specified in the DTD.
@@ -715,21 +715,21 @@
<!ATTLIST text:section-source text:section-name %string; #IMPLIED>
<!ATTLIST text:section-source text:filter-name %string; #IMPLIED>
-<!ELEMENT text:table-of-content (text:table-of-content-source,
+<!ELEMENT text:table-of-content (text:table-of-content-source,
text:index-body) >
<!ATTLIST text:table-of-content %sectionAttr;>
-<!ELEMENT text:table-of-content-source (text:index-title-template? ,
+<!ELEMENT text:table-of-content-source (text:index-title-template? ,
text:table-of-content-entry-template*,
text:index-source-styles* ) >
<!ATTLIST text:table-of-content-source text:outline-level %integer; #IMPLIED>
<!ATTLIST text:table-of-content-source text:use-outline-level %boolean; "true">
<!ATTLIST text:table-of-content-source text:use-index-marks %boolean; "true">
-<!ATTLIST text:table-of-content-source text:use-index-source-styles
+<!ATTLIST text:table-of-content-source text:use-index-source-styles
%boolean; "false">
-<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
+<!ATTLIST text:table-of-content-source text:index-scope (document|chapter)
"document">
-<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
+<!ATTLIST text:table-of-content-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:table-of-content-source fo:language %string; #IMPLIED>
<!ATTLIST text:table-of-content-source fo:country %string; #IMPLIED>
@@ -742,51 +742,51 @@
text:index-entry-tab-stop |
text:index-entry-link-start |
text:index-entry-link-end)* >
-<!ATTLIST text:table-of-content-entry-template text:outline-level
+<!ATTLIST text:table-of-content-entry-template text:outline-level
%integer; #REQUIRED>
-<!ATTLIST text:table-of-content-entry-template text:style-name
+<!ATTLIST text:table-of-content-entry-template text:style-name
%styleName; #REQUIRED>
-<!ELEMENT text:illustration-index
+<!ELEMENT text:illustration-index
(text:illustration-index-source, text:index-body)>
<!ATTLIST text:illustration-index %sectionAttr;>
<!ELEMENT text:illustration-index-source (text:index-title-template?,
text:illustration-index-entry-template?) >
-<!ATTLIST text:illustration-index-source text:index-scope
+<!ATTLIST text:illustration-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
+<!ATTLIST text:illustration-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:illustration-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:illustration-index-source text:caption-sequence-name
+<!ATTLIST text:illustration-index-source text:caption-sequence-name
%string; #IMPLIED>
-<!ATTLIST text:illustration-index-source text:caption-sequence-format
+<!ATTLIST text:illustration-index-source text:caption-sequence-format
(text|category-and-value|caption) "text">
<!ATTLIST text:illustration-index-source fo:language %string; #IMPLIED>
<!ATTLIST text:illustration-index-source fo:country %string; #IMPLIED>
<!ATTLIST text:illustration-index-source text:sort-algorithm %string; #IMPLIED>
-<!ELEMENT text:illustration-index-entry-template
+<!ELEMENT text:illustration-index-entry-template
(
text:index-entry-page-number |
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:illustration-index-entry-template text:style-name
+<!ATTLIST text:illustration-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:table-index (text:table-index-source, text:index-body)>
<!ATTLIST text:table-index %sectionAttr;>
-<!ELEMENT text:table-index-source (text:index-title-template?,
+<!ELEMENT text:table-index-source (text:index-title-template?,
text:table-index-entry-template?) >
-<!ATTLIST text:table-index-source text:index-scope
+<!ATTLIST text:table-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:table-index-source text:relative-tab-stop-position
+<!ATTLIST text:table-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:table-index-source text:use-caption %boolean; "true">
-<!ATTLIST text:table-index-source text:caption-sequence-name
+<!ATTLIST text:table-index-source text:caption-sequence-name
%string; #IMPLIED>
-<!ATTLIST text:table-index-source text:caption-sequence-format
+<!ATTLIST text:table-index-source text:caption-sequence-format
(text|category-and-value|caption) "text">
<!ATTLIST text:table-index-source fo:language %string; #IMPLIED>
<!ATTLIST text:table-index-source fo:country %string; #IMPLIED>
@@ -796,7 +796,7 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:table-index-entry-template text:style-name
+<!ATTLIST text:table-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:object-index ( text:object-index-source, text:index-body ) >
@@ -804,11 +804,11 @@
<!ELEMENT text:object-index-source ( text:index-title-template?,
text:object-index-entry-template? ) >
-<!ATTLIST text:object-index-source text:index-scope
+<!ATTLIST text:object-index-source text:index-scope
(document|chapter) "document">
-<!ATTLIST text:object-index-source text:relative-tab-stop-position
+<!ATTLIST text:object-index-source text:relative-tab-stop-position
%boolean; "true">
-<!ATTLIST text:object-index-source text:use-spreadsheet-objects
+<!ATTLIST text:object-index-source text:use-spreadsheet-objects
%boolean; "false">
<!ATTLIST text:object-index-source text:use-draw-objects %boolean; "false">
<!ATTLIST text:object-index-source text:use-chart-objects %boolean; "false">
@@ -822,7 +822,7 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:object-index-entry-template text:style-name
+<!ATTLIST text:object-index-entry-template text:style-name
%styleName; #REQUIRED >
<!ELEMENT text:user-index (text:user-index-source, text:index-body) >
@@ -831,7 +831,7 @@
<!ELEMENT text:user-index-source ( text:index-title-template?,
text:user-index-entry-template*,
text:index-source-styles* ) >
-<!ATTLIST text:user-index-source text:index-scope
+<!ATTLIST text:user-index-source text:index-scope
(document|chapter) "document">
<!ATTLIST text:user-index-source text:relative-tab-stop-position
%boolean; "true">
@@ -840,7 +840,7 @@
<!ATTLIST text:user-index-source text:use-tables %boolean; "false">
<!ATTLIST text:user-index-source text:use-floating-frames %boolean; "false">
<!ATTLIST text:user-index-source text:use-objects %boolean; "false">
-<!ATTLIST text:user-index-source text:use-index-source-styles
+<!ATTLIST text:user-index-source text:use-index-source-styles
%boolean; "false">
<!ATTLIST text:user-index-source text:copy-outline-levels %boolean; "false">
<!ATTLIST text:user-index-source fo:language %string; #IMPLIED>
@@ -856,20 +856,20 @@
<!ATTLIST text:user-index-entry-template text:outline-level %integer;
#REQUIRED>
<!ATTLIST text:user-index-entry-template text:style-name %styleName; #REQUIRED>
-<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
+<!ELEMENT text:alphabetical-index (text:alphabetical-index-source,
text:index-body)>
<!ATTLIST text:alphabetical-index %sectionAttr;>
-<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
+<!ELEMENT text:alphabetical-index-source ( text:index-title-template?,
text:alphabetical-index-entry-template* ) >
-<!ATTLIST text:alphabetical-index-source text:index-scope
+<!ATTLIST text:alphabetical-index-source text:index-scope
(document|chapter) "document">
<!ATTLIST text:alphabetical-index-source text:relative-tab-stop-position
%boolean; "true">
<!ATTLIST text:alphabetical-index-source text:ignore-case %boolean; "false">
-<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
+<!ATTLIST text:alphabetical-index-source text:main-entry-style-name
%styleName; #IMPLIED>
-<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
+<!ATTLIST text:alphabetical-index-source text:alphabetical-separators
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:combine-entries
%boolean; "true">
@@ -877,7 +877,7 @@
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:combine-entries-with-pp
%boolean; "true">
-<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
+<!ATTLIST text:alphabetical-index-source text:use-keys-as-entries
%boolean; "false">
<!ATTLIST text:alphabetical-index-source text:capitalize-entries
%boolean; "false">
@@ -892,9 +892,9 @@
text:index-entry-text |
text:index-entry-span |
text:index-entry-tab-stop )* >
-<!ATTLIST text:alphabetical-index-entry-template text:outline-level
+<!ATTLIST text:alphabetical-index-entry-template text:outline-level
(1|2|3|separator) #REQUIRED>
-<!ATTLIST text:alphabetical-index-entry-template text:style-name
+<!ATTLIST text:alphabetical-index-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:alphabetical-index-auto-mark-file EMPTY>
@@ -910,20 +910,20 @@
<!ELEMENT text:bibliography-entry-template ( text:index-entry-span |
text:index-entry-tab-stop |
text:index-entry-bibliography )* >
-<!ATTLIST text:bibliography-entry-template text:bibliography-type
- ( article | book | booklet | conference |
custom1 | custom2 |
+<!ATTLIST text:bibliography-entry-template text:bibliography-type
+ ( article | book | booklet | conference |
custom1 | custom2 |
custom3 | custom4 | custom5 | email | inbook
| incollection |
- inproceedings | journal | manual |
mastersthesis | misc |
- phdthesis | proceedings | techreport |
unpublished | www )
+ inproceedings | journal | manual |
mastersthesis | misc |
+ phdthesis | proceedings | techreport |
unpublished | www )
#REQUIRED >
-<!ATTLIST text:bibliography-entry-template text:style-name
+<!ATTLIST text:bibliography-entry-template text:style-name
%styleName; #REQUIRED>
<!ELEMENT text:index-body %sectionText; >
-<!--
+<!--
Validity constraint: text:index-title elements may appear only in
-indices, and there may be only one text:index-title element.
+indices, and there may be only one text:index-title element.
-->
<!ELEMENT text:index-title %sectionText; >
<!ATTLIST text:index-title text:style-name %styleName; #IMPLIED>
@@ -937,7 +937,7 @@ indices, and there may be only one text:index-title element.
<!ELEMENT text:index-entry-chapter EMPTY>
<!ATTLIST text:index-entry-chapter text:style-name %styleName; #IMPLIED>
-<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
+<!ATTLIST text:index-entry-chapter text:display (name|number|number-and-name)
"number-and-name" >
<!ELEMENT text:index-entry-text EMPTY>
@@ -953,11 +953,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:index-entry-bibliography text:style-name %styleName; #IMPLIED>
<!ATTLIST text:index-entry-bibliography text:bibliography-data-field
( address | annote |
author | bibliography-type |
- booktitle | chapter |
custom1 | custom2 |
+ booktitle | chapter |
custom1 | custom2 |
custom3 | custom4 |
custom5 | edition | editor |
howpublished |
identifier | institution | isbn |
journal | month |
note | number | organizations |
- pages | publisher |
report-type | school |
+ pages | publisher |
report-type | school |
series | title | url
| volume | year ) #REQUIRED>
@@ -1029,11 +1029,11 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:bibliography-configuration text:sort-algorithm %string;
#IMPLIED>
<!ELEMENT text:sort-key EMPTY>
-<!ATTLIST text:sort-key text:key ( address | annote | author |
- bibliography-type | booktitle | chapter | custom1 | custom2 |
- custom3 | custom4 | custom5 | edition | editor | howpublished |
- identifier | institution | isbn | journal | month | note | number |
- organizations | pages | publisher | report-type | school | series |
+<!ATTLIST text:sort-key text:key ( address | annote | author |
+ bibliography-type | booktitle | chapter | custom1 | custom2 |
+ custom3 | custom4 | custom5 | edition | editor | howpublished |
+ identifier | institution | isbn | journal | month | note | number |
+ organizations | pages | publisher | report-type | school | series |
title | url | volume | year ) #REQUIRED>
<!ATTLIST text:sort-key text:sort-ascending %boolean; "true">
@@ -1083,8 +1083,8 @@ indices, and there may be only one text:index-title
element.
<!ATTLIST text:tracked-changes text:track-changes %boolean; "true">
<!ATTLIST text:tracked-changes text:protection-key CDATA #IMPLIED>
-<!ELEMENT text:changed-region (text:insertion |
- (text:deletion,
text:insertion?) |
+<!ELEMENT text:changed-region (text:insertion |
+ (text:deletion,
text:insertion?) |
text:format-change) >
<!ATTLIST text:changed-region text:id ID #REQUIRED>
<!ATTLIST text:changed-region text:merge-last-paragraph %boolean; "true">
@@ -1092,4 +1092,3 @@ indices, and there may be only one text:index-title
element.
<!ELEMENT text:insertion (office:change-info, %sectionText;)>
<!ELEMENT text:deletion (office:change-info, %sectionText;)>
<!ELEMENT text:format-change (office:change-info)>
-
