Skip to content

add cardsort; premise has order attr #2552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wrigjl wants to merge 1 commit into
base: master
Choose a base branch
from
+36 −9
Open

add cardsort; premise has order attr #2552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions schema/pretext-dev.rnc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,14 +469,20 @@
attribute number {text}?,
StatementExercise,
Feedback?,
Matches,
Hint*, Answer*, Solution*
Matches = (
element matches {
Match+
},
Hint*, Answer*, Solution*
} |
element cardsort {
Match+
})
Match =
element match {
attribute order {xsd:integer}?,
element premise {
attribute order {xsd:integer}?,
mixed {BlockText?}
},
element response {
Expand Down
25 changes: 20 additions & 5 deletions schema/pretext-dev.rng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1281,11 +1281,7 @@
<optional>
<ref name="Feedback"/>
</optional>
<element name="matches">
<oneOrMore>
<ref name="Match"/>
</oneOrMore>
</element>
<ref name="Matches"/>
<zeroOrMore>
<ref name="Hint"/>
</zeroOrMore>
Expand All @@ -1296,6 +1292,20 @@
<ref name="Solution"/>
</zeroOrMore>
</define>
<define name="Matches">
<choice>
<element name="matches">
<oneOrMore>
<ref name="Match"/>
</oneOrMore>
</element>
<element name="cardsort">
<oneOrMore>
<ref name="Match"/>
</oneOrMore>
</element>
</choice>
</define>
<define name="Match">
<element name="match">
<optional>
Expand All @@ -1304,6 +1314,11 @@
</attribute>
</optional>
<element name="premise">
<optional>
<attribute name="order">
<data type="integer"/>
</attribute>
</optional>
<mixed>
<optional>
<ref name="BlockText"/>
Expand Down
10 changes: 8 additions & 2 deletions schema/pretext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2424,14 +2424,20 @@
attribute number {text}?,
StatementExercise,
Feedback?,
Matches,
Hint*, Answer*, Solution*
Matches = (
element matches {
Match+
},
Hint*, Answer*, Solution*
} |
element cardsort {
Match+
})
Match =
element match {
attribute order {xsd:integer}?,
element premise {
attribute order {xsd:integer}?,
mixed {BlockText?}
},
element response {
Expand Down