Skip to content

Commit

Permalink
allows any element in infocontrol (even portableInfoControl) in all a…
Browse files Browse the repository at this point in the history 
…pip xsd's
  • Loading branch information
antoinerobin committed May 26, 2016
1 parent 75a7b2d commit 068bcea
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 238 deletions.
52 changes: 2 additions & 50 deletions model/qti/data/apipv1p0/Core_Level/Package/apipv1p0_qtiitemv2p1_v1p0.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5142,57 +5142,9 @@
The 'InfoControl' complexType is the container to provide the candidate with extra information about the item when s/he chooses to trigger the control. The extra information can be a hint, but could also be additional tools such as a ruler or a (javaScript) calculator.
</xs:documentation>
</xs:annotation>
<!-- antoine@taotesting : fixed to allow any element as per information model description -->
<xs:sequence>
<xs:choice minOccurs = "0" maxOccurs = "unbounded">
<xs:element ref="printedVariable" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="feedbackBlock" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="feedbackInline" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="templateInline" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="templateBlock" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="m:math" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="xi:include" minOccurs = "1" maxOccurs = "1"/>
<xs:choice minOccurs = "1" maxOccurs = "1">
<xs:element ref="pre" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h1" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h2" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h3" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h4" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h5" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h6" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="p" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="address" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dl" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ol" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ul" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="br" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="hr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="img" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="object" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="blockquote" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="em" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="a" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="code" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="span" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sub" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="acronym" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="big" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="tt" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="kbd" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="q" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="i" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dfn" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="abbr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="strong" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sup" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="var" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="small" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="samp" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="b" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="cite" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="table" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="div" minOccurs = "1" maxOccurs = "1"/>
</xs:choice>
</xs:choice>
<xs:group ref="grpLax.any"/>
</xs:sequence>
<xs:attributeGroup ref="id.InfoControl.Attr"/>
<xs:attributeGroup ref="title.InfoControl.Attr"/>
Expand Down
46 changes: 2 additions & 44 deletions model/qti/data/apipv1p0/Core_Level/Package/apipv1p0_qtitestv2p1_v1p0.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2552,51 +2552,9 @@
The 'InfoControl' complexType is the container to provide the candidate with extra information about the item when s/he chooses to trigger the control. The extra information can be a hint, but could also be additional tools such as a ruler or a (javaScript) calculator.
</xs:documentation>
</xs:annotation>
<!-- antoine@taotesting : fixed to allow any element as per information model description -->
<xs:sequence>
<xs:choice minOccurs = "0" maxOccurs = "unbounded">
<xs:element ref="m:math" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="xi:include" minOccurs = "1" maxOccurs = "1"/>
<xs:choice minOccurs = "1" maxOccurs = "1">
<xs:element ref="pre" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h1" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h2" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h3" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h4" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h5" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h6" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="p" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="address" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dl" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ol" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ul" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="br" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="hr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="img" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="blockquote" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="em" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="a" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="code" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="span" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sub" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="acronym" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="big" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="tt" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="kbd" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="q" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="i" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dfn" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="abbr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="strong" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sup" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="var" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="small" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="samp" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="b" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="cite" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="table" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="div" minOccurs = "1" maxOccurs = "1"/>
</xs:choice>
</xs:choice>
<xs:group ref="grpLax.any"/>
</xs:sequence>
<xs:attributeGroup ref="id.InfoControl.Attr"/>
<xs:attributeGroup ref="title.InfoControl.Attr"/>
Expand Down
52 changes: 2 additions & 50 deletions model/qti/data/apipv1p0/Entry_Level/Package/apipv1p0_qtiitemv2p1_v1p0.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5142,57 +5142,9 @@
The 'InfoControl' complexType is the container to provide the candidate with extra information about the item when s/he chooses to trigger the control. The extra information can be a hint, but could also be additional tools such as a ruler or a (javaScript) calculator.
</xs:documentation>
</xs:annotation>
<!-- antoine@taotesting : fixed to allow any element as per information model description -->
<xs:sequence>
<xs:choice minOccurs = "0" maxOccurs = "unbounded">
<xs:element ref="printedVariable" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="feedbackBlock" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="feedbackInline" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="templateInline" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="templateBlock" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="m:math" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="xi:include" minOccurs = "1" maxOccurs = "1"/>
<xs:choice minOccurs = "1" maxOccurs = "1">
<xs:element ref="pre" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h1" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h2" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h3" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h4" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h5" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h6" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="p" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="address" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dl" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ol" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ul" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="br" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="hr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="img" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="object" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="blockquote" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="em" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="a" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="code" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="span" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sub" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="acronym" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="big" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="tt" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="kbd" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="q" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="i" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dfn" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="abbr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="strong" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sup" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="var" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="small" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="samp" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="b" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="cite" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="table" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="div" minOccurs = "1" maxOccurs = "1"/>
</xs:choice>
</xs:choice>
<xs:group ref="grpLax.any"/>
</xs:sequence>
<xs:attributeGroup ref="id.InfoControl.Attr"/>
<xs:attributeGroup ref="title.InfoControl.Attr"/>
Expand Down
46 changes: 2 additions & 44 deletions model/qti/data/apipv1p0/Entry_Level/Package/apipv1p0_qtitestv2p1_v1p0.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2553,51 +2553,9 @@
The 'InfoControl' complexType is the container to provide the candidate with extra information about the item when s/he chooses to trigger the control. The extra information can be a hint, but could also be additional tools such as a ruler or a (javaScript) calculator.
</xs:documentation>
</xs:annotation>
<!-- antoine@taotesting : fixed to allow any element as per information model description -->
<xs:sequence>
<xs:choice minOccurs = "0" maxOccurs = "unbounded">
<xs:element ref="m:math" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="xi:include" minOccurs = "1" maxOccurs = "1"/>
<xs:choice minOccurs = "1" maxOccurs = "1">
<xs:element ref="pre" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h1" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h2" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h3" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h4" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h5" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="h6" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="p" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="address" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dl" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ol" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="ul" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="br" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="hr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="img" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="blockquote" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="em" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="a" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="code" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="span" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sub" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="acronym" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="big" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="tt" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="kbd" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="q" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="i" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="dfn" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="abbr" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="strong" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="sup" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="var" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="small" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="samp" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="b" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="cite" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="table" minOccurs = "1" maxOccurs = "1"/>
<xs:element ref="div" minOccurs = "1" maxOccurs = "1"/>
</xs:choice>
</xs:choice>
<xs:group ref="grpLax.any"/>
</xs:sequence>
<xs:attributeGroup ref="id.InfoControl.Attr"/>
<xs:attributeGroup ref="title.InfoControl.Attr"/>
Expand Down
Loading

0 comments on commit 068bcea

Please sign in to comment.