From 6f4561a49ce71a46972f893cf6e76d92345a2724 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Mon, 25 Mar 2002 12:10:14 +0000
Subject: [PATCH] Never commit without running "make tests" :-( fix a couple of
 stupidities

* valid.c SAX.c: Never commit without running "make tests" :-(
  fix a couple of stupidities in the previous commit
* result/*: a few changes in some attribute order result of previous
  commit.
Daniel
---
 ChangeLog                         | 7 +++++++
 SAX.c                             | 3 ++-
 result/noent/ns4                  | 2 +-
 result/ns4                        | 2 +-
 result/valid/REC-xml-19980210.xml | 8 ++++----
 result/valid/xhtml1.xhtml         | 2 +-
 valid.c                           | 3 ---
 7 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8b6247be..a54cb3d7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 25 13:08:21 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+	* valid.c SAX.c: Never commit without running "make tests" :-(
+	  fix a couple of stupidities in the previous commit
+	* result/*: a few changes in some attribute order result of previous
+	  commit.
+
 Mon Mar 25 11:46:05 CET 2002 Daniel Veillard <daniel@veillard.com>
 
 	* valid.c SAX.c: fixed bug #76168, attribute redeclared in
diff --git a/SAX.c b/SAX.c
index bcc80899..e48b1493 100644
--- a/SAX.c
+++ b/SAX.c
@@ -1303,7 +1303,8 @@ startElement(void *ctx, const xmlChar *fullname, const xmlChar **atts)
 	    }
 	} else {
 	    while ((att != NULL) && (value != NULL)) {
-		if ((att[0] != 'x') || (att[1] != 'm') || (att[2] != 'l'))
+		if ((att[0] != 'x') || (att[1] != 'm') || (att[2] != 'l') ||
+		    (att[3] != 'n') || (att[4] != 's'))
 		    attribute(ctxt, att, value);
 
 		/*
diff --git a/result/noent/ns4 b/result/noent/ns4
index fb7bc3e7..136bf923 100644
--- a/result/noent/ns4
+++ b/result/noent/ns4
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<diagram xml:lang="en" xml:link="simple" xml:space="preserve" testattr="test"/>
+<diagram testattr="test" xml:lang="en" xml:link="simple" xml:space="preserve"/>
diff --git a/result/ns4 b/result/ns4
index fb7bc3e7..136bf923 100644
--- a/result/ns4
+++ b/result/ns4
@@ -1,2 +1,2 @@
 <?xml version="1.0"?>
-<diagram xml:lang="en" xml:link="simple" xml:space="preserve" testattr="test"/>
+<diagram testattr="test" xml:lang="en" xml:link="simple" xml:space="preserve"/>
diff --git a/result/valid/REC-xml-19980210.xml b/result/valid/REC-xml-19980210.xml
index 45d941e7..ccc38d6e 100644
--- a/result/valid/REC-xml-19980210.xml
+++ b/result/valid/REC-xml-19980210.xml
@@ -3365,7 +3365,7 @@ Ravi Sethi, and Jeffrey D. Ullman.
 <emph>Compilers:  Principles, Techniques, and Tools</emph>.
 Reading:  Addison-Wesley, 1986, rpt. corr. 1988.</bibl>
 
-<bibl xml-link="simple" id="Berners-Lee" key="Berners-Lee et al.">
+<bibl id="Berners-Lee" xml-link="simple" key="Berners-Lee et al.">
 Berners-Lee, T., R. Fielding, and L. Masinter.
 <emph>Uniform Resource Identifiers (URI):  Generic Syntax and
 Semantics</emph>.
@@ -3391,21 +3391,21 @@ Bericht 38, Oktober 1991.
 Comparison of SGML and XML. See
 <loc href="http://www.w3.org/TR/NOTE-sgml-xml-971215">http://www.w3.org/TR/NOTE-sgml-xml-971215</loc>.
 </bibl>
-<bibl xml-link="simple" id="RFC1738" key="IETF RFC1738">
+<bibl id="RFC1738" xml-link="simple" key="IETF RFC1738">
 IETF (Internet Engineering Task Force).
 <emph>RFC 1738:  Uniform Resource Locators (URL)</emph>, 
 ed. T. Berners-Lee, L. Masinter, M. McCahill.
 1994.
 </bibl>
 
-<bibl xml-link="simple" id="RFC1808" key="IETF RFC1808">
+<bibl id="RFC1808" xml-link="simple" key="IETF RFC1808">
 IETF (Internet Engineering Task Force).
 <emph>RFC 1808:  Relative Uniform Resource Locators</emph>, 
 ed. R. Fielding.
 1995.
 </bibl>
 
-<bibl xml-link="simple" id="RFC2141" key="IETF RFC2141">
+<bibl id="RFC2141" xml-link="simple" key="IETF RFC2141">
 IETF (Internet Engineering Task Force).
 <emph>RFC 2141:  URN Syntax</emph>, 
 ed. R. Moats.
diff --git a/result/valid/xhtml1.xhtml b/result/valid/xhtml1.xhtml
index 6089e4e2..b90f8980 100644
--- a/result/valid/xhtml1.xhtml
+++ b/result/valid/xhtml1.xhtml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "dtds/xhtml1-strict.dtd">
 <?xml-stylesheet href="W3C-PR.css" type="text/css"?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>XHTML 1.0: The Extensible HyperText Markup
 Language</title>
diff --git a/valid.c b/valid.c
index 1f1845d1..53b4a926 100644
--- a/valid.c
+++ b/valid.c
@@ -3382,9 +3382,6 @@ xmlValidateOneAttribute(xmlValidCtxtPtr ctxt, xmlDocPtr doc,
     if ((elem == NULL) || (elem->name == NULL)) return(0);
     if ((attr == NULL) || (attr->name == NULL)) return(0);
 
-    if (xmlStrEqual(attr->name, "lang")) {
-	printf("hello\n");
-    }
     if ((elem->ns != NULL) && (elem->ns->prefix != NULL)) {
 	xmlChar qname[500];
 	snprintf((char *) qname, sizeof(qname), "%s:%s",