new attribute for list level format string

add following new sections: 19.xyz style:num-list-format-name The number:num-list-format-name attribute references a format for the displayed number string of the current list level. If the attribute is present, text:display-levels [REF 19.803] , style:num-prefix [REF 19.506] and style:num-suffix [REF 19.507] shall be ignored. Producers should also generate text:display-levels, style:num-prefix and style:num-suffix attributes for the benefit of consumers that don't support this feature. 16.xyz <number:num-list-format> The <number:num-list-format> element defines a format for the displayed number string of a list level. 16.xyz <number:num-list-label> For display, at every list item these placeholders are replaced by the item’s list number corresponding to the list level specified by the text:level [REF 19.834] attribute, formatted according to the style:num-format [REF 19.504] attribute of the placeholder’s list level. Any placeholder specifying a list level higher than the list level containing the style:num-list-format-name attribute shall be ignored. change these sections: 19.502 style:name 19.502.2 <number:boolean-style>, <number:currency-style>, <number:date-style>, <number:number-style>, <number:percentage-style>, <number:text-style>, <number:time-style>, <style:master-page>, <style:page-layout>, <style:presentation-page-layout>, <style:style>, <text:list-style>, <text:outline-style> add <number:num-list-format> to the heading, and a item to the list: displayed list number string format schema change: diff --git a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng index dc77c4f..30ce4d0 100644 --- a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng +++ b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng @@ -2155,20 +2155,27 @@ <rng:attribute name="style:num-prefix"> <rng:ref name="string"/> </rng:attribute> </rng:optional> <rng:optional> <rng:attribute name="style:num-suffix"> <rng:ref name="string"/> </rng:attribute> </rng:optional> </rng:define> + <rng:define name="common-num-list-format-name-attlist"> + <rng:optional> + <rng:attribute name="style:num-list-format-name"> + <rng:ref name="styleNameRef"/> + </rng:attribute> + </rng:optional> + </rng:define> <rng:define name="common-number-attlist"> <rng:interleave> <rng:optional> <rng:attribute name="number:min-integer-digits"> <rng:ref name="integer"/> </rng:attribute> </rng:optional> <rng:optional> <rng:attribute name="number:grouping"> <rng:ref name="boolean"/> @@ -7252,20 +7259,39 @@ <rng:optional> <rng:attribute name="number:style"> <rng:choice> <rng:value>short</rng:value> <rng:value>long</rng:value> </rng:choice> </rng:attribute> </rng:optional> </rng:interleave> </rng:define> + <rng:define name="number-num-list-format"> + <rng:element name="number:num-list-format"> + <rng:attribute name="style:name"> + <rng:ref name="styleName"/> + </rng:attribute> + <rng:interleave> + <rng:zeroOrMore> + <rng:element name="number:num-list-label"> + <rng:attribute name="text:level"> + <rng:ref name="positiveInteger"/> + </rng:attribute> + </rng:element> + </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="number-text"/> + </rng:zeroOrMore> + </rng:interleave> + </rng:element> + </rng:define> <rng:define name="number-number"> <rng:element name="number:number"> <rng:ref name="number-number-attlist"/> <rng:ref name="common-decimal-places-attlist"/> <rng:ref name="common-number-attlist"/> <rng:zeroOrMore> <rng:ref name="number-embedded-text"/> </rng:zeroOrMore> </rng:element> </rng:define> @@ -13630,20 +13656,23 @@ </rng:list> </rng:define> <rng:define name="styles"> <rng:interleave> <rng:zeroOrMore> <rng:ref name="style-style"/> </rng:zeroOrMore> <rng:zeroOrMore> <rng:ref name="text-list-style"/> </rng:zeroOrMore> + <rng:zeroOrMore> + <rng:ref name="number-num-list-format"/> + </rng:zeroOrMore> <rng:zeroOrMore> <rng:ref name="number-number-style"/> </rng:zeroOrMore> <rng:zeroOrMore> <rng:ref name="number-currency-style"/> </rng:zeroOrMore> <rng:zeroOrMore> <rng:ref name="number-percentage-style"/> </rng:zeroOrMore> <rng:zeroOrMore> @@ -17346,20 +17375,21 @@ </rng:define> <rng:define name="text-list-level-style-number-attr"> <rng:interleave> <rng:optional> <rng:attribute name="text:style-name"> <rng:ref name="styleNameRef"/> </rng:attribute> </rng:optional> <rng:ref name="common-num-format-attlist"/> <rng:ref name="common-num-format-prefix-suffix-attlist"/> + <rng:ref name="common-num-list-format-name-attlist"/> <rng:optional> <rng:attribute name="text:display-levels"> <rng:ref name="positiveInteger"/> </rng:attribute> </rng:optional> <rng:optional> <rng:attribute name="text:start-value"> <rng:ref name="positiveInteger"/> </rng:attribute> </rng:optional> @@ -17645,20 +17675,21 @@ <rng:attribute name="text:level"> <rng:ref name="positiveInteger"/> </rng:attribute> <rng:optional> <rng:attribute name="text:style-name"> <rng:ref name="styleNameRef"/> </rng:attribute> </rng:optional> <rng:ref name="common-num-format-attlist"/> <rng:ref name="common-num-format-prefix-suffix-attlist"/> + <rng:ref name="common-num-list-format-name-attlist"/> <rng:optional> <rng:attribute name="text:display-levels"> <rng:ref name="positiveInteger"/> </rng:attribute> </rng:optional> <rng:optional> <rng:attribute name="text:start-value"> <rng:ref name="positiveInteger"/> </rng:attribute> </rng:optional>

16.29.30 <number:num-list-format> The <number:num-list-format> element defines a format for the displayed number string of a list level. 16.29.31 <number:num-list-label> For display, at every list item these placeholders are replaced by the item’s list number corresponding to the list level specified by the text:level 19.836 attribute, formatted according to the style:num-format 19.505 attribute of the placeholder’s list level. Any placeholder specifying a list level higher than the list level containing the style:num-list-format-name 19.507 attribute shall be ignored. 19.922 style:num-list-format-name The style:num-list-format-name attribute references a format for the displayed number string of the current list level. If the attribute is present, text:display-levels 19.805, style:num-prefix 19.508 and style:num-suffix 19.509 shall be ignored. Producers should also generate text:display-levels , style:num-prefix and style:num-suffix attributes for the benefit of consumers that don't support this feature.