From b8a083017d16fc6d1db5f38d91f945a8489af892 Mon Sep 17 00:00:00 2001
From: Jan Wielemaker <wielemak@science.uva.nl>
Date: Wed, 20 Dec 2000 15:07:52 +0000
Subject: [PATCH] * Added some more tests

---
 Test/amp.sgml     |  7 +++++++
 Test/entent.sgml  | 10 ++++++++++
 Test/ok/amp.ok    |  1 +
 Test/ok/entent.ok |  1 +
 Test/sr.sgml      |  4 ++--
 5 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 Test/amp.sgml
 create mode 100644 Test/entent.sgml
 create mode 100644 Test/ok/amp.ok
 create mode 100644 Test/ok/entent.ok

diff --git a/Test/amp.sgml b/Test/amp.sgml
new file mode 100644
index 0000000..beae6e8
--- /dev/null
+++ b/Test/amp.sgml
@@ -0,0 +1,7 @@
+<!DOCTYPE test [
+  <!ELEMENT test o o (p)*>
+  <!ELEMENT p    o o (#PCDATA)>
+  <!ENTITY amp CDATA "&#38;">
+]>
+
+&amp;
diff --git a/Test/entent.sgml b/Test/entent.sgml
new file mode 100644
index 0000000..8c3c068
--- /dev/null
+++ b/Test/entent.sgml
@@ -0,0 +1,10 @@
+<!DOCTYPE oops [
+ <!ENTITY s CDATA "attr">
+ <!ENTITY o STARTTAG "snag &#38;s;=2">
+ <!ELEMENT snag - O EMPTY>
+ <!ATTLIST snag attr NUMBER #REQUIRED>
+ <!ELEMENT oops - O RCDATA>
+]>
+
+<oops>
+&o;
diff --git a/Test/ok/amp.ok b/Test/ok/amp.ok
new file mode 100644
index 0000000..4672c0c
--- /dev/null
+++ b/Test/ok/amp.ok
@@ -0,0 +1 @@
+[element(test, [], [element(p, [], [&])])].
diff --git a/Test/ok/entent.ok b/Test/ok/entent.ok
new file mode 100644
index 0000000..721c268
--- /dev/null
+++ b/Test/ok/entent.ok
@@ -0,0 +1 @@
+[element(oops, [], ['<snag attr=2>'])].
diff --git a/Test/sr.sgml b/Test/sr.sgml
index 5ed0e30..26b351f 100644
--- a/Test/sr.sgml
+++ b/Test/sr.sgml
@@ -1,5 +1,5 @@
 <!DOCTYPE test [
-  <!ELEMENT test - - p*>
+  <!ELEMENT test - - (p)*>
   <!ELEMENT p    o o (#PCDATA|q)*>
   <!ELEMENT q    - - (#PCDATA)>
 
@@ -8,7 +8,7 @@
   <!ENTITY   beg..p STARTTAG "p">
 
   <!SHORTREF in..p  '"' beg..q
-		    '&#RS;B&#RE' beg..p>
+		    '&#RS;B&#RE;' beg..p>
   <!SHORTREF in..q  '"' end..q>
   <!USEMAP in..p p>
 ]>