removed some annoying warnings fixed a bug in the PubidChars definition,
* check-xml-test-suite.py: removed some annoying warnings
* chvalid.def chvalid.c include/libxml/chvalid.h: fixed a bug
in the PubidChars definition, regenerated, there is still
a bug left somewhere
* genChRanges.py: save the header directly in include/libxml/
* configure.in: I generated a 2.6.0beta6 earlier today
Daniel
diff --git a/ChangeLog b/ChangeLog
index 8ee6316..43beb48 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sat Oct 11 22:54:13 CEST 2003 Daniel Veillard <daniel@veillard.com>
+
+ * check-xml-test-suite.py: removed some annoying warnings
+ * chvalid.def chvalid.c include/libxml/chvalid.h: fixed a bug
+ in the PubidChars definition, regenerated, there is still
+ a bug left somewhere
+ * genChRanges.py: save the header directly in include/libxml/
+ * configure.in: I generated a 2.6.0beta6 earlier today
+
Sat Oct 11 23:32:47 HKT 2003 William Brack <wbrack@mmm.com.hk>
* fixed small error on previous commit (chvalid.h in
diff --git a/check-xml-test-suite.py b/check-xml-test-suite.py
index 23b0706..ed0eaa2 100755
--- a/check-xml-test-suite.py
+++ b/check-xml-test-suite.py
@@ -6,6 +6,11 @@
sys.path.append("python")
import libxml2
+test_nr = 0
+test_succeed = 0
+test_failed = 0
+test_error = 0
+
#
# the testsuite description
#
@@ -279,15 +284,10 @@
doc.freeDoc()
return 1
-test_nr = 0
-test_succeed = 0
-test_failed = 0
-test_error = 0
def runTest(test):
global test_nr
- global test_failed
- global test_error
global test_succeed
+ global test_failed
global error_msg
global log
@@ -391,11 +391,6 @@
case = testsuite.children
while case != None:
- global test_nr
- global test_succeed
- global test_failed
- global test_error
-
if case.name == 'TESTCASES':
old_test_nr = test_nr
old_test_succeed = test_succeed
diff --git a/chvalid.c b/chvalid.c
index ef64f76..47c2d4e 100755
--- a/chvalid.c
+++ b/chvalid.c
@@ -5,7 +5,7 @@
* This file is automatically generated from the cvs source
* definition files using the genChRanges.py Python script
*
- * Generation date: Sat Oct 11 23:54:34 2003
+ * Generation date: Sat Oct 11 22:34:08 2003
* Sources: chvalid.def
* William Brack <wbrack@mmm.com.hk>
*/
@@ -24,11 +24,11 @@
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00,
0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x01,
- 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
+ 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x00, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
- 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x00, 0x00, 0x01,
+ 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01,
0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/chvalid.def b/chvalid.def
index eed7ab5..1aab420 100755
--- a/chvalid.def
+++ b/chvalid.def
@@ -7,7 +7,7 @@
name xmlIsPubidChar
ur 0x20 0x0d 0x0a 'a'..'z' 'A'..'Z' '0'..'9'
-ur '-' '\' '(' ')' '+' ',' '.' '/'
+ur '-' 0x27 '(' ')' '+' ',' '.' '/'
ur ':' '=' '?' ';' '!' '*' '#' '@'
ur '$' '_' '%'
end
diff --git a/configure.in b/configure.in
index 23b2962..c8483ff 100644
--- a/configure.in
+++ b/configure.in
@@ -7,7 +7,7 @@
LIBXML_MAJOR_VERSION=2
LIBXML_MINOR_VERSION=6
LIBXML_MICRO_VERSION=0
-LIBXML_MICRO_VERSION_SUFFIX=beta5
+LIBXML_MICRO_VERSION_SUFFIX=beta6
LIBXML_VERSION=$LIBXML_MAJOR_VERSION.$LIBXML_MINOR_VERSION.$LIBXML_MICRO_VERSION$LIBXML_MICRO_VERSION_SUFFIX
LIBXML_VERSION_INFO=`expr $LIBXML_MAJOR_VERSION + $LIBXML_MINOR_VERSION`:$LIBXML_MICRO_VERSION:$LIBXML_MINOR_VERSION
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index a67dfb8..4cfee68 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -4796,7 +4796,6 @@
<field name='state' type='xmlAutomataStatePtr' info=' used to build the automata'/>
<field name='am' type='void *' info=''/>
<field name='state' type='void *' info=''/>
- <field name='serror' type='xmlStructuredErrorFunc' info=' structured error reporting capability'/>
</struct>
<typedef name='xmlValidCtxtPtr' file='valid' type='xmlValidCtxt *'/>
<struct name='xmlValidState' file='valid' type='struct _xmlValidState'/>
diff --git a/genChRanges.py b/genChRanges.py
index 81247bf..8ff470e 100755
--- a/genChRanges.py
+++ b/genChRanges.py
@@ -201,9 +201,9 @@
# Generate the headings:
#
try:
- header = open("chvalid.h", "w")
+ header = open("include/libxml/chvalid.h", "w")
except:
- print "Failed to open chvalid.h"
+ print "Failed to open include/libxml/chvalid.h"
sys.exit(1)
try:
diff --git a/include/libxml/chvalid.h b/include/libxml/chvalid.h
index e4140cf..975a8f8 100644
--- a/include/libxml/chvalid.h
+++ b/include/libxml/chvalid.h
@@ -5,7 +5,7 @@
* This file is automatically generated from the cvs source
* definition files using the genChRanges.py Python script
*
- * Generation date: Sat Oct 11 23:30:43 2003
+ * Generation date: Sat Oct 11 22:34:08 2003
* Sources: chvalid.def
* William Brack <wbrack@mmm.com.hk>
*/