OASIS-4110 polar handle

[Regina Henschel <regina.henschel@libreoffice.org>]

Hi members,

please have a look, whether the attached version is OK for you. It would 
be good to get feedback before Monday, so that I have time to 
incorporate your modification requests and we can decide on the proposal 
on Monday.

Kind regards,
Regina

diff --git a/OpenDocument-v1.3-schema_ODF13.rng b/OpenDocument-v1.3-schema_OASIS_4110_v3.rng
index dc77c4f..69362dd 100755
--- a/OpenDocument-v1.3-schema_ODF13.rng
+++ b/OpenDocument-v1.3-schema_OASIS_4110_v3.rng
@@ -5192,6 +5192,64 @@
   </rng:define>
   <rng:define name="draw-handle-attlist">
     <rng:interleave>
+      <rng:choice>
+        <rng:group> <!-- XY-handle -->
+          <rng:attribute name="draw:handle-positionX">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:attribute name="draw:handle-positionY">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:optional>
+            <rng:attribute name="draw:handle-range-x-minimum">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="draw:handle-range-x-maximum">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="draw:handle-range-y-minimum">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="draw:handle-range-y-maximum">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+        </rng:group>
+        <rng:group> <!-- polar handle -->
+          <rng:attribute name="draw:handle-polar-poleX">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:attribute name="draw:handle-polar-poleY">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:optional>
+            <rng:attribute name="draw:handle-polar-radius">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="draw:handle-polar-angle">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="draw:handle-radius-range-minimum">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+          <rng:optional>
+            <rng:attribute name="draw:handle-radius-range-maximum">
+              <rng:ref name="string"/>
+            </rng:attribute>
+          </rng:optional>
+        </rng:group>
+      </rng:choice>
       <rng:optional>
         <rng:attribute name="draw:handle-mirror-vertical">
           <rng:ref name="boolean"/>
@@ -5207,26 +5265,9 @@
           <rng:ref name="boolean"/>
         </rng:attribute>
       </rng:optional>
-      <rng:attribute name="draw:handle-position">
-        <rng:ref name="string"/>
-      </rng:attribute>
-      <rng:optional>
-        <rng:attribute name="draw:handle-range-x-minimum">
-          <rng:ref name="string"/>
-        </rng:attribute>
-      </rng:optional>
+      <!-- The attributes draw:handle-position and draw:handle-polar are deprecated. -->
       <rng:optional>
-        <rng:attribute name="draw:handle-range-x-maximum">
-          <rng:ref name="string"/>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="draw:handle-range-y-minimum">
-          <rng:ref name="string"/>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="draw:handle-range-y-maximum">
+        <rng:attribute name="draw:handle-position">
           <rng:ref name="string"/>
         </rng:attribute>
       </rng:optional>
@@ -5235,16 +5276,6 @@
           <rng:ref name="string"/>
         </rng:attribute>
       </rng:optional>
-      <rng:optional>
-        <rng:attribute name="draw:handle-radius-range-minimum">
-          <rng:ref name="string"/>
-        </rng:attribute>
-      </rng:optional>
-      <rng:optional>
-        <rng:attribute name="draw:handle-radius-range-maximum">
-          <rng:ref name="string"/>
-        </rng:attribute>
-      </rng:optional>
     </rng:interleave>
   </rng:define>
   <rng:define name="draw-hatch">

Attachment: OASIS-4110 PolarHandle ODF 14 TCv2.odt
Description: application/vnd.oasis.opendocument.text