more work on Relax-NG, implementing interleave augmented/updated the
* relaxng.c: more work on Relax-NG, implementing interleave
* test/relaxng/* result/relaxng/*: augmented/updated the
regression tests
Daniel
diff --git a/test/relaxng/tutor8_2.rng b/test/relaxng/tutor8_2.rng
new file mode 100644
index 0000000..495968e
--- /dev/null
+++ b/test/relaxng/tutor8_2.rng
@@ -0,0 +1,57 @@
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+ <start>
+ <ref name="head"/>
+ </start>
+ <define name="head">
+ <element name="head">
+ <interleave>
+ <ref name="title"/>
+ <optional>
+ <ref name="base"/>
+ </optional>
+ <zeroOrMore>
+ <ref name="style"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="script"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="link"/>
+ </zeroOrMore>
+ <zeroOrMore>
+ <ref name="meta"/>
+ </zeroOrMore>
+ </interleave>
+ </element>
+ </define>
+ <define name="title">
+ <element name="title">
+ <text/>
+ </element>
+ </define>
+ <define name="base">
+ <element name="base">
+ <text/>
+ </element>
+ </define>
+ <define name="style">
+ <element name="style">
+ <text/>
+ </element>
+ </define>
+ <define name="script">
+ <element name="script">
+ <text/>
+ </element>
+ </define>
+ <define name="meta">
+ <element name="meta">
+ <text/>
+ </element>
+ </define>
+ <define name="link">
+ <element name="link">
+ <text/>
+ </element>
+ </define>
+</grammar>
diff --git a/test/relaxng/tutor8_2_1.xml b/test/relaxng/tutor8_2_1.xml
new file mode 100644
index 0000000..fed80d4
--- /dev/null
+++ b/test/relaxng/tutor8_2_1.xml
@@ -0,0 +1,5 @@
+<head>
+ <meta>meta1</meta>
+ <title>foo</title>
+ <meta>meta2</meta>
+</head>
diff --git a/test/relaxng/tutor8_2_2.xml b/test/relaxng/tutor8_2_2.xml
new file mode 100644
index 0000000..24c2e6b
--- /dev/null
+++ b/test/relaxng/tutor8_2_2.xml
@@ -0,0 +1,36 @@
+<head>
+ <meta>meta</meta>
+ <meta>meta</meta>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <base>base</base>
+ <title>foo</title>
+ <meta>meta</meta>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <meta>meta</meta>
+ <meta>meta</meta>
+ <meta>meta</meta>
+ <meta>meta</meta>
+ <meta>meta</meta>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+ <script>script</script>
+ <link>link</link>
+ <style>link</style>
+</head>
diff --git a/test/relaxng/tutor8_2_3.xml b/test/relaxng/tutor8_2_3.xml
new file mode 100644
index 0000000..920f99d
--- /dev/null
+++ b/test/relaxng/tutor8_2_3.xml
@@ -0,0 +1,3 @@
+<head>
+ <title>title</title>
+</head>
diff --git a/test/relaxng/tutor8_2_4.xml b/test/relaxng/tutor8_2_4.xml
new file mode 100644
index 0000000..68f3865
--- /dev/null
+++ b/test/relaxng/tutor8_2_4.xml
@@ -0,0 +1,6 @@
+<head>
+ <meta>meta1</meta>
+ <title>foo</title>
+ <meta>meta2</meta>
+ <title>error</title>
+</head>
diff --git a/test/relaxng/tutor8_2_5.xml b/test/relaxng/tutor8_2_5.xml
new file mode 100644
index 0000000..75b9d53
--- /dev/null
+++ b/test/relaxng/tutor8_2_5.xml
@@ -0,0 +1,3 @@
+<head>
+ <meta>meta2</meta>
+</head>
diff --git a/test/relaxng/tutor8_2_6.xml b/test/relaxng/tutor8_2_6.xml
new file mode 100644
index 0000000..20fb4c7
--- /dev/null
+++ b/test/relaxng/tutor8_2_6.xml
@@ -0,0 +1,5 @@
+<head>
+ <base>base</base>
+ <title>foo</title>
+ <base>error</base>
+</head>
diff --git a/test/relaxng/tutor8_3.rng b/test/relaxng/tutor8_3.rng
new file mode 100644
index 0000000..b68814d
--- /dev/null
+++ b/test/relaxng/tutor8_3.rng
@@ -0,0 +1,9 @@
+<element name="content" xmlns="http://relaxng.org/ns/structure/1.0">
+ <interleave>
+ <text/>
+ <element name="p">
+ <text/>
+ </element>
+ </interleave>
+</element>
+
diff --git a/test/relaxng/tutor8_3_1.xml b/test/relaxng/tutor8_3_1.xml
new file mode 100644
index 0000000..86ea447
--- /dev/null
+++ b/test/relaxng/tutor8_3_1.xml
@@ -0,0 +1 @@
+<content> how are you <p> 'yau de poelle </p> ? </content>