I f...ed up the default configuration of schemas and --relaxng option
* configure.in xmllint.c: I f...ed up the default configuration
of schemas and --relaxng option display in xmllint, pointed by
Morus Walter.
* xlink.c: Sean Chittenden pointed a couple of errors in the XLink
detection module, fixes bug #105374.
Daniel
diff --git a/ChangeLog b/ChangeLog
index d69c40a..e7fc742 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Feb 7 13:34:08 CET 2003 Daniel Veillard <daniel@veillard.com>
+
+ * configure.in xmllint.c: I f...ed up the default configuration
+ of schemas and --relaxng option display in xmllint, pointed by
+ Morus Walter.
+ * xlink.c: Sean Chittenden pointed a couple of errors in the XLink
+ detection module, fixes bug #105374.
+
Fri Feb 7 01:43:38 CET 2003 Daniel Veillard <daniel@veillard.com>
* xmlschemastypes.c: added the boolean base type.
diff --git a/configure.in b/configure.in
index 363401a..e9f3801 100644
--- a/configure.in
+++ b/configure.in
@@ -333,12 +333,6 @@
if test "${with_docbook}" = "" ; then
with_docbook="yes"
fi
- if test "${with_xptr}" = "" ; then
- with_xptr="yes"
- fi
- if test "${with_schemas}" = "" ; then
- with_schemas="yes"
- fi
CFLAGS="-g -O -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline -Wredundant-decls "
dnl -Wcast-qual -ansi
fi
@@ -580,15 +574,15 @@
AC_SUBST(WITH_ICONV)
AC_ARG_WITH(schemas, [ --with-schemas Add experimental Schemas/RelaxNG support (on)])
-if test "$with_schemas" = "yes" ; then
+if test "$with_schemas" = "no" ; then
+ echo "Disabled Schemas/Relax-NG support"
+ WITH_SCHEMAS=0
+ TEST_SCHEMAS=
+else
echo "Enabled Schemas/Relax-NG support"
WITH_SCHEMAS=1
TEST_SCHEMAS="Schemastests Relaxtests"
with_regexps=yes
-else
- echo "Disabled Schemas/Relax-NG support"
- WITH_SCHEMAS=0
- TEST_SCHEMAS=
fi
AC_SUBST(WITH_SCHEMAS)
AC_SUBST(TEST_SCHEMAS)
diff --git a/doc/libxml2-api.xml b/doc/libxml2-api.xml
index c527532..ad21fcd 100644
--- a/doc/libxml2-api.xml
+++ b/doc/libxml2-api.xml
@@ -3525,11 +3525,11 @@
<arg name='ctx' type='void *' info='the user data (XML parser context)'/>
</functype>
<function name='htmlAttrAllowed' file='HTMLparser'>
- <info></info>
- <return type='htmlStatus' info=''/>
- <arg name='elt' type='const htmlElemDesc *' info=''/>
- <arg name='attr' type='const xmlChar *' info=''/>
- <arg name='legacy' type='int' info=''/>
+ <info>Checks whether an attribute is valid for an element Has full knowledge of Required and Deprecated attributes</info>
+ <return type='htmlStatus' info='one of HTML_REQUIRED, HTML_VALID, HTML_DEPRECATED, HTML_INVALID'/>
+ <arg name='elt' type='const htmlElemDesc *' info='HTML element'/>
+ <arg name='attr' type='const xmlChar *' info='HTML attribute'/>
+ <arg name='legacy' type='int' info='whether to allow deprecated attributes'/>
</function>
<function name='htmlAutoCloseTag' file='HTMLparser'>
<info>The HTML DTD allows a tag to implicitly close other tags. The list is kept in htmlStartClose array. This function checks if the element or one of it's children would autoclose the given tag.</info>
@@ -3705,8 +3705,8 @@
<arg name='encoding' type='const char *' info='the encoding string'/>
</function>
<function name='htmlNodeStatus' file='HTMLparser'>
- <info></info>
- <return type='htmlStatus' info=''/>
+ <info>for Element nodes) Checks whether the tree node is valid. Experimental (the author only uses the HTML enhancements in a SAX parser)</info>
+ <return type='htmlStatus' info='for Element nodes, a return from htmlElementAllowedHere (if legacy allowed) or htmlElementStatusHere (otherwise). for Attribute nodes, a return from htmlAttrAllowed for other nodes, HTML_NA (no checks performed)'/>
<arg name='node' type='const htmlNodePtr' info=''/>
<arg name='legacy' type='int' info=''/>
</function>
diff --git a/xlink.c b/xlink.c
index 17ec77f..d7fc602 100644
--- a/xlink.c
+++ b/xlink.c
@@ -147,9 +147,9 @@
*/
type = xmlGetNsProp(node, BAD_CAST"type", XLINK_NAMESPACE);
if (type != NULL) {
- if (!xmlStrEqual(type, BAD_CAST "simple")) {
+ if (xmlStrEqual(type, BAD_CAST "simple")) {
ret = XLINK_TYPE_SIMPLE;
- } if (!xmlStrEqual(type, BAD_CAST "extended")) {
+ } if (xmlStrEqual(type, BAD_CAST "extended")) {
role = xmlGetNsProp(node, BAD_CAST "role", XLINK_NAMESPACE);
if (role != NULL) {
xmlNsPtr xlink;
diff --git a/xmllint.c b/xmllint.c
index fc5aa1a..8b47f74 100644
--- a/xmllint.c
+++ b/xmllint.c
@@ -1215,7 +1215,7 @@
printf("\t--dropdtd : remove the DOCTYPE of the input docs\n");
printf("\t--stream : use the streaming interface to process very large files\n");
printf("\t--chkregister : verify the node registration code\n");
-#ifdef LIBXML_XINCLUDE_ENABLED
+#ifdef LIBXML_SCHEMAS_ENABLED
printf("\t--relaxng schema : do RelaxNG validation against the schema\n");
#endif
printf("\nLibxml project home page: http://xmlsoft.org/\n");