Skip to content
GitLab
Commit ae1d5852 authored by mrodzis's avatar mrodzis 💪
Browse files

feat: add mixed content to several elements; typos 

This encompasses qualifierMeasurments, formatMeasurments, shapeMeasurements, scaleMeasurements.
parent 7f23f252
Hide whitespace changes
Inline Side-by-side
1.1/lido-v1.1-draft.xsd
View file @ ae1d5852
......@@ -1270,7 +1270,7 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
</tei:ab>
<tei:ab type="dataValues">
[Type attribute] Controlled. Recommended: LIDO Terminology.
For recommendations please refer to <tei:ref target="accompanying-text.html#latestDate_type"/>[
For recommendations please refer to <tei:ref target="accompanying-text.html#latestDate_type"/>
</tei:ab>
</xs:documentation>
</xs:annotation>
......@@ -3765,7 +3765,6 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
</xs:complexContent>
</xs:complexType>
</xs:element>
<!-- Mixed Content with skos:Concept -->
<xs:element name="extentMeasurements" minOccurs="0" maxOccurs="unbounded" id="extentMeasurements">
<xs:annotation>
<xs:documentation>
......@@ -3835,13 +3834,22 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
<tei:ab type="dataValues">Controlled. Recommended: LIDO Terminology.
For recommendations please refer to <tei:ref target="accompanying-text.html#qualifierMeasurments"/></tei:ab>
</xs:documentation>
<xs:appinfo>
<sch:pattern>
<sch:rule context="lido:qualifierMeasurements">
<sch:extends rule="MixedContent"/>
<sch:extends rule="MixedContentInfo"/>
<sch:extends rule="SKOS"/>
</sch:rule>
</sch:pattern>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
<xs:extension base="lido:textComplexType">
<xs:complexContent>
<xs:extension base="lido:conceptMixedComplexType">
<xs:attribute ref="lido:sortorder"/>
</xs:extension>
</xs:simpleContent>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="formatMeasurements" minOccurs="0" maxOccurs="unbounded" id="formatMeasurements">
......@@ -3875,13 +3883,22 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
<tei:ab type="dataValues">Controlled. Recommended: Linked open vocabulary.
For recommendations please refer to <tei:ref target="accompanying-text.html#formatMeasurements"/></tei:ab>
</xs:documentation>
<xs:appinfo>
<sch:pattern>
<sch:rule context="lido:formatMeasurements">
<sch:extends rule="MixedContent"/>
<sch:extends rule="MixedContentInfo"/>
<sch:extends rule="SKOS"/>
</sch:rule>
</sch:pattern>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
<xs:extension base="lido:textComplexType">
<xs:complexContent>
<xs:extension base="lido:conceptMixedComplexType">
<xs:attribute ref="lido:sortorder"/>
</xs:extension>
</xs:simpleContent>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="shapeMeasurements" minOccurs="0" maxOccurs="unbounded" id="shapeMeasurements">
......@@ -3910,13 +3927,22 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
<tei:ab type="dataValues">Controlled. Recommended: Linked open vocabulary.
For recommendations please refer to <tei:ref target="accompanying-text.html#shapeMeasurements"/></tei:ab>
</xs:documentation>
<xs:appinfo>
<sch:pattern>
<sch:rule context="lido:shapeMeasurements">
<sch:extends rule="MixedContent"/>
<sch:extends rule="MixedContentInfo"/>
<sch:extends rule="SKOS"/>
</sch:rule>
</sch:pattern>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
<xs:extension base="lido:textComplexType">
<xs:complexContent>
<xs:extension base="lido:conceptMixedComplexType">
<xs:attribute ref="lido:sortorder"/>
</xs:extension>
</xs:simpleContent>
</xs:complexContent>
</xs:complexType>
</xs:element>
<xs:element name="scaleMeasurements" minOccurs="0" maxOccurs="unbounded" id="scaleMeasurements">
......@@ -3948,13 +3974,22 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
<tei:ab type="dataValues">Controlled. Recommended: Linked open vocabulary.
For recommendations please refer to <tei:ref target="accompanying-text.html#scaleMeasurements"/>.</tei:ab>
</xs:documentation>
<xs:appinfo>
<sch:pattern>
<sch:rule context="lido:scaleMeasurements">
<sch:extends rule="MixedContent"/>
<sch:extends rule="MixedContentInfo"/>
<sch:extends rule="SKOS"/>
</sch:rule>
</sch:pattern>
</xs:appinfo>
</xs:annotation>
<xs:complexType>
<xs:simpleContent>
<xs:extension base="lido:textComplexType">
<xs:complexContent>
<xs:extension base="lido:conceptMixedComplexType">
<xs:attribute ref="lido:sortorder"/>
</xs:extension>
</xs:simpleContent>
</xs:complexContent>
</xs:complexType>
</xs:element>
</xs:sequence>
......@@ -6644,12 +6679,10 @@ target="https://www.getty.edu/research/tools/vocabularies/guidelines/ulan_3_6_bi
<xs:complexType name="conceptMixedComplexType" mixed="true" id="conceptMixedComplexType">
<xs:annotation>
<xs:documentation>Definition: Mixed element. Allows either simple text elements as
<xs:documentation>
<tei:ab type="description">Wrapper for mixed content. Allows either simple text as
defined in lido:textComplexType or elements as defined in
lido:conceptComplexType</xs:documentation>
<xs:documentation>Note: Should provide either free text or elements as defined in
lido:conceptComplexType (mutually exclusive).</xs:documentation>
lido:conceptComplexType (mutually exclusive).</tei:ab></xs:documentation>
</xs:annotation>
<xs:group ref="lido:conceptElementsSet"/>
<xs:attributeGroup ref="lido:textAttributesSet"/>
......
Supports Markdown
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