[gnumeric] ods schema: update with new am-pm extension



commit 0b7dcb5e8d4bdf6be31243abfd7c9ff0983fd6c8
Author: Morten Welinder <terra gnome org>
Date:   Fri Jan 1 19:45:21 2016 -0500

    ods schema: update with new am-pm extension

 test/ods-ext-schema.patch |   53 ++++++++++++++++++++++++++++-----------------
 1 files changed, 33 insertions(+), 20 deletions(-)
---
diff --git a/test/ods-ext-schema.patch b/test/ods-ext-schema.patch
index 3d98426..b95b8e9 100644
--- a/test/ods-ext-schema.patch
+++ b/test/ods-ext-schema.patch
@@ -1,5 +1,5 @@
---- ods-schema/OpenDocument-v1.2-os-schema.rng 2015-04-08 21:49:54.058918977 -0600
-+++ ods-schema/OpenDocument-v1.2-os-ext-schema.rng     2015-06-05 13:07:06.067557896 -0600
+--- ods-schema/OpenDocument-v1.2-os-schema.rng 2015-01-28 18:46:19.155715877 -0500
++++ ods-schema/OpenDocument-v1.2-os-ext-schema.rng     2016-01-01 19:44:25.464059435 -0500
 @@ -62,6 +62,12 @@
        xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
        xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
@@ -253,7 +253,20 @@
                        <optional>
                                <attribute name="number:style">
                                        <choice>
-@@ -13097,7 +13187,15 @@
+@@ -13047,7 +13137,11 @@
+       </define>
+       <define name="number-am-pm">
+               <element name="number:am-pm">
+-                      <empty/>
++                      <optional>
++                              <attribute name="gnm:style">
++                                      <ref name="string"/>
++                              </attribute>
++                      </optional>
+               </element>
+       </define>
+       <define name="number-boolean-style">
+@@ -13097,7 +13191,15 @@
        </define>
        <define name="number-text">
                <element name="number:text">
@@ -270,7 +283,7 @@
                </element>
        </define>
        <define name="number-text-content">
-@@ -13169,6 +13267,11 @@
+@@ -13169,6 +13271,11 @@
                                        </choice>
                                </attribute>
                        </optional>
@@ -282,7 +295,7 @@
                </interleave>
        </define>
        <define name="common-auto-reorder-attlist">
-@@ -13203,6 +13306,11 @@
+@@ -13203,6 +13310,11 @@
                                </attribute>
                        </optional>
                        <optional>
@@ -294,7 +307,7 @@
                                <attribute name="number:grouping">
                                        <ref name="boolean"/>
                                </attribute>
-@@ -14101,6 +14209,22 @@
+@@ -14101,6 +14213,22 @@
                                        <ref name="string"/>
                                </attribute>
                        </optional>
@@ -317,7 +330,7 @@
                </interleave>
        </define>
        <define name="draw-stroke-dash">
-@@ -14383,6 +14507,21 @@
+@@ -14383,6 +14511,21 @@
                                        <ref name="boolean"/>
                                </attribute>
                        </optional>
@@ -339,7 +352,7 @@
                </interleave>
        </define>
        <define name="style-page-layout-properties-elements">
-@@ -14874,11 +15013,33 @@
+@@ -14874,11 +15017,33 @@
                                </attribute>
                        </optional>
                        <optional>
@@ -373,7 +386,7 @@
                                <attribute name="style:text-line-through-mode">
                                        <ref name="lineMode"/>
                                </attribute>
-@@ -15090,6 +15251,18 @@
+@@ -15090,6 +15255,18 @@
        <define name="style-paragraph-properties-attlist">
                <interleave>
                        <optional>
@@ -392,7 +405,7 @@
                                <attribute name="fo:line-height">
                                        <choice>
                                                <value>normal</value>
-@@ -15461,14 +15634,21 @@
+@@ -15461,14 +15638,21 @@
                </optional>
        </define>
        <define name="common-background-color-attlist">
@@ -421,7 +434,7 @@
        </define>
        <define name="style-background-image">
                <optional>
-@@ -15564,6 +15744,36 @@
+@@ -15564,6 +15748,36 @@
                                <ref name="string"/>
                        </attribute>
                </optional>
@@ -458,7 +471,7 @@
        </define>
        <define name="common-border-line-width-attlist">
                <optional>
-@@ -15904,6 +16114,37 @@
+@@ -15904,6 +16118,37 @@
                                        <ref name="boolean"/>
                                </attribute>
                        </optional>
@@ -496,7 +509,7 @@
                </interleave>
        </define>
        <define name="style-table-properties-elements">
-@@ -16004,6 +16245,11 @@
+@@ -16004,6 +16249,11 @@
                                </attribute>
                        </optional>
                        <optional>
@@ -508,7 +521,7 @@
                                <attribute name="style:text-align-source">
                                        <choice>
                                                <value>fix</value>
-@@ -16028,6 +16274,16 @@
+@@ -16028,6 +16278,16 @@
                        <ref name="common-background-color-attlist"/>
                        <ref name="common-border-attlist"/>
                        <optional>
@@ -525,7 +538,7 @@
                                <attribute name="style:diagonal-tl-br">
                                        <ref name="string"/>
                                </attribute>
-@@ -16104,6 +16360,16 @@
+@@ -16104,6 +16364,16 @@
                                        <ref name="boolean"/>
                                </attribute>
                        </optional>
@@ -542,7 +555,7 @@
                </interleave>
        </define>
        <define name="common-style-direction-attlist">
-@@ -17060,6 +17326,46 @@
+@@ -17060,6 +17330,46 @@
                                        <ref name="nonNegativeInteger"/>
                                </attribute>
                        </optional>
@@ -589,7 +602,7 @@
                </interleave>
        </define>
        <define name="style-graphic-fill-properties-attlist">
-@@ -17388,6 +17694,10 @@
+@@ -17388,6 +17698,10 @@
                                                <value>none</value>
                                                <value>cubic-spline</value>
                                                <value>b-spline</value>
@@ -600,7 +613,7 @@
                                        </choice>
                                </attribute>
                        </optional>
-@@ -17661,6 +17971,10 @@
+@@ -17661,6 +17975,10 @@
                                                <value>logarithmic</value>
                                                <value>exponential</value>
                                                <value>power</value>
@@ -611,7 +624,7 @@
                                        </choice>
                                </attribute>
                        </optional>
-@@ -17697,6 +18011,62 @@
+@@ -17697,6 +18015,62 @@
                                        <ref name="boolean"/>
                                </attribute>
                        </optional>
@@ -674,7 +687,7 @@
                </interleave>
        </define>
        <define name="labelPositions">
-@@ -18124,4 +18494,85 @@
+@@ -18124,4 +18498,85 @@
                        </element>
                </zeroOrMore>
        </define>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]