Skip to content

Commit 1825366

Browse files
wkingwking
committed
schema/ListedLicense: Do not allow <alt> or <optional> inside <alt>
By differentiating between formattedAltText..., which may contain <alt> and <optional>, and formattedFixedText..., which may not. The optionalType is using formattedAltTextGroup, because nesting variable content inside an optional element can be useful [1,2]. The <alt> element, on the other hand, specifies all the variable options in its match attribute, so there's no need for nesting variable elements inside the alt body. Also require fixed text for <notes>, since those aren't templates. And drop the unused notesType, since they're vanilla formatted text. We almost certainly want to drop titleText and copyrightText fro the formatted*TextGroup choices, but I'm leaving that for [3]. [1]: spdx#393 [2]: spdx#462 [3]: spdx#452
1 parent 4aac6f8 commit 1825366

File tree

1 file changed

+31
-26
lines changed

1 file changed

+31
-26
lines changed

‎schema/ListedLicense.xsd

Lines changed: 31 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<complexType name="ExceptionType" mixed="true">
2020
<choice minOccurs="1" maxOccurs="unbounded">
2121
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
22-
<element name="notes" type="string" minOccurs="0" maxOccurs="1"/>
23-
<element name="titleText" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
24-
<element name="copyrightText" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
22+
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
23+
<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
24+
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
2525
<element name="bullet" type="string"/>
2626
<element name="list" type="tns:listType"/>
27-
<element name="p" type="tns:formattedTextType"/>
27+
<element name="p" type="tns:formattedAltTextType"/>
2828
<element name="optional" type="tns:optionalType"/>
2929
<element name="alt" type="tns:altType"/>
3030
<element name="br" type="tns:emptyType"/>
@@ -38,13 +38,13 @@
3838
<complexType name="LicenseType" mixed="true">
3939
<choice minOccurs="1" maxOccurs="unbounded">
4040
<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
41-
<element name="notes" type="string" minOccurs="0" maxOccurs="1"/>
42-
<element name="standardLicenseHeader" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
43-
<element name="titleText" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
44-
<element name="copyrightText" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
41+
<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
42+
<element name="standardLicenseHeader" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
43+
<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
44+
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
4545
<element name="bullet" type="string"/>
4646
<element name="list" type="tns:listType"/>
47-
<element name="p" type="tns:formattedTextType"/>
47+
<element name="p" type="tns:formattedAltTextType"/>
4848
<element name="optional" type="tns:optionalType"/>
4949
<element name="alt" type="tns:altType"/>
5050
<element name="br" type="tns:emptyType"/>
@@ -57,47 +57,52 @@
5757
<attribute name="listVersionAdded" type="string"/>
5858
<attribute name="deprecatedVersion" type="string"/>
5959
</complexType>
60-
<complexType name="notesType" mixed="true">
61-
<choice minOccurs="1" maxOccurs="unbounded">
62-
<element name="p" type="tns:formattedTextType"/>
63-
<element name="br" type="tns:emptyType"/>
64-
<element name="bullet" type="string"/>
65-
<element name="list" type="tns:listType"/>
66-
</choice>
67-
</complexType>
6860
<complexType name="crossRefsType">
6961
<sequence>
7062
<element name="crossRef" type="string" minOccurs="1" maxOccurs="unbounded"/>
7163
</sequence>
7264
</complexType>
7365
<complexType name="altType" mixed="true">
74-
<group ref="tns:formattedTextGroup" minOccurs="0" maxOccurs="unbounded"/>
66+
<group ref="tns:formattedFixedTextGroup" minOccurs="0" maxOccurs="unbounded"/>
7567
<attribute name="name" type="string"/>
7668
<attribute name="match" type="string"/>
7769
</complexType>
7870
<complexType name="optionalType" mixed="true">
79-
<group ref="tns:formattedTextGroup" minOccurs="0" maxOccurs="unbounded"/>
71+
<group ref="tns:formattedAltTextGroup" minOccurs="0" maxOccurs="unbounded"/>
8072
</complexType>
8173
<complexType name="listType">
8274
<choice minOccurs="1" maxOccurs="unbounded">
83-
<element name="item" type="tns:formattedTextType"/>
75+
<element name="item" type="tns:formattedAltTextType"/>
8476
<element name="list" type="tns:listType"/>
8577
</choice>
8678
</complexType>
8779
<complexType name="emptyType"/>
88-
<complexType name="formattedTextType" mixed="true">
89-
<group ref="tns:formattedTextGroup" minOccurs="0" maxOccurs="unbounded"/>
80+
<complexType name="formattedFixedTextType" mixed="true">
81+
<group ref="tns:formattedFixedTextGroup" minOccurs="0" maxOccurs="unbounded"/>
82+
</complexType>
83+
<complexType name="formattedAltTextType" mixed="true">
84+
<group ref="tns:formattedAltTextGroup" minOccurs="0" maxOccurs="unbounded"/>
9085
</complexType>
91-
<group name="formattedTextGroup">
86+
<group name="formattedFixedTextGroup">
87+
<choice>
88+
<element name="p" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="unbounded"/>
89+
<element name="bullet" type="string" minOccurs="0" maxOccurs="unbounded"/>
90+
<element name="list" type="tns:listType" minOccurs="0" maxOccurs="unbounded"/>
91+
<element name="br" type="tns:emptyType" minOccurs="0" maxOccurs="unbounded"/>
92+
<element name="titleText" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
93+
<element name="copyrightText" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
94+
</choice>
95+
</group>
96+
<group name="formattedAltTextGroup">
9297
<choice>
93-
<element name="p" type="tns:formattedTextType" minOccurs="0" maxOccurs="unbounded"/>
98+
<element name="p" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="unbounded"/>
9499
<element name="bullet" type="string" minOccurs="0" maxOccurs="unbounded"/>
95100
<element name="list" type="tns:listType" minOccurs="0" maxOccurs="unbounded"/>
96101
<element name="optional" type="tns:optionalType" minOccurs="0" maxOccurs="unbounded"/>
97102
<element name="alt" type="tns:altType" minOccurs="0" maxOccurs="unbounded"/>
98103
<element name="br" type="tns:emptyType" minOccurs="0" maxOccurs="unbounded"/>
99-
<element name="titleText" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
100-
<element name="copyrightText" type="tns:formattedTextType" minOccurs="0" maxOccurs="1"/>
104+
<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
105+
<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
101106
</choice>
102107
</group>
103108
</schema>

0 commit comments

Comments
 (0)