* Fixed handling &<tag>

* Added make check

ChangeLog

@@ -1,3 +1,7 @@
+* ADDED: `make check' to run the test-suite.
+
+* FIXED: Handling of &<tag> (Richard O'Keefe).
+
 * FIXED: dtd2pl to use model(Model) to avoid amibity between CDATA and
   (CDATA) model.  Richard O'Keefe.
 

Makefile.in

@@ -62,7 +62,7 @@ install-dtd:
 		done
 
 check:
-		@echo "No check provided yet"
+		cd Test && $(PL) -f test.pl -g test,halt.
 
 uninstall:
 		(cd $(PLBASE)/lib/$(PLARCH) && rm -f $(TARGETS))

Test/noent.sgml

@@ -0,0 +1,14 @@
+<!DOCTYPE tiny-htm [
+  <!ELEMENT tiny-htm  - - (p|pre)+>
+  <!ELEMENT p         - O (#PCDATA|i|b|var)*>
+  <!ELEMENT pre       - O (#PCDATA|i|b|var)*>
+  <!ELEMENT (i|b|var) - - (#PCDATA|i|b|var)*>
+ ]>
+<tiny-htm>
+<p>This demonstrates the problem:
+<pre>
+  <var>status</var> = DOM_<var>operation</var
+>, &<var>result</var>);
+</pre>
+<p>I hope this helps.
+</tiny-htm>

Test/ok/noent.ok

@@ -0,0 +1 @@
+[element('tiny-htm', [], [element(p, [], ['This demonstrates the problem:']), element(pre, [], ['  ', element(var, [], [status]), ' = DOM_', element(var, [], [operation]), ', &', element(var, [], [result]), ');']), element(p, [], ['I hope this helps.'])])].

Test/test.pl

@@ -18,6 +18,11 @@
 	    test/0
 	  ]).
 
+:- asserta(user:file_search_path(library, '..')).
+:- asserta(user:file_search_path(foreign, '..')).
+:- use_module(library(sgml)).
+
+
 test :-
 	testdir(.).
 

parser.c

@@ -4244,8 +4244,8 @@ putchar_dtd_parser(dtd_parser *p, int chr)
 	p->state = S_ENT;
       } else
       { add_cdata(p, f[CF_ERO]);
-	add_cdata(p, chr);
 	p->state = p->cdata_state;
+	goto reprocess;
       }
 
       return;