switched back to the previous Relax-NG code base, the derivation algorithm

* relaxng.c: switched back to the previous Relax-NG code base,
  the derivation algorithm need severe constraining code to avoid
  combinatorial explosion. Fixed the problem with Sebastian Rahtz
  TEI based example and other bugs
* result/relaxng/*err: updated the results
* test/relaxng/testsuite.xml: started a new test suite
Daniel

22 files changed, 21 insertions, 321 deletions

diff --git a/result/relaxng/spec1_err b/result/relaxng/spec1_err
index e3b2ee88..b9f01ac3 100644
--- a/result/relaxng/spec1_err
+++ b/result/relaxng/spec1_err
@@ -1,82 +1,12 @@
 RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element element, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element attribute, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element group, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element interleave, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element choice, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element optional, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element zeroOrMore, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element oneOrMore, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element list, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element mixed, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element ref, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element parentRef, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element empty, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element text, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element value, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element data, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element notAllowed, got nothing
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element externalRef, got nothing
+Expecting an element , got nothing
+RNG validity error: file ./test/relaxng/spec1.rng line 7 element documentation
+Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting an element grammar, got nothing
+Expecting an element , got nothing
 RNG validity error: file ./test/relaxng/spec1.rng line 7 element documentation
 Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/spec1.rng line 7 element documentation
 Element element failed to validate content
-RNG validity error: file ./test/relaxng/spec1.rng line 7 element documentation
-Element element has extra content: documentation
 RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
 Expecting element attribute, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element group, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element interleave, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element choice, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element optional, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element zeroOrMore, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element oneOrMore, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element list, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element mixed, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element ref, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element parentRef, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element empty, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element text, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element value, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element data, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element notAllowed, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element externalRef, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Expecting element grammar, got element
-RNG validity error: file ./test/relaxng/spec1.rng line 6 element element
-Extra data in the document
diff --git a/result/relaxng/tutor10_1_4.err b/result/relaxng/tutor10_1_4.err
index adee0071..862ed3a7 100644
--- a/result/relaxng/tutor10_1_4.err
+++ b/result/relaxng/tutor10_1_4.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor10_1_4.xml line 1 element foo
 Expecting a namespace for element foo
-RNG validity error: file ./test/relaxng/tutor10_1_4.xml line 1 element foo
-Extra data in the document
diff --git a/result/relaxng/tutor10_1_5.err b/result/relaxng/tutor10_1_5.err
index a985d4d3..73a01855 100644
--- a/result/relaxng/tutor10_1_5.err
+++ b/result/relaxng/tutor10_1_5.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor10_1_5.xml line 1 element foo
 Element foo has wrong namespace: expecting http://www.example.com
-RNG validity error: file ./test/relaxng/tutor10_1_5.xml line 1 element foo
-Extra data in the document
diff --git a/result/relaxng/tutor10_1_6.err b/result/relaxng/tutor10_1_6.err
index e6c640d3..b072f4bb 100644
--- a/result/relaxng/tutor10_1_6.err
+++ b/result/relaxng/tutor10_1_6.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor10_1_6.xml line 1 element foo
 Element foo has wrong namespace: expecting http://www.example.com
-RNG validity error: file ./test/relaxng/tutor10_1_6.xml line 1 element foo
-Extra data in the document
diff --git a/result/relaxng/tutor10_2_3.err b/result/relaxng/tutor10_2_3.err
index 90c19cdf..ee88e073 100644
--- a/result/relaxng/tutor10_2_3.err
+++ b/result/relaxng/tutor10_2_3.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor10_2_3.xml line 1 element foo
 Expecting no namespace for element foo
-RNG validity error: file ./test/relaxng/tutor10_2_3.xml line 1 element foo
-Extra data in the document
diff --git a/result/relaxng/tutor10_2_4.err b/result/relaxng/tutor10_2_4.err
index 6872bea3..e6314402 100644
--- a/result/relaxng/tutor10_2_4.err
+++ b/result/relaxng/tutor10_2_4.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor10_2_4.xml line 1 element foo
 Expecting no namespace for element foo
-RNG validity error: file ./test/relaxng/tutor10_2_4.xml line 1 element foo
-Extra data in the document
diff --git a/result/relaxng/tutor10_7_3.err b/result/relaxng/tutor10_7_3.err
index 85544c39..8e2d82b5 100644
--- a/result/relaxng/tutor10_7_3.err
+++ b/result/relaxng/tutor10_7_3.err
@@ -1,8 +1,4 @@
 RNG validity error: file ./test/relaxng/tutor10_7_3.xml line 2 element card
 Element card failed to validate attributes
 RNG validity error: file ./test/relaxng/tutor10_7_3.xml line 2 element card
-Invalid attribute name for element card
-RNG validity error: file ./test/relaxng/tutor10_7_3.xml line 2 element card
-Invalid attribute email for element card
-RNG validity error: file ./test/relaxng/tutor10_7_3.xml line 2 element card
 Element addressBook has extra content: card
diff --git a/result/relaxng/tutor10_8_3.err b/result/relaxng/tutor10_8_3.err
index 3b712f35..12cfcb77 100644
--- a/result/relaxng/tutor10_8_3.err
+++ b/result/relaxng/tutor10_8_3.err
@@ -1,8 +1,4 @@
 RNG validity error: file ./test/relaxng/tutor10_8_3.xml line 2 element card
 Element card failed to validate attributes
 RNG validity error: file ./test/relaxng/tutor10_8_3.xml line 2 element card
-Invalid attribute name for element card
-RNG validity error: file ./test/relaxng/tutor10_8_3.xml line 2 element card
-Invalid attribute email for element card
-RNG validity error: file ./test/relaxng/tutor10_8_3.xml line 2 element card
 Element addressBook has extra content: card
diff --git a/result/relaxng/tutor11_2_3.err b/result/relaxng/tutor11_2_3.err
index fed4d2dd..ef91cab0 100644
--- a/result/relaxng/tutor11_2_3.err
+++ b/result/relaxng/tutor11_2_3.err
@@ -1,2 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor11_2_3.xml line 3 element card
-Invalid attribute b for element card
+Invalid attribute foo for element card
diff --git a/result/relaxng/tutor12_1_err b/result/relaxng/tutor12_1_err
index 2cdc5e1a..6e5566bd 100644
--- a/result/relaxng/tutor12_1_err
+++ b/result/relaxng/tutor12_1_err
@@ -1,150 +1,28 @@
+RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
+Expecting an element , got nothing
+RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
+Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element element, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element attribute, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element group, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element interleave, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element choice, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element optional, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element zeroOrMore, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element oneOrMore, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element list, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element mixed, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element ref, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element parentRef, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element empty, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element text, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element value, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element data, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element notAllowed, got nothing
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element externalRef, got nothing
+Expecting an element , got nothing
+RNG validity error: file ./test/relaxng/tutor12_1.rng line 4 element documentation
+Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting an element grammar, got nothing
+Expecting an element , got nothing
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 4 element documentation
 Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 4 element documentation
 Element element failed to validate content
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 4 element documentation
-Element element has extra content: documentation
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
 Expecting element attribute, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element group, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element interleave, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element choice, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element optional, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element zeroOrMore, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element oneOrMore, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element list, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element mixed, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element ref, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element parentRef, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element empty, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element text, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element value, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element data, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element notAllowed, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element externalRef, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 3 element element
-Expecting element grammar, got element
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
 Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
 Element zeroOrMore failed to validate content
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
 Expecting element oneOrMore, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element list, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element mixed, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element ref, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element parentRef, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element empty, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element text, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element value, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element data, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element notAllowed, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element externalRef, got zeroOrMore
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 2 element zeroOrMore
-Expecting element grammar, got zeroOrMore
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
 Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
 Element element failed to validate content
 RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
 Expecting element attribute, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element group, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element interleave, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element choice, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element optional, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element zeroOrMore, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element oneOrMore, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element list, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element mixed, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element ref, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element parentRef, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element empty, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element text, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element value, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element data, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element notAllowed, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element externalRef, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Expecting element grammar, got element
-RNG validity error: file ./test/relaxng/tutor12_1.rng line 1 element element
-Extra data in the document
diff --git a/result/relaxng/tutor3_2_1.err b/result/relaxng/tutor3_2_1.err
index 615cb87d..83e9a57c 100644
--- a/result/relaxng/tutor3_2_1.err
+++ b/result/relaxng/tutor3_2_1.err
@@ -2,5 +2,3 @@ RNG validity error: file ./test/relaxng/tutor3_2_1.xml line 1 element email
 Expecting element name, got email
 RNG validity error: file ./test/relaxng/tutor3_2_1.xml line 1 element email
 Element card failed to validate content
-RNG validity error: file ./test/relaxng/tutor3_2_1.xml line 1 element email
-Element card has extra content: email
diff --git a/result/relaxng/tutor3_5_2.err b/result/relaxng/tutor3_5_2.err
index 42743a27..5cbf2033 100644
--- a/result/relaxng/tutor3_5_2.err
+++ b/result/relaxng/tutor3_5_2.err
@@ -1,6 +1,6 @@
-RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element name
+RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element email
+Expecting element name, got email
+RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element email
 Element card failed to validate content
-RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element name
-Element card has extra content: name
 RNG validity error: file ./test/relaxng/tutor3_5_2.xml line 2 element card
 Element addressBook has extra content: card
diff --git a/result/relaxng/tutor3_7_err b/result/relaxng/tutor3_7_err
index 89b14002..49948586 100644
--- a/result/relaxng/tutor3_7_err
+++ b/result/relaxng/tutor3_7_err
@@ -1,80 +1,12 @@
 RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element element, got nothing
+Expecting an element , got nothing
 RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element attribute, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element group, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element interleave, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element choice, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element optional, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element zeroOrMore, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element oneOrMore, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element list, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element mixed, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element ref, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element parentRef, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element empty, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element text, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element value, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element data, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element notAllowed, got nothing
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element externalRef, got nothing
+Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting an element grammar, got nothing
+Expecting an element , got nothing
 RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
 Invalid sequence in interleave
 RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
 Element element failed to validate content
 RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
 Expecting element attribute, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element group, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element interleave, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element choice, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element optional, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element zeroOrMore, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element oneOrMore, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element list, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element mixed, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element ref, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element parentRef, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element empty, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element text, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element value, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element data, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element notAllowed, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element externalRef, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Expecting element grammar, got element
-RNG validity error: file ./test/relaxng/tutor3_7.rng line 1 element element
-Extra data in the document
diff --git a/result/relaxng/tutor6_1_3.err b/result/relaxng/tutor6_1_3.err
index fa446379..3af31ee0 100644
--- a/result/relaxng/tutor6_1_3.err
+++ b/result/relaxng/tutor6_1_3.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor6_1_3.xml line 1 element card
 Element card failed to validate attributes
-RNG validity error: file ./test/relaxng/tutor6_1_3.xml line 1 element card
-Invalid attribute preferredFormat for element card
diff --git a/result/relaxng/tutor6_2_4.err b/result/relaxng/tutor6_2_4.err
index 17a825d8..dcba8644 100644
--- a/result/relaxng/tutor6_2_4.err
+++ b/result/relaxng/tutor6_2_4.err
@@ -1,10 +1,6 @@
 RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 4 element text
 Error validating value 
 RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 4 element text
-Error validating value 
-RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 4 element text
 Element preferredFormat failed to validate content
-RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 4 element text
-Element preferredFormat has extra content: text
 RNG validity error: file ./test/relaxng/tutor6_2_4.xml line 1 element card
 Element card failed to validate content
diff --git a/result/relaxng/tutor6_3_1.err b/result/relaxng/tutor6_3_1.err
index 64b75e28..7957caca 100644
--- a/result/relaxng/tutor6_3_1.err
+++ b/result/relaxng/tutor6_3_1.err
@@ -1,4 +1,2 @@
 RNG validity error: file ./test/relaxng/tutor6_3_1.xml line 1 element card
 Element card failed to validate attributes
-RNG validity error: file ./test/relaxng/tutor6_3_1.xml line 1 element card
-Invalid attribute preferredFormat for element card
diff --git a/result/relaxng/tutor7_1_2.err b/result/relaxng/tutor7_1_2.err
index 9b16493f..f5effb6b 100644
--- a/result/relaxng/tutor7_1_2.err
+++ b/result/relaxng/tutor7_1_2.err
@@ -4,5 +4,3 @@ RNG validity error: file ./test/relaxng/tutor7_1_2.xml line 1 element text
 Error validating list
 RNG validity error: file ./test/relaxng/tutor7_1_2.xml line 1 element text
 Element vector failed to validate content
-RNG validity error: file ./test/relaxng/tutor7_1_2.xml line 1 element text
-Element vector has extra content: text
diff --git a/result/relaxng/tutor7_1_3.err b/result/relaxng/tutor7_1_3.err
index b6ec7511..2a048cd2 100644
--- a/result/relaxng/tutor7_1_3.err
+++ b/result/relaxng/tutor7_1_3.err
@@ -4,5 +4,3 @@ RNG validity error: file ./test/relaxng/tutor7_1_3.xml line 1 element text
 Error validating list
 RNG validity error: file ./test/relaxng/tutor7_1_3.xml line 1 element text
 Element vector failed to validate content
-RNG validity error: file ./test/relaxng/tutor7_1_3.xml line 1 element text
-Element vector has extra content: text
diff --git a/result/relaxng/tutor7_3_4.err b/result/relaxng/tutor7_3_4.err
index 852837a8..8754d98c 100644
--- a/result/relaxng/tutor7_3_4.err
+++ b/result/relaxng/tutor7_3_4.err
@@ -4,5 +4,3 @@ RNG validity error: file ./test/relaxng/tutor7_3_4.xml line 1 element text
 Error validating list
 RNG validity error: file ./test/relaxng/tutor7_3_4.xml line 1 element text
 Element path failed to validate content
-RNG validity error: file ./test/relaxng/tutor7_3_4.xml line 1 element text
-Element path has extra content: text
diff --git a/result/relaxng/tutor7_3_5.err b/result/relaxng/tutor7_3_5.err
index 473c58bb..3d68250e 100644
--- a/result/relaxng/tutor7_3_5.err
+++ b/result/relaxng/tutor7_3_5.err
@@ -4,5 +4,3 @@ RNG validity error: file ./test/relaxng/tutor7_3_5.xml line 1 element text
 Error validating list
 RNG validity error: file ./test/relaxng/tutor7_3_5.xml line 1 element text
 Element path failed to validate content
-RNG validity error: file ./test/relaxng/tutor7_3_5.xml line 1 element text
-Element path has extra content: text
diff --git a/result/relaxng/tutor8_2_4.err b/result/relaxng/tutor8_2_4.err
index 2a1364dd..01a9ddb6 100644
--- a/result/relaxng/tutor8_2_4.err
+++ b/result/relaxng/tutor8_2_4.err
@@ -1,6 +1,4 @@
-RNG validity error: file ./test/relaxng/tutor8_2_4.xml line 5 element title
+RNG validity error
 Extra element title in interleave
 RNG validity error: file ./test/relaxng/tutor8_2_4.xml line 5 element title
 Element head failed to validate content
-RNG validity error: file ./test/relaxng/tutor8_2_4.xml line 5 element title
-Element head has extra content: title
diff --git a/result/relaxng/tutor8_2_6.err b/result/relaxng/tutor8_2_6.err
index 22f948ab..c1fb4d11 100644
--- a/result/relaxng/tutor8_2_6.err
+++ b/result/relaxng/tutor8_2_6.err
@@ -1,6 +1,4 @@
-RNG validity error: file ./test/relaxng/tutor8_2_6.xml line 4 element base
+RNG validity error
 Extra element base in interleave
 RNG validity error: file ./test/relaxng/tutor8_2_6.xml line 4 element base
 Element head failed to validate content
-RNG validity error: file ./test/relaxng/tutor8_2_6.xml line 4 element base
-Element head has extra content: base