[Python-modules-commits] [python-odf] 68/118: Update of schemas

Wolfgang Borgert debacle at moszumanska.debian.org
Fri Oct 3 21:27:23 UTC 2014


This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to reference refs/remotes/upstream/master
in repository python-odf.

commit e7c9ea00e14a51c51984dd06670f63ed07aa35c0
Author: Søren Roug <soren.roug at eea.europa.eu>
Date:   Thu Dec 17 21:36:03 2009 +0000

    Update of schemas
---
 grammar/OpenDocument-dsig-schema-v1.2-cd1.rng      |  76 ++++++++
 grammar/OpenDocument-dsig-schema-v1.2-draft7.rng   |  56 ------
 grammar/OpenDocument-manifest-schema-v1.2-cd1.rng  | 209 +++++++++++++++++++++
 .../OpenDocument-manifest-schema-v1.2-draft7.rng   | 122 ------------
 grammar/OpenDocument-metadata-v1.2-cd04.owl        |  84 +++++++++
 grammar/OpenDocument-package-metadata-v1.2-cd1.owl |  83 ++++++++
 ...-cd03.rng => OpenDocument-schema-v1.2-cd04.rng} | 176 ++++++++---------
 grammar/OpenDocument-strict-schema-v1.2-draft7.rng |  61 ------
 8 files changed, 540 insertions(+), 327 deletions(-)

diff --git a/grammar/OpenDocument-dsig-schema-v1.2-cd1.rng b/grammar/OpenDocument-dsig-schema-v1.2-cd1.rng
new file mode 100644
index 0000000..a4611c5
--- /dev/null
+++ b/grammar/OpenDocument-dsig-schema-v1.2-cd1.rng
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	OASIS OpenDocument v1.2 Part 3
+	Committee Draft 1, 19 October 2009
+	Digital Signatures Relax-NG Schema
+
+	Copyright © OASIS Open 2008-2009. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+	xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
+	xmlns:xmldsig="http://www.w3.org/2000/09/xmldsig#"
+>
+<start>
+	<choice>
+		<ref name="dsig-document-signatures"/>
+	</choice>
+</start>
+<define name="dsig-document-signatures">
+	<element name="dsig:document-signatures">
+		<oneOrMore>
+			<ref name="xmldsig-signature"/>
+		</oneOrMore>
+	</element>
+</define>
+<define name="xmldsig-signature">
+	<element name="xmldsig:Signature">
+		<ref name="xmldsigMarkup"/>
+	</element>
+</define>
+<!-- To avoid inclusion of the complete XMLDSIG schema, anything -->
+<!-- is allowed within a xmldsig:Signature element               -->
+<define name="xmldsigMarkup">
+	<zeroOrMore>
+		<choice>
+			<attribute>
+				<anyName/>
+			</attribute>
+			<text/>
+			<element>
+				<anyName/>
+				<ref name="xmldsigMarkup"/>
+			</element>
+		</choice>
+	</zeroOrMore>
+</define>
+</grammar>
diff --git a/grammar/OpenDocument-dsig-schema-v1.2-draft7.rng b/grammar/OpenDocument-dsig-schema-v1.2-draft7.rng
deleted file mode 100644
index 33d9c33..0000000
--- a/grammar/OpenDocument-dsig-schema-v1.2-draft7.rng
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-OASIS OpenDocument v1.2
-Draft7, 26 May 2008
-Relax-NG Manifest Schema
-
-$Id$
-
-© 2002-2005 OASIS Open
--->
-
-<grammar
-    xmlns="http://relaxng.org/ns/structure/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
-    xmlns:xmldsig="http://www.w3.org/2000/09/xmldsig#">
-
-<define name="dsig-document-signatures">
-    <element name="dsig:document-signatures">
-        <oneOrMore>
-            <ref name="xmldsig-signature"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<start>
-    <choice>
-        <ref name="dsig-document-signatures"/>
-    </choice>
-</start>
-
-<define name="xmldsig-signature">
-    <element name="xmldsig:Signature">
-        <ref name="xmldsigMarkup"/>
-    </element>
-</define>
-
-<!-- To avoid inclusion of the complete XMLDSIG schema, anything -->
-<!-- is allowed within a xmldsig:Signature element               -->
-<define name="xmldsigMarkup">
-    <zeroOrMore>
-        <choice>
-            <attribute>
-                <anyName/>
-            </attribute>
-            <text/>
-            <element>
-                <anyName/>
-                <ref name="xmldsigMarkup"/>
-            </element>
-        </choice>
-    </zeroOrMore>
-</define>
-</grammar>
diff --git a/grammar/OpenDocument-manifest-schema-v1.2-cd1.rng b/grammar/OpenDocument-manifest-schema-v1.2-cd1.rng
new file mode 100644
index 0000000..de2a3df
--- /dev/null
+++ b/grammar/OpenDocument-manifest-schema-v1.2-cd1.rng
@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	OASIS OpenDocument v1.2 Part 3
+	Committee Draft 1, 19 October 2009
+	Manifest Relax-NG Schema
+
+	Copyright © OASIS Open 2002-2009. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+
+<grammar 
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+>
+<start>
+	<choice>
+		<ref name="manifest"/>
+	</choice>
+</start>
+<define name="manifest">
+	<element name="manifest:manifest">
+		<oneOrMore>
+			<ref name="file-entry"/>
+		</oneOrMore>
+	</element>
+</define>
+<define name="file-entry">
+	<element name="manifest:file-entry">
+		<ref name="file-entry-attlist"/>
+		<optional>
+			<ref name="encryption-data"/>
+		</optional>
+	</element>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+	<attribute name="manifest:full-path">
+		<ref name="string"/>
+	</attribute>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+	<optional>
+		<attribute name="manifest:size">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</optional>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+	<attribute name="manifest:media-type">
+		<ref name="string"/>
+	</attribute>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+	<optional>
+		<attribute name="manifest:preferred-view-mode">
+			<choice>
+				<value>edit</value>
+				<value>presentation-slide-show</value>
+				<value>read-only</value>
+				<ref name="namespacedToken"/> 
+			</choice> 
+		</attribute> 
+	</optional> 
+</define>
+<define name="file-entry-attlist" combine="interleave">
+	<optional>
+		<attribute name="manifest:version">
+			<ref name="string"/>
+		</attribute>
+	</optional>
+</define>
+<define name="encryption-data">
+	<element name="manifest:encryption-data">
+		<ref name="encryption-data-attlist"/>
+		<ref name="algorithm"/>
+		<optional>
+			<ref name="start-key-generation"/>
+		</optional>
+		<ref name="key-derivation"/>
+	</element>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+	<attribute name="manifest:checksum-type">
+		<choice>
+			<value>SHA1/1K</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+	<attribute name="manifest:checksum">
+		<ref name="base64Binary"/>
+	</attribute>
+</define>
+<define name="algorithm">
+	<element name="manifest:algorithm">
+		<ref name="algorithm-attlist"/>
+		<empty/>
+	</element>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+	<attribute name="manifest:algorithm-name">
+		<choice>
+			<value>Blowfish CFB</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+	<attribute name="manifest:initialisation-vector">
+		<ref name="base64Binary"/>
+	</attribute>
+</define>
+<define name="key-derivation">
+	<element name="manifest:key-derivation">
+		<ref name="key-derivation-attlist"/>
+		<empty/>
+	</element>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+	<attribute name="manifest:key-derivation-name">
+		<choice>
+			<value>PBKDF2</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+	<attribute name="manifest:salt">
+		<ref name="base64Binary"/>
+	</attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+	<attribute name="manifest:iteration-count">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+	<optional>
+		<attribute name="manifest:key-size">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</optional>
+</define>
+<define name="start-key-generation">
+	<element name="manifest:start-key-generation">
+		<ref name="start-key-generation-attlist"/>
+		<empty/>
+	</element>
+</define>
+<define name="start-key-generation-attlist" combine="interleave">
+	<attribute name="manifest:start-key-generation-name">
+		<choice>
+			<value>SHA1</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+</define>
+<define name="start-key-generation-attlist" combine="interleave">
+	<optional>
+		<attribute name="manifest:key-size">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</optional>
+</define>
+<define name="base64Binary">
+	<data type="base64Binary"/>
+</define>
+<define name="namespacedToken">
+	<data type="string">
+		<param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
+	</data>
+</define>
+<define name="nonNegativeInteger">
+	<data type="nonNegativeInteger"/>
+</define>
+<define name="string">
+	<data type="string"/>
+</define>
+<define name="anyURI">
+	<data type="anyURI"/>
+</define>
+</grammar>
diff --git a/grammar/OpenDocument-manifest-schema-v1.2-draft7.rng b/grammar/OpenDocument-manifest-schema-v1.2-draft7.rng
deleted file mode 100644
index 9e1a382..0000000
--- a/grammar/OpenDocument-manifest-schema-v1.2-draft7.rng
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.2
-	Draft7, 26 May 2008
-    Relax-NG Manifest Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-        <optional>
-            <ref name="encryption-data"/>
-        </optional>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="manifest:size">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<!-- DRAFT7: new def start: Proposal to add version attribute for manifest entries http://lists.oasis-open.org/archives/office/200709/msg00011.html -->
-<!-- Note: Added optional -->
-<define name="file-entry-attlist" combine="interleave">
-	<optional>
-		<attribute name="manifest:version">
-			<data type="string"/>
-		</attribute>
-	</optional>
-</define>
-<!-- DRAFT7: new def end -->
-
-<define name="encryption-data">
-    <element name="manifest:encryption-data">
-        <ref name="encryption-data-attlist"/>
-        <ref name="algorithm"/>
-        <ref name="key-derivation"/>
-    </element>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="algorithm">
-    <element name="manifest:algorithm">
-        <ref name="algorithm-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:algorithm-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:initialisation-vector">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation">
-    <element name="manifest:key-derivation">
-        <ref name="key-derivation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:key-derivation-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:salt">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:iteration-count">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-</define>
-</grammar>
diff --git a/grammar/OpenDocument-metadata-v1.2-cd04.owl b/grammar/OpenDocument-metadata-v1.2-cd04.owl
new file mode 100644
index 0000000..d4cb1ea
--- /dev/null
+++ b/grammar/OpenDocument-metadata-v1.2-cd04.owl
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	OASIS OpenDocument v1.2
+	Committee Draft 04, 15 December 2009
+	OWL Metadata Manifest Description
+
+	Copyright © OASIS Open 2009. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+
+<rdf:RDF
+	xmlns="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:owl="http://www.w3.org/2002/07/owl#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:pkg="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#"
+	xmlns:odf="http://docs.oasis-open.org/ns/office/1.2/meta/odf#">
+
+<owl:Ontology rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#">
+	<owl:imports rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#" />
+	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+	<dc:title xml:lang="en">Open Document Schema Metadata Manifest Ontology</dc:title>
+	<label xml:lang="en">ODF Schema Metadata Manifest</label>
+</owl:Ontology>
+
+<owl:Class rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#ContentFile">
+	<label xml:lang="en">The OpenDocument Content File</label>
+	<comment xml:lang="en">The unique content.xml from the root path of the document</comment>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#File"/>
+</owl:Class>
+
+<owl:Class rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#StylesFile">
+	<label xml:lang="en">The OpenDocument Styles File</label>
+	<comment xml:lang="en">The unique styles.xml from the root path of the document</comment>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#File"/>
+</owl:Class>
+
+<owl:Class rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#Element">
+	<label xml:lang="en">OpenDocument Package ODF XML Element</label>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#Element"/>
+</owl:Class>
+
+<owl:Class rdf:about="urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field">
+	<label xml:lang="en">OpenDocument Meta field Element</label>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/odf#Element"/>
+</owl:Class>
+
+<owl:ObjectProperty rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#prefix">
+	<domain rdf:resource="urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field"/>
+	<range rdf:resource="http://www.w3.org/2001/XMLSchema-datatypes#string"/>
+	<label xml:lang="en">has prefix</label>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#suffix">
+	<domain rdf:resource="urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field"/>
+	<range rdf:resource="http://www.w3.org/2001/XMLSchema-datatypes#string"/>
+	<label xml:lang="en">has suffix</label>
+</owl:ObjectProperty>
+</rdf:RDF>
+
diff --git a/grammar/OpenDocument-package-metadata-v1.2-cd1.owl b/grammar/OpenDocument-package-metadata-v1.2-cd1.owl
new file mode 100644
index 0000000..47aeec8
--- /dev/null
+++ b/grammar/OpenDocument-package-metadata-v1.2-cd1.owl
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+	OASIS OpenDocument v1.2 Part 3
+	Committee Draft 1, 19 October 2009
+	OWL Metadata Manifest Description
+
+	Copyright © OASIS Open 2009. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+
+<rdf:RDF
+	xmlns="http://www.w3.org/2000/01/rdf-schema#"
+	xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:owl="http://www.w3.org/2002/07/owl#"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:pkg="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#"
+	xmlns:odf="http://docs.oasis-open.org/ns/office/1.2/meta/odf#">
+
+<owl:Ontology rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#">
+	<owl:imports rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#" />
+	<rdf:type rdf:resource="http://www.w3.org/2002/07/owl#Thing"/>
+	<dc:title xml:lang="en">Open Document Schema Metadata Manifest Ontology</dc:title>
+	<label xml:lang="en">ODF Schema Metadata Manifest</label>
+</owl:Ontology>
+
+<owl:Class rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#ContentFile">
+	<label xml:lang="en">The OpenDocument Content File</label>
+	<comment xml:lang="en">The unique content.xml from the root path of the document</comment>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#File"/>
+</owl:Class>
+
+<owl:Class rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#StylesFile">
+	<label xml:lang="en">The OpenDocument Styles File</label>
+	<comment xml:lang="en">The unique styles.xml from the root path of the document</comment>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#File"/>
+</owl:Class>
+
+<owl:Class rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#Element">
+	<label xml:lang="en">OpenDocument Package ODF XML Element</label>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/pkg#Element"/>
+</owl:Class>
+
+<owl:Class rdf:about="urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field">
+	<label xml:lang="en">OpenDocument Meta field Element</label>
+	<subClassOf rdf:resource="http://docs.oasis-open.org/ns/office/1.2/meta/odf#Element"/>
+</owl:Class>
+
+<owl:ObjectProperty rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#prefix">
+	<domain rdf:resource="urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field"/>
+	<range rdf:resource="http://www.w3.org/2001/XMLSchema-datatypes#string"/>
+	<label xml:lang="en">has prefix</label>
+</owl:ObjectProperty>
+
+<owl:ObjectProperty rdf:about="http://docs.oasis-open.org/ns/office/1.2/meta/odf#suffix">
+	<domain rdf:resource="urn:oasis:names:tc:opendocument:xmlns:text:1.0meta-field"/>
+	<range rdf:resource="http://www.w3.org/2001/XMLSchema-datatypes#string"/>
+	<label xml:lang="en">has suffix</label>
+</owl:ObjectProperty>
+</rdf:RDF>
diff --git a/grammar/OpenDocument-schema-v1.2-cd03.rng b/grammar/OpenDocument-schema-v1.2-cd04.rng
similarity index 99%
rename from grammar/OpenDocument-schema-v1.2-cd03.rng
rename to grammar/OpenDocument-schema-v1.2-cd04.rng
index 16a622f..41a28a1 100644
--- a/grammar/OpenDocument-schema-v1.2-cd03.rng
+++ b/grammar/OpenDocument-schema-v1.2-cd04.rng
@@ -1,10 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
     OASIS OpenDocument v1.2
-	Committee Draft 03, 30 July 2009
+	Committee Draft 04, 15 December 2009
     Relax-NG Schema
 
-    © 2002-2009 OASIS Open
+	Copyright © OASIS Open 2002-2009. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
 -->
 
 <grammar
@@ -873,7 +898,7 @@
             <ref name="text-number"/>
         </optional>
         <zeroOrMore>
-            <ref name="paragraph-content"/>
+            <ref name="paragraph-content-or-hyperlink"/>
         </zeroOrMore>
     </element>
 </define>
@@ -912,7 +937,7 @@
     <element name="text:p">
         <ref name="paragraph-attrs"/>
         <zeroOrMore>
-            <ref name="paragraph-content"/>
+            <ref name="paragraph-content-or-hyperlink"/>
         </zeroOrMore>
     </element>
 </define>
@@ -1318,6 +1343,12 @@
         <ref name="text-alphabetical-index-auto-mark-file"/>
     </optional>
 </define>
+<define name="paragraph-content-or-hyperlink">
+	<choice>
+		<ref name="paragraph-content"/>
+		<ref name="text-a"/>
+	</choice>
+</define>
 <define name="paragraph-content" combine="choice">
     <text/>
 </define>
@@ -1363,11 +1394,11 @@
             </attribute>
         </optional>
         <zeroOrMore>
-            <ref name="paragraph-content"/>
+            <ref name="paragraph-content-or-hyperlink"/>
         </zeroOrMore>
     </element>
 </define>
-<define name="paragraph-content" combine="choice">
+<define name="text-a" combine="choice">
     <element name="text:a">
         <ref name="text-a-attlist"/>
         <optional>
@@ -1436,7 +1467,7 @@
 	<element name="text:meta">
 	 	<ref name="text-meta-attlist"/>
 	 	<zeroOrMore>
-	 	 	<ref name="paragraph-content"/>
+	 	 	<ref name="paragraph-content-or-hyperlink"/>
 	 	</zeroOrMore>
 	</element>
 </define>
@@ -1566,7 +1597,7 @@
         </optional>
         <element name="text:ruby-base">
 			<zeroOrMore>
-                <ref name="paragraph-content"/>
+                <ref name="paragraph-content-or-hyperlink"/>
 			</zeroOrMore>
         </element>
         <element name="text:ruby-text">
@@ -2561,7 +2592,7 @@
 	<element name="text:meta-field">
 	 	<ref name="text-meta-field-attlist"/>
 	 	<zeroOrMore>
-	 	 	<ref name="paragraph-content"/>
+	 	 	<ref name="paragraph-content-or-hyperlink"/>
 	 	</zeroOrMore>
 	</element>
 </define>
@@ -2944,9 +2975,7 @@
 <define name="text-table-of-content-source-attlist" combine="interleave">
     <optional>
         <attribute name="text:outline-level">
-            <choice>
-                <ref name="positiveInteger"/>
-            </choice>
+			<ref name="positiveInteger"/>
         </attribute>
     </optional>
 </define>
@@ -3699,6 +3728,9 @@
         </optional>
         <ref name="table-columns-and-groups"/>
         <ref name="table-rows-and-groups"/>
+		<optional>
+			<ref name="table-named-expressions"/>    
+		</optional>
     </element>
 </define>
 <define name="table-columns-and-groups">
@@ -6570,10 +6602,17 @@
 </define>
 <define name="draw-circle">
     <element name="draw:circle">
-        <ref name="draw-circle-attlist"/>
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
+		<choice>
+			<group>
+		        <ref name="draw-circle-attlist"/>
+       			<ref name="common-draw-circle-ellipse-pos-attlist"/>
+			</group>
+			<group>
+		        <ref name="common-draw-position-attlist"/>
+       			<ref name="common-draw-size-attlist"/>
+			 </group>
+	 	</choice>
+		<ref name="common-draw-circle-ellipse-attlist"/>
         <ref name="common-draw-shape-with-text-and-styles-attlist"/>
         <ref name="common-draw-caption-id-attlist"/>
         <optional>
@@ -6591,22 +6630,18 @@
         <ref name="draw-text"/>
     </element>
 </define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
+<define name="common-draw-circle-ellipse-pos-attlist" combine="interleave">
+	<attribute name="svg:cx">
+		<ref name="coordinate"/>
+	</attribute>
+	<attribute name="svg:cy">
+		<ref name="coordinate"/>
+	</attribute>
 </define>
 <define name="draw-circle-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-    </optional>
+	<attribute name="svg:r">
+		<ref name="length"/>
+	</attribute>
 </define>
 <define name="common-draw-circle-ellipse-attlist" combine="interleave">
     <optional>
@@ -6636,10 +6671,17 @@
 </define>
 <define name="draw-ellipse">
     <element name="draw:ellipse">
+		<choice>
+			<group>
+				<ref name="draw-ellipse-attlist"/>
+				<ref name="common-draw-circle-ellipse-pos-attlist"/>
+			</group>
+			<group>
+				<ref name="common-draw-position-attlist"/>
+				<ref name="common-draw-size-attlist"/>
+			</group>
+		</choice>
         <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="draw-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
         <ref name="common-draw-shape-with-text-and-styles-attlist"/>
         <ref name="common-draw-caption-id-attlist"/>
         <optional>
@@ -6658,14 +6700,12 @@
     </element>
 </define>
 <define name="draw-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:rx">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:ry">
-            <ref name="length"/>
-        </attribute>
-    </optional>
+	<attribute name="svg:rx">
+		<ref name="length"/>
+	</attribute>
+	<attribute name="svg:ry">
+		<ref name="length"/>
+	</attribute>
 </define>
 <define name="draw-connector">
     <element name="draw:connector">
@@ -7718,9 +7758,7 @@
 <define name="common-draw-area-attlist" combine="interleave">
     <optional>
         <attribute name="draw:nohref">
-            <choice>
-                <value>nohref</value>
-            </choice>
+			<value>nohref</value>
         </attribute>
     </optional>
 </define>
@@ -9869,9 +9907,6 @@
     <element name="db:driver-settings">
         <ref name="db-driver-settings-attlist"/>
         <optional>
-            <ref name="db-java-classpath"/>
-        </optional>
-        <optional>
             <ref name="db-auto-increment"/>
         </optional>
         <optional>
@@ -9886,13 +9921,6 @@
     </element>
 </define>
 <define name="db-driver-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="db:java-driver-class">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="db-driver-settings-attlist" combine="interleave">
     <ref name="db-show-deleted"/>
 </define>
 <define name="db-show-deleted">
@@ -9933,28 +9961,6 @@
         </attribute>
     </optional>
 </define>
-<define name="db-java-classpath">
-    <oneOrMore>
-        <element name="db:java-classpath">
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="xlink:show">
-					<value>none</value>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="xlink:actuate">
-					<value>onRequest</value>
-                </attribute>
-            </optional>
-        </element>
-    </oneOrMore>
-</define>
 <define name="db-auto-increment">
     <element name="db:auto-increment">
         <ref name="db-auto-increment-attlist"/>
@@ -13182,9 +13188,6 @@
             <ref name="office-forms"/>
         </optional>
         <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
             <ref name="shape"/>
         </zeroOrMore>
         <optional>
@@ -15086,12 +15089,12 @@
 <define name="draw-gradient-attlist" combine="interleave">
     <optional>
         <attribute name="draw:start-intensity">
-            <ref name="percent"/>
+            <ref name="zeroToHundredPercent"/>
         </attribute>
     </optional>
     <optional>
         <attribute name="draw:end-intensity">
-            <ref name="percent"/>
+            <ref name="zeroToHundredPercent"/>
         </attribute>
     </optional>
 </define>
@@ -15357,12 +15360,12 @@
 <define name="draw-opacity-attlist" combine="interleave">
     <optional>
         <attribute name="draw:start">
-            <ref name="percent"/>
+            <ref name="zeroToHundredPercent"/>
         </attribute>
     </optional>
     <optional>
         <attribute name="draw:end">
-            <ref name="percent"/>
+            <ref name="zeroToHundredPercent"/>
         </attribute>
     </optional>
 </define>
@@ -16339,7 +16342,6 @@
         <value>normal</value>
         <value>bold</value>
         <value>thin</value>
-        <value>dash</value>
         <value>medium</value>
         <value>thick</value>
         <ref name="positiveInteger"/>
@@ -18430,7 +18432,7 @@
 <define name="style-graphic-properties-attlist" combine="interleave">
     <optional>
         <attribute name="draw:image-opacity">
-            <ref name="percent"/>
+            <ref name="zeroToHundredPercent"/>
         </attribute>
     </optional>
 </define>
@@ -20237,9 +20239,7 @@
 </define>
 
 <define name="namespacedToken">
-    <data type="string">
-        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
-    </data>
+    <data type="QName"/>
 </define>
 <define name="anyAttListOrElements">
     <zeroOrMore>
diff --git a/grammar/OpenDocument-strict-schema-v1.2-draft7.rng b/grammar/OpenDocument-strict-schema-v1.2-draft7.rng
deleted file mode 100644
index 645291c..0000000
--- a/grammar/OpenDocument-strict-schema-v1.2-draft7.rng
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.2
-	Draft7, 26 May 2008
-    Strict Relax-NG Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-    <include href="OpenDocument-schema-v1.2-draft7.rng">
-        <define name="office-meta-content">
-            <ref name="office-meta-content-strict"/>
-        </define>
-        <define name="style-page-layout-properties-content">
-            <ref name="style-page-layout-properties-content-strict"/>
-        </define>
-        <define name="style-header-footer-properties-content">
-            <ref name="style-header-footer-properties-content-strict"/>
-        </define>
-        <define name="style-drawing-page-properties-content">
-            <ref name="style-drawing-page-properties-content-strict"/>
-        </define>
-        <define name="style-text-properties-content">
-            <ref name="style-text-properties-content-strict"/>
-        </define>
-        <define name="style-paragraph-properties-content">
-            <ref name="style-paragraph-properties-content-strict"/>
-        </define>
-        <define name="style-ruby-properties-content">
-            <ref name="style-ruby-properties-content-strict"/>
-        </define>
-        <define name="style-section-properties-content">
-            <ref name="style-section-properties-content-strict"/>
-        </define>
-        <define name="style-list-level-properties-content">
-            <ref name="style-list-level-properties-content-strict"/>
-        </define>
-        <define name="style-table-properties-content">
-            <ref name="style-table-properties-content-strict"/>
-        </define>
-        <define name="style-table-column-properties-content">
-            <ref name="style-table-column-properties-content-strict"/>
-        </define>
-        <define name="style-table-row-properties-content">
-            <ref name="style-table-row-properties-content-strict"/>
-        </define>
-        <define name="style-table-cell-properties-content">
-            <ref name="style-table-cell-properties-content-strict"/>
-        </define>
-        <define name="style-graphic-properties-content">
-            <ref name="style-graphic-properties-content-strict"/>
-        </define>
-        <define name="style-chart-properties-content">
-            <ref name="style-chart-properties-content-strict"/>
-        </define>
-    </include>
-</grammar>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-odf.git



More information about the Python-modules-commits mailing list