19.615.2 <table:filter-condition>: Extend table:data-type attributes to filter by color

Section 19.615.2 <table:filter-condition> changes to: The table:data-type attribute specifies whether a comparison shall take place as text, numeric values, or as color. The defined values for the table:data-type attribute are: * number: comparison as numeric values. * text: comparison as text values. * text-color: comparison based on the text color. The value "window-font-color" specifies the default text color, as specified in 20.395 style:use-window-font-color. Text color assigned by data styles [REF 16.29] is not considered. * data-style-color: comparison based on the text color applied by a data style [REF 16.29] . * background-color: comparison based on the cell background color, as determined by the applicable <style:table-cell-properties> element. A <table:filter-condition> element that is a descendant of <table:data-pilot-table> [9.6.3] and has a table:data-type attribute with value text-color, data-style-color or background-color is ignored. For a <table:filter-condition> 9.5.5 element the default value for this attribute is text. 19.688 table:operator change last sentence: Depending on the value of the table:data-type 19.388 attribute, all operations take place on strings or numeric values or color values. Only = and != operations are allowed on color values. 19.711 table:search-criteria-must-apply-to-whole-cell add inside the note: "has the value text" -> "has the value text or text-color or data-style-color" Diff 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..ddf6326 100644 --- a/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng +++ b/src/main/resources/odf1.3/OpenDocument-v1.3-schema.rng @@ -14901,12 +14901,6 @@ <rng:attribute name="table:field-number"> <rng:ref name="nonNegativeInteger"/> </rng:attribute> - <rng:attribute name="table:value"> - <rng:choice> - <rng:ref name="string"/> - <rng:ref name="double"/> - </rng:choice> - </rng:attribute> <rng:attribute name="table:operator"> <rng:ref name="string"/> </rng:attribute> @@ -14915,14 +14909,51 @@ <rng:ref name="string"/> </rng:attribute> </rng:optional> - <rng:optional> - <rng:attribute name="table:data-type"> - <rng:choice> - <rng:value>text</rng:value> - <rng:value>number</rng:value> - </rng:choice> - </rng:attribute> - </rng:optional> + <rng:choice> + <rng:group> + <rng:optional> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>text</rng:value> + <rng:value>number</rng:value> + </rng:choice> + </rng:attribute> + </rng:optional> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="string"/> + <rng:ref name="double"/> + </rng:choice> + </rng:attribute> + </rng:group> + <rng:group> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>text-color</rng:value> + <rng:value>data-style-color</rng:value> + </rng:choice> + </rng:attribute> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="color"/> + <rng:value>window-font-color</rng:value> + </rng:choice> + </rng:attribute> + </rng:group> + <rng:group> + <rng:attribute name="table:data-type"> + <rng:choice> + <rng:value>background-color</rng:value> + </rng:choice> + </rng:attribute> + <rng:attribute name="table:value"> + <rng:choice> + <rng:ref name="color"/> + <rng:value>transparent</rng:value> + </rng:choice> + </rng:attribute> + </rng:group> + </rng:choice> </rng:interleave> </rng:define> <rng:define name="table-filter-or">

Resolve as proposed: 19.617.2 <table:filter-condition> The table:data-type attribute specifies whether a comparison shall take place as text, numeric values, or as color. The defined values for the table:data-type attribute are: • number : comparison as numeric values. • text : comparison as text values. • text-color : comparison based on the text color. The value "window-font-color" specifies the default text color, as specified in style:use-window-font-color 20.399. Text color assigned by data styles 16.29 is not considered. • data-style-color : comparison based on the text color applied by a data style 16.29. The value "window-font-color" specifies the default text color, as specified in style:use-window-font-color 20.399. • background-color : comparison based on the cell background color, as determined by the applicable <style:table-cell-properties> 17.18 element. A <table:filter-condition> 9.5.5 element that is a descendant of <table:data-pilot-table> 9.6.3 and has a table:data-type attribute with value text-color , data-style-color or background-color is ignored. For a <table:filter-condition> 9.5.5 element the default value for this attribute is text . 19.690 table:operator ... Depending on the value of the table:data-type 19.389 attribute, all operations take place on string or numeric, or color values. Only = and != operations are allowed on color values. 19.713 table:search-criteria-must-apply-to-whole-cell The table:search-criteria-must-apply-to-whole-cell attribute specifies whether a search pattern matches the entire content of a cell. Note: The table:search-criteria-must-apply-to-whole-cell is used with the <table:filter-condition> 19.602 element when the table:data-type 19.617 attribute has the value text or text-color or data-style-color and the table:operator 9.5.5 attribute has a value of: match , Unable to render embedded object: File (match}}, {{=}}, or {{) not found. = . The defined values ...