OASIS Mailing List ArchivesView the OASIS mailing list archive below
or browse/search using MarkMail.

 


Help: OASIS Mailing Lists Help | MarkMail Help

office message

[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]


Subject: Re: [office] [OASIS Issue Tracker] Commented: (OFFICE-3317) ODF 1.2Part 1 5.5.2 <text:changed-region> ID attribute inconsisently available


On 09/08/2010 13:46, OASIS Issues Tracker wrote:
>     [ http://tools.oasis-open.org/issues/browse/OFFICE-3317?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=20229#action_20229 ] 
> 
> Michael Stahl  commented on OFFICE-3317:
> ----------------------------------------
> 
> i agree that the schema should be changed to reflect the dependency that is stated in the prose.
> this problem occurs for several elements in the schema.
> 
> i've just adapted the schema to fix all occurrences.
> but JIRA doesn't seem to allow me to attach files...

so i'll try to mail it instead, see attachment...

-- 
ORACLE          | <http://www.oracle.com/>
Michael Stahl   | Oracle Office GBU/OpenOffice.org Writer
ORACLE Deutschland B.V. & Co. KG | Nagelsweg 55, 20097 Hamburg, Germany
-----------------------------------------------------------------------
ORACLE Deutschland B.V. & Co. KG
Hauptverwaltung: Riesstr. 25, D-80992 München
Registergericht: Amtsgericht München, HRA 95603

Komplementärin: ORACLE Deutschland Verwaltung B.V.
Rijnzathe 6, 3454PV De Meern, Niederlande
Handelsregister der Handelskammer Midden-Niederlande, Nr. 30143697
Geschäftsführer: Jürgen Kunz, Marcel van de Molen, Alexander van der Ven

<http://www.oracle.com/commitment>
OFFICE-3317: explicit dependence from *:id to xml:id in schema

--- OpenDocument-v1.2-cd05-schema.rng.ORIG	Mon Aug  9 12:00:59 2010
+++ OpenDocument-v1.2-cd05-schema.rng	Mon Aug  9 12:19:58 2010
@@ -900,14 +900,16 @@
                 </attribute>
             </optional>
             <optional>
-                <attribute name="text:id">
-                    <ref name="NCName"/>
-                </attribute>
+                <group>
+                    <ref name="xml-id"/>
+                    <optional>
+                        <attribute name="text:id">
+                            <ref name="NCName"/>
+                        </attribute>
+                    </optional>
+                </group>
             </optional>
             <optional>
-                <ref name="xml-id"/>
-            </optional>
-            <optional>
                 <ref name="common-in-content-meta-attlist"/>
             </optional>
         </interleave>
@@ -1172,21 +1174,15 @@
         </element>
     </define>
     <define name="text-changed-region-attr">
-        <choice>
-            <ref name="text-changed-region-text-id"/>
-            <group>
-                <ref name="xml-id"/>
-                <optional>
-                    <ref name="text-changed-region-text-id"/>
-                </optional>
-            </group>
-        </choice>
+        <group>
+            <ref name="xml-id"/>
+            <optional>
+                <attribute name="text:id">
+                    <ref name="NCName"/>
+                </attribute>
+            </optional>
+        </group>
     </define>
-    <define name="text-changed-region-text-id">
-        <attribute name="text:id">
-            <ref name="NCName"/>
-        </attribute>
-    </define>
     <define name="text-changed-region-content">
         <choice>
             <element name="text:insertion">
@@ -5746,17 +5742,19 @@
                 </attribute>
             </optional>
             <optional>
-                <attribute name="draw:id">
-                    <ref name="NCName"/>
-                </attribute>
-            </optional>
-            <optional>
                 <attribute name="draw:nav-order">
                     <ref name="IDREFS"/>
                 </attribute>
             </optional>
             <optional>
-                <ref name="xml-id"/>
+                <group>
+                    <ref name="xml-id"/>
+                    <optional>
+                        <attribute name="draw:id">
+                            <ref name="NCName"/>
+                        </attribute>
+                    </optional>
+                </group>
             </optional>
         </interleave>
     </define>
@@ -6455,16 +6453,16 @@
         </optional>
     </define>
     <define name="common-draw-id-attlist">
-        <interleave>
-            <optional>
-                <attribute name="draw:id">
-                    <ref name="NCName"/>
-                </attribute>
-            </optional>
-            <optional>
+        <optional>
+            <group>
                 <ref name="xml-id"/>
-            </optional>
-        </interleave>
+                <optional>
+                    <attribute name="draw:id">
+                        <ref name="NCName"/>
+                    </attribute>
+                </optional>
+            </group>
+        </optional>
     </define>
     <define name="common-draw-z-index-attlist">
         <optional>
@@ -6723,13 +6721,15 @@
                 </attribute>
             </optional>
             <optional>
-                <attribute name="text:id">
-                    <ref name="NCName"/>
-                </attribute>
+                <group>
+                    <ref name="xml-id"/>
+                    <optional>
+                        <attribute name="text:id">
+                            <ref name="NCName"/>
+                        </attribute>
+                    </optional>
+                </group>
             </optional>
-            <optional>
-                <ref name="xml-id"/>
-            </optional>
         </interleave>
     </define>
     <define name="draw-image">
@@ -8047,13 +8047,15 @@
                 </attribute>
             </optional>
             <optional>
-                <attribute name="anim:id">
-                    <ref name="NCName"/>
-                </attribute>
+                <group>
+                    <ref name="xml-id"/>
+                    <optional>
+                        <attribute name="anim:id">
+                            <ref name="NCName"/>
+                        </attribute>
+                    </optional>
+                </group>
             </optional>
-            <optional>
-                <ref name="xml-id"/>
-            </optional>
         </interleave>
     </define>
     <define name="presentation-event-listener">
@@ -10782,15 +10784,14 @@
         </optional>
     </define>
     <define name="common-control-id-attlist">
-        <choice>
-            <ref name="common-control-form-id-attlist"/>
-            <group>
-                <ref name="xml-id"/>
-                <optional>
-                    <ref name="common-control-form-id-attlist"/>
-                </optional>
-            </group>
-        </choice>
+        <group>
+            <ref name="xml-id"/>
+            <optional>
+                <attribute name="form:id">
+                    <ref name="NCName"/>
+                </attribute>
+            </optional>
+        </group>
     </define>
     <define name="common-control-form-id-attlist">
         <attribute name="form:id">


[Date Prev] | [Thread Prev] | [Thread Next] | [Date Next] -- [Date Index] | [Thread Index] | [List Home]