RubyGems - caxlsx - Versions diffs - 3.1.1 → 3.2.0 - Mend

caxlsx 3.1.1 → 3.2.0

Files changed (294) hide show

checksums.yaml +4 -4
data/.yardopts +9 -9
data/.yardopts_guide +18 -18
data/CHANGELOG.md +354 -343
data/LICENSE +21 -21
data/README.md +168 -172
data/Rakefile +29 -29
data/examples/generate.rb +15 -15
data/lib/axlsx/content_type/abstract_content_type.rb +32 -32
data/lib/axlsx/content_type/content_type.rb +26 -26
data/lib/axlsx/content_type/default.rb +25 -25
data/lib/axlsx/content_type/override.rb +25 -25
data/lib/axlsx/doc_props/app.rb +235 -235
data/lib/axlsx/doc_props/core.rb +39 -39
data/lib/axlsx/drawing/area_chart.rb +99 -99
data/lib/axlsx/drawing/area_series.rb +110 -110
data/lib/axlsx/drawing/ax_data_source.rb +26 -26
data/lib/axlsx/drawing/axes.rb +61 -61
data/lib/axlsx/drawing/axis.rb +190 -190
data/lib/axlsx/drawing/bar_3D_chart.rb +148 -148
data/lib/axlsx/drawing/bar_chart.rb +138 -138
data/lib/axlsx/drawing/bar_series.rb +97 -97
data/lib/axlsx/drawing/bubble_chart.rb +59 -59
data/lib/axlsx/drawing/bubble_series.rb +63 -63
data/lib/axlsx/drawing/cat_axis.rb +85 -85
data/lib/axlsx/drawing/chart.rb +276 -276
data/lib/axlsx/drawing/d_lbls.rb +90 -90
data/lib/axlsx/drawing/drawing.rb +167 -167
data/lib/axlsx/drawing/graphic_frame.rb +54 -54
data/lib/axlsx/drawing/hyperlink.rb +100 -100
data/lib/axlsx/drawing/line_3D_chart.rb +68 -68
data/lib/axlsx/drawing/line_chart.rb +99 -99
data/lib/axlsx/drawing/line_series.rb +110 -110
data/lib/axlsx/drawing/marker.rb +84 -84
data/lib/axlsx/drawing/num_data.rb +52 -52
data/lib/axlsx/drawing/num_data_source.rb +62 -62
data/lib/axlsx/drawing/num_val.rb +34 -34
data/lib/axlsx/drawing/one_cell_anchor.rb +99 -99
data/lib/axlsx/drawing/pic.rb +211 -211
data/lib/axlsx/drawing/picture_locking.rb +42 -42
data/lib/axlsx/drawing/pie_3D_chart.rb +47 -47
data/lib/axlsx/drawing/pie_series.rb +74 -74
data/lib/axlsx/drawing/scaling.rb +60 -60
data/lib/axlsx/drawing/scatter_chart.rb +74 -74
data/lib/axlsx/drawing/scatter_series.rb +129 -98
data/lib/axlsx/drawing/ser_axis.rb +45 -45
data/lib/axlsx/drawing/series.rb +69 -69
data/lib/axlsx/drawing/series_title.rb +25 -25
data/lib/axlsx/drawing/str_data.rb +42 -42
data/lib/axlsx/drawing/str_val.rb +34 -34
data/lib/axlsx/drawing/title.rb +97 -97
data/lib/axlsx/drawing/two_cell_anchor.rb +97 -97
data/lib/axlsx/drawing/val_axis.rb +37 -37
data/lib/axlsx/drawing/view_3D.rb +115 -115
data/lib/axlsx/drawing/vml_drawing.rb +42 -42
data/lib/axlsx/drawing/vml_shape.rb +66 -66
data/lib/axlsx/package.rb +388 -388
data/lib/axlsx/rels/relationship.rb +130 -130
data/lib/axlsx/rels/relationships.rb +32 -32
data/lib/axlsx/stylesheet/border.rb +73 -71
data/lib/axlsx/stylesheet/border_pr.rb +71 -71
data/lib/axlsx/stylesheet/cell_alignment.rb +132 -132
data/lib/axlsx/stylesheet/cell_protection.rb +41 -41
data/lib/axlsx/stylesheet/cell_style.rb +72 -72
data/lib/axlsx/stylesheet/color.rb +76 -76
data/lib/axlsx/stylesheet/dxf.rb +79 -79
data/lib/axlsx/stylesheet/fill.rb +35 -35
data/lib/axlsx/stylesheet/font.rb +156 -156
data/lib/axlsx/stylesheet/gradient_fill.rb +103 -103
data/lib/axlsx/stylesheet/gradient_stop.rb +37 -37
data/lib/axlsx/stylesheet/num_fmt.rb +86 -86
data/lib/axlsx/stylesheet/pattern_fill.rb +73 -73
data/lib/axlsx/stylesheet/styles.rb +494 -420
data/lib/axlsx/stylesheet/table_style.rb +54 -54
data/lib/axlsx/stylesheet/table_style_element.rb +77 -77
data/lib/axlsx/stylesheet/table_styles.rb +46 -46
data/lib/axlsx/stylesheet/xf.rb +147 -147
data/lib/axlsx/util/accessors.rb +64 -64
data/lib/axlsx/util/constants.rb +410 -401
data/lib/axlsx/util/mime_type_utils.rb +11 -11
data/lib/axlsx/util/options_parser.rb +16 -16
data/lib/axlsx/util/serialized_attributes.rb +89 -89
data/lib/axlsx/util/simple_typed_list.rb +179 -179
data/lib/axlsx/util/storage.rb +146 -146
data/lib/axlsx/util/validators.rb +312 -312
data/lib/axlsx/util/zip_command.rb +73 -73
data/lib/axlsx/version.rb +5 -5
data/lib/axlsx/workbook/defined_name.rb +128 -128
data/lib/axlsx/workbook/defined_names.rb +21 -21
data/lib/axlsx/workbook/shared_strings_table.rb +77 -77
data/lib/axlsx/workbook/workbook.rb +395 -370
data/lib/axlsx/workbook/workbook_view.rb +80 -80
data/lib/axlsx/workbook/workbook_views.rb +22 -22
data/lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb +77 -77
data/lib/axlsx/workbook/worksheet/auto_filter/filter_column.rb +94 -94
data/lib/axlsx/workbook/worksheet/auto_filter/filters.rb +244 -244
data/lib/axlsx/workbook/worksheet/break.rb +35 -35
data/lib/axlsx/workbook/worksheet/cell.rb +506 -505
data/lib/axlsx/workbook/worksheet/cell_serializer.rb +164 -164
data/lib/axlsx/workbook/worksheet/cfvo.rb +60 -60
data/lib/axlsx/workbook/worksheet/cfvos.rb +18 -18
data/lib/axlsx/workbook/worksheet/col.rb +145 -145
data/lib/axlsx/workbook/worksheet/col_breaks.rb +35 -35
data/lib/axlsx/workbook/worksheet/color_scale.rb +110 -110
data/lib/axlsx/workbook/worksheet/cols.rb +23 -23
data/lib/axlsx/workbook/worksheet/comment.rb +91 -91
data/lib/axlsx/workbook/worksheet/comments.rb +82 -82
data/lib/axlsx/workbook/worksheet/conditional_formatting.rb +82 -82
data/lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb +220 -220
data/lib/axlsx/workbook/worksheet/conditional_formattings.rb +25 -25
data/lib/axlsx/workbook/worksheet/data_bar.rb +129 -129
data/lib/axlsx/workbook/worksheet/data_validation.rb +246 -246
data/lib/axlsx/workbook/worksheet/data_validations.rb +28 -28
data/lib/axlsx/workbook/worksheet/date_time_converter.rb +30 -30
data/lib/axlsx/workbook/worksheet/dimension.rb +64 -64
data/lib/axlsx/workbook/worksheet/header_footer.rb +52 -52
data/lib/axlsx/workbook/worksheet/icon_set.rb +81 -81
data/lib/axlsx/workbook/worksheet/merged_cells.rb +37 -37
data/lib/axlsx/workbook/worksheet/outline_pr.rb +33 -33
data/lib/axlsx/workbook/worksheet/page_margins.rb +97 -97
data/lib/axlsx/workbook/worksheet/page_set_up_pr.rb +44 -44
data/lib/axlsx/workbook/worksheet/page_setup.rb +240 -240
data/lib/axlsx/workbook/worksheet/pane.rb +139 -139
data/lib/axlsx/workbook/worksheet/pivot_table.rb +296 -294
data/lib/axlsx/workbook/worksheet/pivot_table_cache_definition.rb +66 -66
data/lib/axlsx/workbook/worksheet/pivot_tables.rb +24 -24
data/lib/axlsx/workbook/worksheet/print_options.rb +39 -39
data/lib/axlsx/workbook/worksheet/protected_range.rb +47 -47
data/lib/axlsx/workbook/worksheet/protected_ranges.rb +37 -37
data/lib/axlsx/workbook/worksheet/rich_text.rb +55 -55
data/lib/axlsx/workbook/worksheet/rich_text_run.rb +250 -250
data/lib/axlsx/workbook/worksheet/row.rb +164 -164
data/lib/axlsx/workbook/worksheet/row_breaks.rb +33 -33
data/lib/axlsx/workbook/worksheet/selection.rb +101 -101
data/lib/axlsx/workbook/worksheet/sheet_calc_pr.rb +29 -29
data/lib/axlsx/workbook/worksheet/sheet_data.rb +27 -27
data/lib/axlsx/workbook/worksheet/sheet_pr.rb +87 -87
data/lib/axlsx/workbook/worksheet/sheet_protection.rb +118 -118
data/lib/axlsx/workbook/worksheet/sheet_view.rb +213 -213
data/lib/axlsx/workbook/worksheet/table.rb +102 -102
data/lib/axlsx/workbook/worksheet/table_style_info.rb +49 -49
data/lib/axlsx/workbook/worksheet/tables.rb +34 -34
data/lib/axlsx/workbook/worksheet/worksheet.rb +786 -768
data/lib/axlsx/workbook/worksheet/worksheet_comments.rb +58 -58
data/lib/axlsx/workbook/worksheet/worksheet_drawing.rb +58 -58
data/lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb +74 -74
data/lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb +38 -38
data/lib/axlsx.rb +185 -171
data/lib/caxlsx.rb +2 -2
data/lib/schema/dc.xsd +118 -118
data/lib/schema/dcmitype.xsd +51 -51
data/lib/schema/dcterms.xsd +331 -331
data/lib/schema/dml-chartDrawing.xsd +146 -146
data/lib/schema/dml-compatibility.xsd +14 -14
data/lib/schema/dml-lockedCanvas.xsd +11 -11
data/lib/schema/dml-main.xsd +3048 -3048
data/lib/schema/dml-picture.xsd +23 -23
data/lib/schema/dml-spreadsheetDrawing.xsd +185 -185
data/lib/schema/dml-wordprocessingDrawing.xsd +185 -185
data/lib/schema/shared-additionalCharacteristics.xsd +28 -28
data/lib/schema/shared-bibliography.xsd +144 -144
data/lib/schema/shared-commonSimpleTypes.xsd +166 -166
data/lib/schema/shared-customXmlDataProperties.xsd +25 -25
data/lib/schema/shared-customXmlSchemaProperties.xsd +18 -18
data/lib/schema/shared-documentPropertiesCustom.xsd +59 -59
data/lib/schema/shared-documentPropertiesExtended.xsd +56 -56
data/lib/schema/shared-documentPropertiesVariantTypes.xsd +195 -195
data/lib/schema/shared-relationshipReference.xsd +25 -25
data/lib/schema/vml-main.xsd +569 -569
data/lib/schema/vml-officeDrawing.xsd +509 -509
data/lib/schema/vml-presentationDrawing.xsd +12 -12
data/lib/schema/vml-spreadsheetDrawing.xsd +108 -108
data/lib/schema/vml-wordprocessingDrawing.xsd +96 -96
data/lib/schema/xml.xsd +116 -116
data/test/benchmark.rb +72 -72
data/test/content_type/tc_content_type.rb +76 -76
data/test/content_type/tc_default.rb +16 -16
data/test/content_type/tc_override.rb +14 -14
data/test/doc_props/tc_app.rb +43 -43
data/test/doc_props/tc_core.rb +42 -42
data/test/drawing/tc_area_chart.rb +39 -39
data/test/drawing/tc_area_series.rb +71 -71
data/test/drawing/tc_axes.rb +7 -7
data/test/drawing/tc_axis.rb +112 -112
data/test/drawing/tc_bar_3D_chart.rb +86 -86
data/test/drawing/tc_bar_chart.rb +86 -86
data/test/drawing/tc_bar_series.rb +46 -46
data/test/drawing/tc_bubble_chart.rb +44 -44
data/test/drawing/tc_bubble_series.rb +21 -21
data/test/drawing/tc_cat_axis.rb +31 -31
data/test/drawing/tc_cat_axis_data.rb +27 -27
data/test/drawing/tc_chart.rb +123 -123
data/test/drawing/tc_d_lbls.rb +57 -57
data/test/drawing/tc_data_source.rb +23 -23
data/test/drawing/tc_drawing.rb +80 -80
data/test/drawing/tc_graphic_frame.rb +27 -27
data/test/drawing/tc_hyperlink.rb +64 -64
data/test/drawing/tc_line_3d_chart.rb +47 -47
data/test/drawing/tc_line_chart.rb +39 -39
data/test/drawing/tc_line_series.rb +71 -71
data/test/drawing/tc_marker.rb +44 -44
data/test/drawing/tc_named_axis_data.rb +27 -27
data/test/drawing/tc_num_data.rb +31 -31
data/test/drawing/tc_num_val.rb +29 -29
data/test/drawing/tc_one_cell_anchor.rb +66 -66
data/test/drawing/tc_pic.rb +103 -103
data/test/drawing/tc_picture_locking.rb +72 -72
data/test/drawing/tc_pie_3D_chart.rb +28 -28
data/test/drawing/tc_pie_series.rb +33 -33
data/test/drawing/tc_scaling.rb +36 -36
data/test/drawing/tc_scatter_chart.rb +48 -48
data/test/drawing/tc_scatter_series.rb +74 -56
data/test/drawing/tc_ser_axis.rb +31 -31
data/test/drawing/tc_series.rb +23 -23
data/test/drawing/tc_series_title.rb +54 -54
data/test/drawing/tc_str_data.rb +18 -18
data/test/drawing/tc_str_val.rb +30 -30
data/test/drawing/tc_title.rb +70 -70
data/test/drawing/tc_two_cell_anchor.rb +36 -36
data/test/drawing/tc_val_axis.rb +24 -24
data/test/drawing/tc_view_3D.rb +54 -54
data/test/drawing/tc_vml_drawing.rb +25 -25
data/test/drawing/tc_vml_shape.rb +106 -106
data/test/profile.rb +24 -24
data/test/rels/tc_relationship.rb +52 -52
data/test/rels/tc_relationships.rb +37 -37
data/test/stylesheet/tc_border.rb +37 -37
data/test/stylesheet/tc_border_pr.rb +32 -32
data/test/stylesheet/tc_cell_alignment.rb +81 -81
data/test/stylesheet/tc_cell_protection.rb +29 -29
data/test/stylesheet/tc_cell_style.rb +57 -57
data/test/stylesheet/tc_color.rb +43 -43
data/test/stylesheet/tc_dxf.rb +81 -81
data/test/stylesheet/tc_fill.rb +18 -18
data/test/stylesheet/tc_font.rb +133 -133
data/test/stylesheet/tc_gradient_fill.rb +72 -72
data/test/stylesheet/tc_gradient_stop.rb +31 -31
data/test/stylesheet/tc_num_fmt.rb +30 -30
data/test/stylesheet/tc_pattern_fill.rb +43 -43
data/test/stylesheet/tc_styles.rb +309 -261
data/test/stylesheet/tc_table_style.rb +44 -44
data/test/stylesheet/tc_table_style_element.rb +45 -45
data/test/stylesheet/tc_table_styles.rb +29 -29
data/test/stylesheet/tc_xf.rb +120 -120
data/test/tc_axlsx.rb +109 -109
data/test/tc_helper.rb +10 -10
data/test/tc_package.rb +317 -314
data/test/util/tc_mime_type_utils.rb +13 -13
data/test/util/tc_serialized_attributes.rb +19 -19
data/test/util/tc_simple_typed_list.rb +77 -77
data/test/util/tc_validators.rb +210 -210
data/test/workbook/tc_defined_name.rb +49 -49
data/test/workbook/tc_shared_strings_table.rb +59 -59
data/test/workbook/tc_workbook.rb +165 -160
data/test/workbook/tc_workbook_view.rb +50 -50
data/test/workbook/worksheet/auto_filter/tc_auto_filter.rb +38 -38
data/test/workbook/worksheet/auto_filter/tc_filter_column.rb +76 -76
data/test/workbook/worksheet/auto_filter/tc_filters.rb +50 -50
data/test/workbook/worksheet/tc_break.rb +49 -49
data/test/workbook/worksheet/tc_cell.rb +465 -453
data/test/workbook/worksheet/tc_cfvo.rb +31 -31
data/test/workbook/worksheet/tc_col.rb +93 -93
data/test/workbook/worksheet/tc_color_scale.rb +58 -58
data/test/workbook/worksheet/tc_comment.rb +72 -72
data/test/workbook/worksheet/tc_comments.rb +57 -57
data/test/workbook/worksheet/tc_conditional_formatting.rb +224 -224
data/test/workbook/worksheet/tc_data_bar.rb +46 -46
data/test/workbook/worksheet/tc_data_validation.rb +265 -265
data/test/workbook/worksheet/tc_date_time_converter.rb +124 -124
data/test/workbook/worksheet/tc_header_footer.rb +151 -151
data/test/workbook/worksheet/tc_icon_set.rb +45 -45
data/test/workbook/worksheet/tc_outline_pr.rb +19 -19
data/test/workbook/worksheet/tc_page_margins.rb +97 -97
data/test/workbook/worksheet/tc_page_set_up_pr.rb +15 -15
data/test/workbook/worksheet/tc_page_setup.rb +143 -143
data/test/workbook/worksheet/tc_pane.rb +54 -54
data/test/workbook/worksheet/tc_pivot_table.rb +180 -143
data/test/workbook/worksheet/tc_pivot_table_cache_definition.rb +62 -62
data/test/workbook/worksheet/tc_print_options.rb +72 -72
data/test/workbook/worksheet/tc_protected_range.rb +17 -17
data/test/workbook/worksheet/tc_rich_text.rb +44 -44
data/test/workbook/worksheet/tc_rich_text_run.rb +173 -173
data/test/workbook/worksheet/tc_row.rb +160 -160
data/test/workbook/worksheet/tc_selection.rb +55 -55
data/test/workbook/worksheet/tc_sheet_calc_pr.rb +18 -18
data/test/workbook/worksheet/tc_sheet_format_pr.rb +88 -88
data/test/workbook/worksheet/tc_sheet_pr.rb +49 -49
data/test/workbook/worksheet/tc_sheet_protection.rb +117 -117
data/test/workbook/worksheet/tc_sheet_view.rb +214 -214
data/test/workbook/worksheet/tc_table.rb +77 -77
data/test/workbook/worksheet/tc_table_style_info.rb +53 -53
data/test/workbook/worksheet/tc_worksheet.rb +632 -601
data/test/workbook/worksheet/tc_worksheet_hyperlink.rb +55 -55
metadata +101 -101

data/lib/schema/dml-wordprocessingDrawing.xsd CHANGED Viewed

@@ -1,185 +1,185 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
-  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
-  xmlns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
-  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
-  elementFormDefault="qualified">
-  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
-    schemaLocation="dml-main.xsd"/>
-  <xsd:import schemaLocation="wml.xsd"
-    namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"/>
-  <xsd:complexType name="CT_EffectExtent">
-    <xsd:attribute name="l" type="a:ST_Coordinate" use="required"/>
-    <xsd:attribute name="t" type="a:ST_Coordinate" use="required"/>
-    <xsd:attribute name="r" type="a:ST_Coordinate" use="required"/>
-    <xsd:attribute name="b" type="a:ST_Coordinate" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_WrapDistance">
-    <xsd:restriction base="xsd:unsignedInt"/>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_Inline">
-    <xsd:sequence>
-      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
-        minOccurs="0" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_WrapText">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="bothSides"/>
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="largest"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_WrapPath">
-    <xsd:sequence>
-      <xsd:element name="start" type="a:CT_Point2D" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="lineTo" type="a:CT_Point2D" minOccurs="2" maxOccurs="unbounded"/>
-    </xsd:sequence>
-    <xsd:attribute name="edited" type="xsd:boolean" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapNone"/>
-  <xsd:complexType name="CT_WrapSquare">
-    <xsd:sequence>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapTight">
-    <xsd:sequence>
-      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapThrough">
-    <xsd:sequence>
-      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_WrapTopBottom">
-    <xsd:sequence>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-    </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-  </xsd:complexType>
-  <xsd:group name="EG_WrapType">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="wrapNone" type="CT_WrapNone" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapSquare" type="CT_WrapSquare" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapTight" type="CT_WrapTight" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapThrough" type="CT_WrapThrough" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="wrapTopAndBottom" type="CT_WrapTopBottom" minOccurs="1" maxOccurs="1"/>
-      </xsd:choice>
-    </xsd:sequence>
-  </xsd:group>
-  <xsd:simpleType name="ST_PositionOffset">
-    <xsd:restriction base="xsd:int"/>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_AlignH">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="left"/>
-      <xsd:enumeration value="right"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="inside"/>
-      <xsd:enumeration value="outside"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_RelFromH">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="margin"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="column"/>
-      <xsd:enumeration value="character"/>
-      <xsd:enumeration value="leftMargin"/>
-      <xsd:enumeration value="rightMargin"/>
-      <xsd:enumeration value="insideMargin"/>
-      <xsd:enumeration value="outsideMargin"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_PosH">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="align" type="ST_AlignH" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="relativeFrom" type="ST_RelFromH" use="required"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_AlignV">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="top"/>
-      <xsd:enumeration value="bottom"/>
-      <xsd:enumeration value="center"/>
-      <xsd:enumeration value="inside"/>
-      <xsd:enumeration value="outside"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:simpleType name="ST_RelFromV">
-    <xsd:restriction base="xsd:token">
-      <xsd:enumeration value="margin"/>
-      <xsd:enumeration value="page"/>
-      <xsd:enumeration value="paragraph"/>
-      <xsd:enumeration value="line"/>
-      <xsd:enumeration value="topMargin"/>
-      <xsd:enumeration value="bottomMargin"/>
-      <xsd:enumeration value="insideMargin"/>
-      <xsd:enumeration value="outsideMargin"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:complexType name="CT_PosV">
-    <xsd:sequence>
-      <xsd:choice minOccurs="1" maxOccurs="1">
-        <xsd:element name="align" type="ST_AlignV" minOccurs="1" maxOccurs="1"/>
-        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
-      </xsd:choice>
-    </xsd:sequence>
-    <xsd:attribute name="relativeFrom" type="ST_RelFromV" use="required"/>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Anchor">
-    <xsd:sequence>
-      <xsd:element name="simplePos" type="a:CT_Point2D"/>
-      <xsd:element name="positionH" type="CT_PosH"/>
-      <xsd:element name="positionV" type="CT_PosV"/>
-      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
-      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
-      <xsd:group ref="EG_WrapType"/>
-      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
-      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
-        minOccurs="0" maxOccurs="1"/>
-      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
-    </xsd:sequence>
-    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
-    <xsd:attribute name="simplePos" type="xsd:boolean"/>
-    <xsd:attribute name="relativeHeight" type="xsd:unsignedInt" use="required"/>
-    <xsd:attribute name="behindDoc" type="xsd:boolean" use="required"/>
-    <xsd:attribute name="locked" type="xsd:boolean" use="required"/>
-    <xsd:attribute name="layoutInCell" type="xsd:boolean" use="required"/>
-    <xsd:attribute name="hidden" type="xsd:boolean" use="optional"/>
-    <xsd:attribute name="allowOverlap" type="xsd:boolean" use="required"/>
-  </xsd:complexType>
-  <xsd:element name="inline" type="CT_Inline"/>
-  <xsd:element name="anchor" type="CT_Anchor"/>
-</xsd:schema>
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main"
+  xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main"
+  xmlns="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
+  targetNamespace="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"
+  elementFormDefault="qualified">
+  <xsd:import namespace="http://schemas.openxmlformats.org/drawingml/2006/main"
+    schemaLocation="dml-main.xsd"/>
+  <xsd:import schemaLocation="wml.xsd"
+    namespace="http://schemas.openxmlformats.org/wordprocessingml/2006/main"/>
+  <xsd:complexType name="CT_EffectExtent">
+    <xsd:attribute name="l" type="a:ST_Coordinate" use="required"/>
+    <xsd:attribute name="t" type="a:ST_Coordinate" use="required"/>
+    <xsd:attribute name="r" type="a:ST_Coordinate" use="required"/>
+    <xsd:attribute name="b" type="a:ST_Coordinate" use="required"/>
+  </xsd:complexType>
+  <xsd:simpleType name="ST_WrapDistance">
+    <xsd:restriction base="xsd:unsignedInt"/>
+  </xsd:simpleType>
+  <xsd:complexType name="CT_Inline">
+    <xsd:sequence>
+      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
+      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
+      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
+        minOccurs="0" maxOccurs="1"/>
+      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
+  </xsd:complexType>
+  <xsd:simpleType name="ST_WrapText">
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="bothSides"/>
+      <xsd:enumeration value="left"/>
+      <xsd:enumeration value="right"/>
+      <xsd:enumeration value="largest"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="CT_WrapPath">
+    <xsd:sequence>
+      <xsd:element name="start" type="a:CT_Point2D" minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="lineTo" type="a:CT_Point2D" minOccurs="2" maxOccurs="unbounded"/>
+    </xsd:sequence>
+    <xsd:attribute name="edited" type="xsd:boolean" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="CT_WrapNone"/>
+  <xsd:complexType name="CT_WrapSquare">
+    <xsd:sequence>
+      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
+    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="CT_WrapTight">
+    <xsd:sequence>
+      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
+    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="CT_WrapThrough">
+    <xsd:sequence>
+      <xsd:element name="wrapPolygon" type="CT_WrapPath" minOccurs="1" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="wrapText" type="ST_WrapText" use="required"/>
+    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
+  </xsd:complexType>
+  <xsd:complexType name="CT_WrapTopBottom">
+    <xsd:sequence>
+      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
+    </xsd:sequence>
+    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
+  </xsd:complexType>
+  <xsd:group name="EG_WrapType">
+    <xsd:sequence>
+      <xsd:choice minOccurs="1" maxOccurs="1">
+        <xsd:element name="wrapNone" type="CT_WrapNone" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="wrapSquare" type="CT_WrapSquare" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="wrapTight" type="CT_WrapTight" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="wrapThrough" type="CT_WrapThrough" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="wrapTopAndBottom" type="CT_WrapTopBottom" minOccurs="1" maxOccurs="1"/>
+      </xsd:choice>
+    </xsd:sequence>
+  </xsd:group>
+  <xsd:simpleType name="ST_PositionOffset">
+    <xsd:restriction base="xsd:int"/>
+  </xsd:simpleType>
+  <xsd:simpleType name="ST_AlignH">
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="left"/>
+      <xsd:enumeration value="right"/>
+      <xsd:enumeration value="center"/>
+      <xsd:enumeration value="inside"/>
+      <xsd:enumeration value="outside"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ST_RelFromH">
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="margin"/>
+      <xsd:enumeration value="page"/>
+      <xsd:enumeration value="column"/>
+      <xsd:enumeration value="character"/>
+      <xsd:enumeration value="leftMargin"/>
+      <xsd:enumeration value="rightMargin"/>
+      <xsd:enumeration value="insideMargin"/>
+      <xsd:enumeration value="outsideMargin"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="CT_PosH">
+    <xsd:sequence>
+      <xsd:choice minOccurs="1" maxOccurs="1">
+        <xsd:element name="align" type="ST_AlignH" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="relativeFrom" type="ST_RelFromH" use="required"/>
+  </xsd:complexType>
+  <xsd:simpleType name="ST_AlignV">
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="top"/>
+      <xsd:enumeration value="bottom"/>
+      <xsd:enumeration value="center"/>
+      <xsd:enumeration value="inside"/>
+      <xsd:enumeration value="outside"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:simpleType name="ST_RelFromV">
+    <xsd:restriction base="xsd:token">
+      <xsd:enumeration value="margin"/>
+      <xsd:enumeration value="page"/>
+      <xsd:enumeration value="paragraph"/>
+      <xsd:enumeration value="line"/>
+      <xsd:enumeration value="topMargin"/>
+      <xsd:enumeration value="bottomMargin"/>
+      <xsd:enumeration value="insideMargin"/>
+      <xsd:enumeration value="outsideMargin"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:complexType name="CT_PosV">
+    <xsd:sequence>
+      <xsd:choice minOccurs="1" maxOccurs="1">
+        <xsd:element name="align" type="ST_AlignV" minOccurs="1" maxOccurs="1"/>
+        <xsd:element name="posOffset" type="ST_PositionOffset" minOccurs="1" maxOccurs="1"/>
+      </xsd:choice>
+    </xsd:sequence>
+    <xsd:attribute name="relativeFrom" type="ST_RelFromV" use="required"/>
+  </xsd:complexType>
+  <xsd:complexType name="CT_Anchor">
+    <xsd:sequence>
+      <xsd:element name="simplePos" type="a:CT_Point2D"/>
+      <xsd:element name="positionH" type="CT_PosH"/>
+      <xsd:element name="positionV" type="CT_PosV"/>
+      <xsd:element name="extent" type="a:CT_PositiveSize2D"/>
+      <xsd:element name="effectExtent" type="CT_EffectExtent" minOccurs="0"/>
+      <xsd:group ref="EG_WrapType"/>
+      <xsd:element name="docPr" type="a:CT_NonVisualDrawingProps" minOccurs="1" maxOccurs="1"/>
+      <xsd:element name="cNvGraphicFramePr" type="a:CT_NonVisualGraphicFrameProperties"
+        minOccurs="0" maxOccurs="1"/>
+      <xsd:element ref="a:graphic" minOccurs="1" maxOccurs="1"/>
+    </xsd:sequence>
+    <xsd:attribute name="distT" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distB" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distL" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="distR" type="ST_WrapDistance" use="optional"/>
+    <xsd:attribute name="simplePos" type="xsd:boolean"/>
+    <xsd:attribute name="relativeHeight" type="xsd:unsignedInt" use="required"/>
+    <xsd:attribute name="behindDoc" type="xsd:boolean" use="required"/>
+    <xsd:attribute name="locked" type="xsd:boolean" use="required"/>
+    <xsd:attribute name="layoutInCell" type="xsd:boolean" use="required"/>
+    <xsd:attribute name="hidden" type="xsd:boolean" use="optional"/>
+    <xsd:attribute name="allowOverlap" type="xsd:boolean" use="required"/>
+  </xsd:complexType>
+  <xsd:element name="inline" type="CT_Inline"/>
+  <xsd:element name="anchor" type="CT_Anchor"/>
+</xsd:schema>

data/lib/schema/shared-additionalCharacteristics.xsd CHANGED Viewed

@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
-  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
-  elementFormDefault="qualified">
-  <xsd:complexType name="CT_AdditionalCharacteristics">
-    <xsd:sequence>
-      <xsd:element name="characteristic" type="CT_Characteristic" minOccurs="0"
-        maxOccurs="unbounded"/>
-    </xsd:sequence>
-  </xsd:complexType>
-  <xsd:complexType name="CT_Characteristic">
-    <xsd:attribute name="name" type="xsd:string" use="required"/>
-    <xsd:attribute name="relation" type="ST_Relation" use="required"/>
-    <xsd:attribute name="val" type="xsd:string" use="required"/>
-    <xsd:attribute name="vocabulary" type="xsd:anyURI" use="optional"/>
-  </xsd:complexType>
-  <xsd:simpleType name="ST_Relation">
-    <xsd:restriction base="xsd:string">
-      <xsd:enumeration value="ge"/>
-      <xsd:enumeration value="le"/>
-      <xsd:enumeration value="gt"/>
-      <xsd:enumeration value="lt"/>
-      <xsd:enumeration value="eq"/>
-    </xsd:restriction>
-  </xsd:simpleType>
-  <xsd:element name="additionalCharacteristics" type="CT_AdditionalCharacteristics"/>
-</xsd:schema>
+<?xml version="1.0" encoding="utf-8"?>
+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
+  targetNamespace="http://schemas.openxmlformats.org/officeDocument/2006/characteristics"
+  elementFormDefault="qualified">
+  <xsd:complexType name="CT_AdditionalCharacteristics">
+    <xsd:sequence>
+      <xsd:element name="characteristic" type="CT_Characteristic" minOccurs="0"
+        maxOccurs="unbounded"/>
+    </xsd:sequence>
+  </xsd:complexType>
+  <xsd:complexType name="CT_Characteristic">
+    <xsd:attribute name="name" type="xsd:string" use="required"/>
+    <xsd:attribute name="relation" type="ST_Relation" use="required"/>
+    <xsd:attribute name="val" type="xsd:string" use="required"/>
+    <xsd:attribute name="vocabulary" type="xsd:anyURI" use="optional"/>
+  </xsd:complexType>
+  <xsd:simpleType name="ST_Relation">
+    <xsd:restriction base="xsd:string">
+      <xsd:enumeration value="ge"/>
+      <xsd:enumeration value="le"/>
+      <xsd:enumeration value="gt"/>
+      <xsd:enumeration value="lt"/>
+      <xsd:enumeration value="eq"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+  <xsd:element name="additionalCharacteristics" type="CT_AdditionalCharacteristics"/>
+</xsd:schema>