Commit 00d0e6f0 authored by Morten Welinder's avatar Morten Welinder

Schema: update print setup.

parent a5de03a0
2014-03-10 Morten Welinder <terra@gnome.org>
* gnumeric.xsd: Update valign/halign attributes.
* gnumeric.xsd: Update valign/halign attributes. Update print
setup.
* src/sheet-filter.c (gnm_filter_condition_new_single)
(gnm_filter_condition_new_double): Add preconditions.
......
......@@ -11,6 +11,7 @@ Morten:
* Improve testing.
* Import/Export super/subscript fonts to xlsx. [Part of #726035]
* Import xlsx auto-filters. [#725460]
* Update Gnumeric schema.
--------------------------------------------------------------------------
Gnumeric 1.12.12
......
......@@ -350,6 +350,8 @@
<xs:element name="Footer" type="gnm:HeaderFooter"/>
<!-- typical values are A4, US-Letter -->
<xs:element name="paper" type="xs:string" minOccurs="0" maxOccurs="1"/>
<xs:element name="comments" type="gnm:PrintComments"/>
<xs:element name="errors" type="gnm:PrintErrors"/>
<!-- do not print this sheet when "all" is selected in the job -->
<xs:element name="do_not_print" minOccurs="0" maxOccurs="1">
<xs:complexType>
......@@ -363,15 +365,15 @@
<xs:complexType>
<xs:attribute name="value" use="required">
<xs:simpleType>
<xs:restriction base="xs:integer">
<xs:enumeration value="-1"/> <!-- PRINT_SAVED_INFO -->
<xs:enumeration value="0"/> <!-- PRINT_ACTIVE_SHEET -->
<xs:enumeration value="1"/> <!-- PRINT_ALL_SHEETS -->
<xs:enumeration value="2"/> <!-- PRINT_ALL_SHEETS_INCLUDING_HIDDEN -->
<xs:enumeration value="3"/> <!-- PRINT_SHEET_RANGE -->
<xs:enumeration value="4"/> <!-- PRINT_SHEET_SELECTION -->
<xs:enumeration value="5"/> <!-- PRINT_IGNORE_PRINTAREA -->
<xs:enumeration value="6"/> <!-- PRINT_SHEET_SELECTION_IGNORE_PRINTAREA -->
<xs:restriction base="xs:string">
<xs:enumeration value="GNM_PRINT_SAVED_INFO"/>
<xs:enumeration value="GNM_PRINT_ACTIVE_SHEET"/>
<xs:enumeration value="GNM_PRINT_ALL_SHEETS"/>
<xs:enumeration value="GNM_PRINT_ALL_SHEETS_INCLUDING_HIDDEN"/>
<xs:enumeration value="GNM_PRINT_SHEET_RANGE"/>
<xs:enumeration value="GNM_PRINT_SHEET_SELECTION"/>
<xs:enumeration value="GNM_PRINT_IGNORE_PRINTAREA"/>
<xs:enumeration value="GNM_PRINT_SHEET_SELECTION_IGNORE_PRINTAREA"/>
</xs:restriction>
</xs:simpleType>
</xs:attribute>
......@@ -388,6 +390,31 @@
<xs:anyAttribute namespace="##other" processContents="lax"/>
</xs:complexType>
<xs:complexType name="PrintComments">
<xs:attribute name="placement" type="gnm:PrintCommentsPlacement"/>
</xs:complexType>
<xs:simpleType name="PrintCommentsPlacement">
<xs:restriction base="xs:string">
<xs:enumeration value="GNM_PRINT_COMMENTS_NONE"/>
<xs:enumeration value="GNM_PRINT_COMMENTS_IN_PLACE"/>
<xs:enumeration value="GNM_PRINT_COMMENTS_AT_END"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="PrintErrors">
<xs:attribute name="PrintErrorsAs" type="gnm:PrintErrorsAs"/>
</xs:complexType>
<xs:simpleType name="PrintErrorsAs">
<xs:restriction base="xs:string">
<xs:enumeration value="GNM_PRINT_ERRORS_AS_DISPLAYED"/>
<xs:enumeration value="GNM_PRINT_ERRORS_AS_BLANK"/>
<xs:enumeration value="GNM_PRINT_ERRORS_AS_DASHES"/>
<xs:enumeration value="GNM_PRINT_ERRORS_AS_NA"/>
</xs:restriction>
</xs:simpleType>
<xs:complexType name="PageBreaks">
<xs:sequence>
<xs:element name="break" minOccurs="0" maxOccurs="unbounded">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment