- parser.c test/wap.xml result/noent/wap.xml result/wap.xml:
  Closed bug #27499, added to regression tests
- TODO: updated
Daniel
diff --git a/ChangeLog b/ChangeLog
index 11a0ec6..68aa82c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sun Oct 15 12:00:24 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* parser.c test/wap.xml result/noent/wap.xml result/wap.xml:
+	  Closed bug #27499, added to regression tests
+	* TODO: updated
+
 Sun Oct 15 01:34:37 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* HTMLparser.c HTMLtree.[ch] SAX.c testHTML.c tree.c: fixed HTML
diff --git a/TODO b/TODO
index 640d4f5..a6155ff 100644
--- a/TODO
+++ b/TODO
@@ -30,9 +30,6 @@
 - jamesh suggestion: SAX like functions to save a document ie. call a
   function to open a new element with given attributes, write character
   data, close last element, etc
-- HTML: handling of Script data elements/attributes, need special code in
-  the parser and saving functions (handling of < > " ' ...):
-  http://www.w3.org/TR/html4/types.html#type-script
 
 TODO:
 =====
@@ -98,6 +95,10 @@
 Done:
 =====
 
+- HTML: handling of Script and style data elements, need special code in
+  the parser and saving functions (handling of < > " ' ...):
+  http://www.w3.org/TR/html4/types.html#type-script
+  Attributes are no problems since entities are accepted.
 - DOM needs
   xmlAttrPtr xmlNewDocProp(xmlDocPtr doc, const xmlChar *name, const xmlChar *value)
 - problem when parsing hrefs with & with the HTML parser (IRC ac)
diff --git a/parser.c b/parser.c
index 5ed22d3..675c82a 100644
--- a/parser.c
+++ b/parser.c
@@ -2077,8 +2077,7 @@
 		    buf[len++] = *current++;
 		}
 	    } else {
-		COPY_BUF(l,buf,len,val);
-		NEXTL(l);
+		len += xmlCopyChar(0, &buf[len], val);
 	    }
 	} else if (c == '&') {
 	    ent = xmlParseEntityRef(ctxt);
diff --git a/result/noent/wap.xml b/result/noent/wap.xml
new file mode 100644
index 0000000..694b49f
--- /dev/null
+++ b/result/noent/wap.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://dark.wapit.com/vswap/tests/wap/DTD/wml11.dtd">
+<!-- (C) 1999, 2000 WAP Forum Ltd.  All rights reserved -->
+<wml>
+<card id="card1">
+<onevent type="onenterforward">
+<go href="/vswap/run/result.eml">
+        <postfield name="var" value="$test"/>
+        <postfield name="v" value="dark"/>
+        <postfield name="ts" value="0003"/>
+        <postfield name="tp" value="wml/state/variables/parsing/1"/>
+        <postfield name="ti" value="1"/>
+        <postfield name="expected" value="var:pass"/>
+</go>
+</onevent>
+<p>If automatic testing failed, select <anchor>Failed<go href="/vswap/run/result.eml">
+        <postfield name="SUBMIT" value="No"/><postfield name="v" value="dark"/>
+        <postfield name="ts" value="0003"/>
+        <postfield name="tp" value="wml/state/variables/parsing/1"/>
+        <postfield name="ti" value="1"/>
+        <postfield name="expected" value="var:pass"/></go></anchor>.</p>
+</card>
+
+</wml>
diff --git a/result/wap.xml b/result/wap.xml
new file mode 100644
index 0000000..694b49f
--- /dev/null
+++ b/result/wap.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN" "http://dark.wapit.com/vswap/tests/wap/DTD/wml11.dtd">
+<!-- (C) 1999, 2000 WAP Forum Ltd.  All rights reserved -->
+<wml>
+<card id="card1">
+<onevent type="onenterforward">
+<go href="/vswap/run/result.eml">
+        <postfield name="var" value="$test"/>
+        <postfield name="v" value="dark"/>
+        <postfield name="ts" value="0003"/>
+        <postfield name="tp" value="wml/state/variables/parsing/1"/>
+        <postfield name="ti" value="1"/>
+        <postfield name="expected" value="var:pass"/>
+</go>
+</onevent>
+<p>If automatic testing failed, select <anchor>Failed<go href="/vswap/run/result.eml">
+        <postfield name="SUBMIT" value="No"/><postfield name="v" value="dark"/>
+        <postfield name="ts" value="0003"/>
+        <postfield name="tp" value="wml/state/variables/parsing/1"/>
+        <postfield name="ti" value="1"/>
+        <postfield name="expected" value="var:pass"/></go></anchor>.</p>
+</card>
+
+</wml>
diff --git a/test/wap.xml b/test/wap.xml
new file mode 100644
index 0000000..2795509
--- /dev/null
+++ b/test/wap.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<!DOCTYPE wml PUBLIC "-//WAPFORUM//DTD WML 1.1//EN"
+"http://dark.wapit.com/vswap/tests/wap/DTD/wml11.dtd">
+<!-- (C) 1999, 2000 WAP Forum Ltd.  All rights reserved -->
+<wml>
+<card id="card1">
+<onevent type="onenterforward">
+<go href="/vswap/run/result.eml">
+        <postfield name="var" value="&#36;test"/>
+        <postfield name="v" value="dark"/>
+        <postfield name="ts" value="0003"/>
+        <postfield name="tp" value="wml/state/variables/parsing/1"/>
+        <postfield name="ti" value="1"/>
+        <postfield name="expected" value="var:pass"/>
+</go>
+</onevent>
+<p>If automatic testing failed, select <anchor>Failed<go
+href='/vswap/run/result.eml'>
+        <postfield name="SUBMIT" value="No"/><postfield name="v"
+value="dark"/>
+        <postfield name="ts" value="0003"/>
+        <postfield name="tp" value="wml/state/variables/parsing/1"/>
+        <postfield name="ti" value="1"/>
+        <postfield name="expected" value="var:pass"/></go></anchor>.</p>
+</card>
+
+</wml>