Re: [office] OASIS-4110 polar handle

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

Hi Michael,

Michael Stahl schrieb am 18.11.2022 um 13:05:
> hi Regina,
>
> On 15.11.22 15:56, Regina Henschel wrote:
> > 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.
>
> a trivial stylistic quibble: i find the attribute names like 
> "handle-polar-poleX" inconsistent with the existing attributes - it 
> would be more consistent as "handle-polar-pole-x".

I agree with you. The updated proposal is attached.

> the correction of the wrong draw:handle-position attribute specification 
> (which the issue was originally filed for) isn't included, but perhaps 
> it doesn't matter because we say that the attribute shall be ignored 
> anyway.

It solves the issue by eliminating the problematic attributes in two 
steps and introduce new attributes which have a better design.

We could write as solution:
Introduce new better designed attributes /to be listed/ in ODF 1.4.
Deprecate attributes draw:handle-position and draw:handle-polar in ODF 
1.4 and exclude them from reading, but allow to write them for backward 
compatibility.
Remove attributes draw:handle-position and draw:handle-polar in ODF 1.5.

Kind regards,
Regina

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

diff --git a/OpenDocument-v1.3-schema_ODF13.rng b/OpenDocument-v1.3-schema_OASIS_4110_v4.rng
index dc77c4f..30291f2 100755
--- a/OpenDocument-v1.3-schema_ODF13.rng
+++ b/OpenDocument-v1.3-schema_OASIS_4110_v4.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-position-x">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:attribute name="draw:handle-position-y">
+            <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-pole-x">
+            <rng:ref name="string"/>
+          </rng:attribute>
+          <rng:attribute name="draw:handle-polar-pole-y">
+            <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">