fixed & serialization bug introduced in 2.4.20 this changes a few things

* HTMLtree.c: fixed & serialization bug introduced in 2.4.20
* result/HTML/*: this changes a few things in the results
Daniel
diff --git a/xmlschemas.c b/xmlschemas.c
index e47b382..a7566c3 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -3041,7 +3041,24 @@
 	    break;
 	}
 	case XML_SCHEMA_TYPE_RESTRICTION:
+	    if (type->baseType != NULL) {
+		TODO
+	    } else if (type->subtypes != NULL)
+		xmlSchemaBuildAContentModel(type->subtypes, ctxt, name);
+	    break;
 	case XML_SCHEMA_TYPE_EXTENSION:
+	    if (type->baseType != NULL) {
+		xmlSchemaTypePtr subtypes;
+
+		xmlSchemaBuildAContentModel(type->baseType, ctxt, name);
+		subtypes = type->subtypes;
+		while (subtypes != NULL) {
+		    xmlSchemaBuildAContentModel(subtypes, ctxt, name);
+		    subtypes = subtypes->next;
+		}
+	    } else if (type->subtypes != NULL)
+		xmlSchemaBuildAContentModel(type->subtypes, ctxt, name);
+	    break;
 	case XML_SCHEMA_TYPE_GROUP:
 	case XML_SCHEMA_TYPE_COMPLEX:
 	case XML_SCHEMA_TYPE_COMPLEX_CONTENT: