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

caxlsx 3.2.0 → 3.4.0

Files changed (301) hide show

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

data/lib/schema/dcterms.xsd CHANGED Viewed

@@ -1,331 +1,331 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           xmlns:dc="http://purl.org/dc/elements/1.1/"
-           xmlns:dcmitype="http://purl.org/dc/dcmitype/"
-           targetNamespace="http://purl.org/dc/terms/"
-           xmlns="http://purl.org/dc/terms/"
-           elementFormDefault="qualified"
-           attributeFormDefault="unqualified">
-  <xs:annotation>
-    <xs:documentation xml:lang="en">
-      DCterms XML Schema
-      XML Schema for http://purl.org/dc/terms/ namespace
-      Created 2003-04-02
-      Created by
-      Tim Cole (t-cole3@uiuc.edu)
-      Tom Habing (thabing@uiuc.edu)
-      Jane Hunter (jane@dstc.edu.au)
-      Pete Johnston (p.johnston@ukoln.ac.uk),
-      Carl Lagoze (lagoze@cs.cornell.edu)
-      This schema declares XML elements for the DC elements and
-      DC element refinements from the http://purl.org/dc/terms/ namespace.
-      It reuses the complexType dc:SimpleLiteral, imported from the dc.xsd
-      schema, which permits simple element content, and makes the xml:lang
-      attribute available.
-      This complexType permits the derivation of other complexTypes
-      which would permit child elements.
-      DC elements are declared as substitutable for the abstract element dc:any, and
-      DC element refinements are defined as substitutable for the base elements
-      which they refine.
-      This means that the default type for all XML elements (i.e. all DC elements and
-      element refinements) is dc:SimpleLiteral.
-      Encoding schemes are defined as complexTypes which are restrictions
-      of the dc:SimpleLiteral complexType. These complexTypes restrict
-      values to an appropriates syntax or format using data typing,
-      regular expressions, or enumerated lists.
-      In order to specify one of these encodings an xsi:type attribute must
-      be used in the instance document.
-      Also, note that one shortcoming of this approach is that any type can be
-      applied to any of the elements or refinements.  There is no convenient way
-      to restrict types to specific elements using this approach.
-    </xs:documentation>
-  </xs:annotation>
-  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
-             schemaLocation="xml.xsd">
-  </xs:import>
-   <xs:import namespace="http://purl.org/dc/elements/1.1/"
-              schemaLocation="dc.xsd"/>
-   <xs:import namespace="http://purl.org/dc/dcmitype/"
-              schemaLocation="dcmitype.xsd"/>
-   <xs:element name="alternative" substitutionGroup="dc:title"/>
-   <xs:element name="tableOfContents" substitutionGroup="dc:description"/>
-   <xs:element name="abstract" substitutionGroup="dc:description"/>
-   <xs:element name="created" substitutionGroup="dc:date"/>
-   <xs:element name="valid" substitutionGroup="dc:date"/>
-   <xs:element name="available" substitutionGroup="dc:date"/>
-   <xs:element name="issued" substitutionGroup="dc:date"/>
-   <xs:element name="modified" substitutionGroup="dc:date"/>
-   <xs:element name="dateAccepted" substitutionGroup="dc:date"/>
-   <xs:element name="dateCopyrighted" substitutionGroup="dc:date"/>
-   <xs:element name="dateSubmitted" substitutionGroup="dc:date"/>
-   <xs:element name="extent" substitutionGroup="dc:format"/>
-   <xs:element name="medium" substitutionGroup="dc:format"/>
-   <xs:element name="isVersionOf" substitutionGroup="dc:relation"/>
-   <xs:element name="hasVersion" substitutionGroup="dc:relation"/>
-   <xs:element name="isReplacedBy" substitutionGroup="dc:relation"/>
-   <xs:element name="replaces" substitutionGroup="dc:relation"/>
-   <xs:element name="isRequiredBy" substitutionGroup="dc:relation"/>
-   <xs:element name="requires" substitutionGroup="dc:relation"/>
-   <xs:element name="isPartOf" substitutionGroup="dc:relation"/>
-   <xs:element name="hasPart" substitutionGroup="dc:relation"/>
-   <xs:element name="isReferencedBy" substitutionGroup="dc:relation"/>
-   <xs:element name="references" substitutionGroup="dc:relation"/>
-   <xs:element name="isFormatOf" substitutionGroup="dc:relation"/>
-   <xs:element name="hasFormat" substitutionGroup="dc:relation"/>
-   <xs:element name="conformsTo" substitutionGroup="dc:relation"/>
-   <xs:element name="spatial" substitutionGroup="dc:coverage"/>
-   <xs:element name="temporal" substitutionGroup="dc:coverage"/>
-   <xs:element name="audience" substitutionGroup="dc:any"/>
-   <xs:element name="mediator" substitutionGroup="audience"/>
-   <xs:element name="educationLevel" substitutionGroup="audience"/>
-   <xs:element name="accessRights" substitutionGroup="dc:rights"/>
-   <xs:element name="bibliographicCitation" substitutionGroup="dc:identifier"/>
-  <xs:complexType name="LCSH">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="MESH">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="DDC">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="LCC">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="UDC">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Period">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="W3CDTF">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-           <xs:union memberTypes="xs:gYear xs:gYearMonth xs:date xs:dateTime"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="DCMIType">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="dcmitype:DCMIType"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="IMT">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="URI">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:anyURI"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="ISO639-2">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="RFC1766">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:language"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="RFC3066">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:language"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Point">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="ISO3166">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="Box">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:complexType name="TGN">
-   <xs:simpleContent>
-    <xs:restriction base="dc:SimpleLiteral">
-        <xs:simpleType>
-          <xs:restriction base="xs:string"/>
-        </xs:simpleType>
-        <xs:attribute ref="xml:lang" use="prohibited"/>
-    </xs:restriction>
-   </xs:simpleContent>
-  </xs:complexType>
-  <xs:group name="elementsAndRefinementsGroup">
-  	<xs:annotation>
-    	<xs:documentation xml:lang="en">
-    		This group is included as a convenience for schema authors
-            who need to refer to all the DC elements and element refinements
-            in the http://purl.org/dc/elements/1.1/ and
-            http://purl.org/dc/terms namespaces.
-            N.B. Refinements available via substitution groups.
-    	</xs:documentation>
-  	</xs:annotation>
-  <xs:sequence>
-    <xs:choice minOccurs="0" maxOccurs="unbounded">
-	<xs:element ref="dc:any" />
-    </xs:choice>
-  </xs:sequence>
-  </xs:group>
-  <xs:complexType name="elementOrRefinementContainer">
-  	<xs:annotation>
-    	<xs:documentation xml:lang="en">
-    		This is included as a convenience for schema authors who need to define a root
-    		or container element for all of the DC elements and element refinements.
-    	</xs:documentation>
-  	</xs:annotation>
-    <xs:choice>
-      <xs:group ref="elementsAndRefinementsGroup"/>
-    </xs:choice>
-  </xs:complexType>
-</xs:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+           xmlns:dc="http://purl.org/dc/elements/1.1/"
+           xmlns:dcmitype="http://purl.org/dc/dcmitype/"
+           targetNamespace="http://purl.org/dc/terms/"
+           xmlns="http://purl.org/dc/terms/"
+           elementFormDefault="qualified"
+           attributeFormDefault="unqualified">
+  <xs:annotation>
+    <xs:documentation xml:lang="en">
+      DCterms XML Schema
+      XML Schema for http://purl.org/dc/terms/ namespace
+      Created 2003-04-02
+      Created by
+      Tim Cole (t-cole3@uiuc.edu)
+      Tom Habing (thabing@uiuc.edu)
+      Jane Hunter (jane@dstc.edu.au)
+      Pete Johnston (p.johnston@ukoln.ac.uk),
+      Carl Lagoze (lagoze@cs.cornell.edu)
+      This schema declares XML elements for the DC elements and
+      DC element refinements from the http://purl.org/dc/terms/ namespace.
+      It reuses the complexType dc:SimpleLiteral, imported from the dc.xsd
+      schema, which permits simple element content, and makes the xml:lang
+      attribute available.
+      This complexType permits the derivation of other complexTypes
+      which would permit child elements.
+      DC elements are declared as substitutable for the abstract element dc:any, and
+      DC element refinements are defined as substitutable for the base elements
+      which they refine.
+      This means that the default type for all XML elements (i.e. all DC elements and
+      element refinements) is dc:SimpleLiteral.
+      Encoding schemes are defined as complexTypes which are restrictions
+      of the dc:SimpleLiteral complexType. These complexTypes restrict
+      values to an appropriates syntax or format using data typing,
+      regular expressions, or enumerated lists.
+      In order to specify one of these encodings an xsi:type attribute must
+      be used in the instance document.
+      Also, note that one shortcoming of this approach is that any type can be
+      applied to any of the elements or refinements.  There is no convenient way
+      to restrict types to specific elements using this approach.
+    </xs:documentation>
+  </xs:annotation>
+  <xs:import namespace="http://www.w3.org/XML/1998/namespace"
+             schemaLocation="xml.xsd">
+  </xs:import>
+   <xs:import namespace="http://purl.org/dc/elements/1.1/"
+              schemaLocation="dc.xsd"/>
+   <xs:import namespace="http://purl.org/dc/dcmitype/"
+              schemaLocation="dcmitype.xsd"/>
+   <xs:element name="alternative" substitutionGroup="dc:title"/>
+   <xs:element name="tableOfContents" substitutionGroup="dc:description"/>
+   <xs:element name="abstract" substitutionGroup="dc:description"/>
+   <xs:element name="created" substitutionGroup="dc:date"/>
+   <xs:element name="valid" substitutionGroup="dc:date"/>
+   <xs:element name="available" substitutionGroup="dc:date"/>
+   <xs:element name="issued" substitutionGroup="dc:date"/>
+   <xs:element name="modified" substitutionGroup="dc:date"/>
+   <xs:element name="dateAccepted" substitutionGroup="dc:date"/>
+   <xs:element name="dateCopyrighted" substitutionGroup="dc:date"/>
+   <xs:element name="dateSubmitted" substitutionGroup="dc:date"/>
+   <xs:element name="extent" substitutionGroup="dc:format"/>
+   <xs:element name="medium" substitutionGroup="dc:format"/>
+   <xs:element name="isVersionOf" substitutionGroup="dc:relation"/>
+   <xs:element name="hasVersion" substitutionGroup="dc:relation"/>
+   <xs:element name="isReplacedBy" substitutionGroup="dc:relation"/>
+   <xs:element name="replaces" substitutionGroup="dc:relation"/>
+   <xs:element name="isRequiredBy" substitutionGroup="dc:relation"/>
+   <xs:element name="requires" substitutionGroup="dc:relation"/>
+   <xs:element name="isPartOf" substitutionGroup="dc:relation"/>
+   <xs:element name="hasPart" substitutionGroup="dc:relation"/>
+   <xs:element name="isReferencedBy" substitutionGroup="dc:relation"/>
+   <xs:element name="references" substitutionGroup="dc:relation"/>
+   <xs:element name="isFormatOf" substitutionGroup="dc:relation"/>
+   <xs:element name="hasFormat" substitutionGroup="dc:relation"/>
+   <xs:element name="conformsTo" substitutionGroup="dc:relation"/>
+   <xs:element name="spatial" substitutionGroup="dc:coverage"/>
+   <xs:element name="temporal" substitutionGroup="dc:coverage"/>
+   <xs:element name="audience" substitutionGroup="dc:any"/>
+   <xs:element name="mediator" substitutionGroup="audience"/>
+   <xs:element name="educationLevel" substitutionGroup="audience"/>
+   <xs:element name="accessRights" substitutionGroup="dc:rights"/>
+   <xs:element name="bibliographicCitation" substitutionGroup="dc:identifier"/>
+  <xs:complexType name="LCSH">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="MESH">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="DDC">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="LCC">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="UDC">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="Period">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="W3CDTF">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+           <xs:union memberTypes="xs:gYear xs:gYearMonth xs:date xs:dateTime"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="DCMIType">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="dcmitype:DCMIType"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="IMT">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="URI">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:anyURI"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="ISO639-2">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="RFC1766">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:language"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="RFC3066">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:language"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="Point">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="ISO3166">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="Box">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:complexType name="TGN">
+   <xs:simpleContent>
+    <xs:restriction base="dc:SimpleLiteral">
+        <xs:simpleType>
+          <xs:restriction base="xs:string"/>
+        </xs:simpleType>
+        <xs:attribute ref="xml:lang" use="prohibited"/>
+    </xs:restriction>
+   </xs:simpleContent>
+  </xs:complexType>
+  <xs:group name="elementsAndRefinementsGroup">
+  	<xs:annotation>
+    	<xs:documentation xml:lang="en">
+    		This group is included as a convenience for schema authors
+            who need to refer to all the DC elements and element refinements
+            in the http://purl.org/dc/elements/1.1/ and
+            http://purl.org/dc/terms namespaces.
+            N.B. Refinements available via substitution groups.
+    	</xs:documentation>
+  	</xs:annotation>
+  <xs:sequence>
+    <xs:choice minOccurs="0" maxOccurs="unbounded">
+	<xs:element ref="dc:any" />
+    </xs:choice>
+  </xs:sequence>
+  </xs:group>
+  <xs:complexType name="elementOrRefinementContainer">
+  	<xs:annotation>
+    	<xs:documentation xml:lang="en">
+    		This is included as a convenience for schema authors who need to define a root
+    		or container element for all of the DC elements and element refinements.
+    	</xs:documentation>
+  	</xs:annotation>
+    <xs:choice>
+      <xs:group ref="elementsAndRefinementsGroup"/>
+    </xs:choice>
+  </xs:complexType>
+</xs:schema>