# HG changeset patch
# User iinov
# Date 1536162878 -7200
# Node ID 61f23b379b5df98ed26b33ec4e249746e951fdb7
# Parent  58b2704e601a51f0646fa3b4d3de381604bfe36f
Intrus en exercice de tri

diff -r 58b2704e601a -r 61f23b379b5d Data/Quiz/sort.xml
--- a/Data/Quiz/sort.xml	mer. sept. 05 17:18:31 2018 +0200
+++ b/Data/Quiz/sort.xml	mer. sept. 05 17:54:38 2018 +0200
@@ -10,10 +10,10 @@
     </instructions>
 
     <sort>
-      <comparison>&lt;</comparison>
       <intruders>
         <item shuffle="4">cat</item>
       </intruders>
+      <comparison>&lt;</comparison>
       <item shuffle="6">59</item>
       <item shuffle="5">66</item>
       <item shuffle="1">73</item>
diff -r 58b2704e601a -r 61f23b379b5d RelaxNG/publiquiz.rnc
--- a/RelaxNG/publiquiz.rnc	mer. sept. 05 17:18:31 2018 +0200
+++ b/RelaxNG/publiquiz.rnc	mer. sept. 05 17:54:38 2018 +0200
@@ -281,8 +281,8 @@
  & orientation.attribute?
 
 sort.content =
+    sort.intruders?,
     comparison?,
-    sort.intruders?,
     sort.item,
     sort.item+
 
@@ -871,12 +871,7 @@
    inlines
  | (p, help?, answer?)
 
-# ~~~~~~~~~~~~~~~~~~~~~~~~ comparison, sort.item ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-# ~~~~~~ comparison
-comparison = element comparison { comparison.content }
-
-comparison.content = inlines
+# ~~~~~~~~~~~~~~~~~~~~ sort.intruders, comparison, sort.item ~~~~~~~~~~~~~~~~~~
 
 # ~~~~~~~ sort.intruders
 sort.intruders = element intruders { sort.intruders.content }
@@ -884,6 +879,11 @@
 sort.intruders.content =
    sort.item+
 
+# ~~~~~~ comparison
+comparison = element comparison { comparison.content }
+
+comparison.content = inlines
+
 # ~~~~~~ sort.item
 sort.item = element item { sort.item.attributes, sort.item.content }