@img/sharp-libvips-dev 1.2.2 → 1.2.3

package/include/libxml2/libxml/schemasInternals.h

@@ -1,13 +1,16 @@
-/*
- * Summary: internal interfaces for XML Schemas
- * Description: internal interfaces for the XML Schemas handling
+/**
+ * @file
+ * 
+ * @brief internal interfaces for XML Schemas
+ * 
+ * internal interfaces for the XML Schemas handling
  *              and schema validity checking
  *		The Schemas development is a Work In Progress.
  *              Some of those interfaces are not guaranteed to be API or ABI stable !
  *
- * Copy: See Copyright for the status of this software.
+ * @copyright See Copyright for the status of this software.
  *
- * Author: Daniel Veillard
+ * @author Daniel Veillard
  */
 
 
@@ -27,6 +30,9 @@
 extern "C" {
 #endif
 
+/**
+ * Schema value type
+ */
 typedef enum {
     XML_SCHEMAS_UNKNOWN = 0,
     XML_SCHEMAS_STRING = 1,
@@ -77,7 +83,7 @@ typedef enum {
     XML_SCHEMAS_ANYSIMPLETYPE = 46
 } xmlSchemaValType;
 
-/*
+/**
  * XML Schemas defines multiple type of types.
  */
 typedef enum {
@@ -123,6 +129,9 @@ typedef enum {
     XML_SCHEMA_EXTRA_ATTR_USE_PROHIB
 } xmlSchemaTypeType;
 
+/**
+ * Schema content type
+ */
 typedef enum {
     XML_SCHEMA_CONTENT_UNKNOWN = 0,
     XML_SCHEMA_CONTENT_EMPTY = 1,
@@ -134,118 +143,95 @@ typedef enum {
     XML_SCHEMA_CONTENT_ANY
 } xmlSchemaContentType;
 
+/** Schema value */
 typedef struct _xmlSchemaVal xmlSchemaVal;
 typedef xmlSchemaVal *xmlSchemaValPtr;
 
+/** Schema type */
 typedef struct _xmlSchemaType xmlSchemaType;
 typedef xmlSchemaType *xmlSchemaTypePtr;
 
+/** Schema facet */
 typedef struct _xmlSchemaFacet xmlSchemaFacet;
 typedef xmlSchemaFacet *xmlSchemaFacetPtr;
 
+/** Schema annotation */
+typedef struct _xmlSchemaAnnot xmlSchemaAnnot;
+typedef xmlSchemaAnnot *xmlSchemaAnnotPtr;
 /**
  * Annotation
  */
-typedef struct _xmlSchemaAnnot xmlSchemaAnnot;
-typedef xmlSchemaAnnot *xmlSchemaAnnotPtr;
 struct _xmlSchemaAnnot {
     struct _xmlSchemaAnnot *next;
-    xmlNodePtr content;         /* the annotation */
+    xmlNode *content;         /* the annotation */
 };
 
 /**
- * XML_SCHEMAS_ANYATTR_SKIP:
- *
  * Skip unknown attribute from validation
  * Obsolete, not used anymore.
  */
 #define XML_SCHEMAS_ANYATTR_SKIP        1
 /**
- * XML_SCHEMAS_ANYATTR_LAX:
- *
  * Ignore validation non definition on attributes
  * Obsolete, not used anymore.
  */
 #define XML_SCHEMAS_ANYATTR_LAX                2
 /**
- * XML_SCHEMAS_ANYATTR_STRICT:
- *
  * Apply strict validation rules on attributes
  * Obsolete, not used anymore.
  */
 #define XML_SCHEMAS_ANYATTR_STRICT        3
 /**
- * XML_SCHEMAS_ANY_SKIP:
- *
  * Skip unknown attribute from validation
  */
 #define XML_SCHEMAS_ANY_SKIP        1
 /**
- * XML_SCHEMAS_ANY_LAX:
- *
  * Used by wildcards.
  * Validate if type found, don't worry if not found
  */
 #define XML_SCHEMAS_ANY_LAX                2
 /**
- * XML_SCHEMAS_ANY_STRICT:
- *
  * Used by wildcards.
  * Apply strict validation rules
  */
 #define XML_SCHEMAS_ANY_STRICT        3
 /**
- * XML_SCHEMAS_ATTR_USE_PROHIBITED:
- *
  * Used by wildcards.
  * The attribute is prohibited.
  */
 #define XML_SCHEMAS_ATTR_USE_PROHIBITED 0
 /**
- * XML_SCHEMAS_ATTR_USE_REQUIRED:
- *
  * The attribute is required.
  */
 #define XML_SCHEMAS_ATTR_USE_REQUIRED 1
 /**
- * XML_SCHEMAS_ATTR_USE_OPTIONAL:
- *
  * The attribute is optional.
  */
 #define XML_SCHEMAS_ATTR_USE_OPTIONAL 2
 /**
- * XML_SCHEMAS_ATTR_GLOBAL:
- *
  * allow elements in no namespace
  */
 #define XML_SCHEMAS_ATTR_GLOBAL        1 << 0
 /**
- * XML_SCHEMAS_ATTR_NSDEFAULT:
- *
  * allow elements in no namespace
  */
 #define XML_SCHEMAS_ATTR_NSDEFAULT        1 << 7
 /**
- * XML_SCHEMAS_ATTR_INTERNAL_RESOLVED:
- *
  * this is set when the "type" and "ref" references
  * have been resolved.
  */
 #define XML_SCHEMAS_ATTR_INTERNAL_RESOLVED        1 << 8
 /**
- * XML_SCHEMAS_ATTR_FIXED:
- *
  * the attribute has a fixed value
  */
 #define XML_SCHEMAS_ATTR_FIXED        1 << 9
 
+/** Schema attribute definition */
+typedef struct _xmlSchemaAttribute xmlSchemaAttribute;
+typedef xmlSchemaAttribute *xmlSchemaAttributePtr;
 /**
- * xmlSchemaAttribute:
  * An attribute definition.
  */
-
-typedef struct _xmlSchemaAttribute xmlSchemaAttribute;
-typedef xmlSchemaAttribute *xmlSchemaAttributePtr;
 struct _xmlSchemaAttribute {
     xmlSchemaTypeType type;
     struct _xmlSchemaAttribute *next; /* the next attribute (not used?) */
@@ -255,110 +241,99 @@ struct _xmlSchemaAttribute {
     const xmlChar *refNs; /* Deprecated; not used */
     const xmlChar *typeName; /* the local name of the type definition */
     const xmlChar *typeNs; /* the ns URI of the type definition */
-    xmlSchemaAnnotPtr annot;
+    xmlSchemaAnnot *annot;
 
-    xmlSchemaTypePtr base; /* Deprecated; not used */
+    xmlSchemaType *base; /* Deprecated; not used */
     int occurs; /* Deprecated; not used */
     const xmlChar *defValue; /* The initial value of the value constraint */
-    xmlSchemaTypePtr subtypes; /* the type definition */
-    xmlNodePtr node;
+    xmlSchemaType *subtypes; /* the type definition */
+    xmlNode *node;
     const xmlChar *targetNamespace;
     int flags;
     const xmlChar *refPrefix; /* Deprecated; not used */
-    xmlSchemaValPtr defVal; /* The compiled value constraint */
-    xmlSchemaAttributePtr refDecl; /* Deprecated; not used */
+    xmlSchemaVal *defVal; /* The compiled value constraint */
+    xmlSchemaAttribute *refDecl; /* Deprecated; not used */
 };
 
+/** Linked list of schema attributes */
+typedef struct _xmlSchemaAttributeLink xmlSchemaAttributeLink;
+typedef xmlSchemaAttributeLink *xmlSchemaAttributeLinkPtr;
 /**
- * xmlSchemaAttributeLink:
  * Used to build a list of attribute uses on complexType definitions.
  * WARNING: Deprecated; not used.
  */
-typedef struct _xmlSchemaAttributeLink xmlSchemaAttributeLink;
-typedef xmlSchemaAttributeLink *xmlSchemaAttributeLinkPtr;
 struct _xmlSchemaAttributeLink {
     struct _xmlSchemaAttributeLink *next;/* the next attribute link ... */
     struct _xmlSchemaAttribute *attr;/* the linked attribute */
 };
 
 /**
- * XML_SCHEMAS_WILDCARD_COMPLETE:
- *
  * If the wildcard is complete.
  */
 #define XML_SCHEMAS_WILDCARD_COMPLETE 1 << 0
 
+/** Namespace wildcard */
+typedef struct _xmlSchemaWildcardNs xmlSchemaWildcardNs;
+typedef xmlSchemaWildcardNs *xmlSchemaWildcardNsPtr;
 /**
- * xmlSchemaCharValueLink:
  * Used to build a list of namespaces on wildcards.
  */
-typedef struct _xmlSchemaWildcardNs xmlSchemaWildcardNs;
-typedef xmlSchemaWildcardNs *xmlSchemaWildcardNsPtr;
 struct _xmlSchemaWildcardNs {
     struct _xmlSchemaWildcardNs *next;/* the next constraint link ... */
     const xmlChar *value;/* the value */
 };
 
+/** Name wildcard */
+typedef struct _xmlSchemaWildcard xmlSchemaWildcard;
+typedef xmlSchemaWildcard *xmlSchemaWildcardPtr;
 /**
- * xmlSchemaWildcard.
  * A wildcard.
  */
-typedef struct _xmlSchemaWildcard xmlSchemaWildcard;
-typedef xmlSchemaWildcard *xmlSchemaWildcardPtr;
 struct _xmlSchemaWildcard {
     xmlSchemaTypeType type;        /* The kind of type */
     const xmlChar *id; /* Deprecated; not used */
-    xmlSchemaAnnotPtr annot;
-    xmlNodePtr node;
+    xmlSchemaAnnot *annot;
+    xmlNode *node;
     int minOccurs; /* Deprecated; not used */
     int maxOccurs; /* Deprecated; not used */
     int processContents;
     int any; /* Indicates if the ns constraint is of ##any */
-    xmlSchemaWildcardNsPtr nsSet; /* The list of allowed namespaces */
-    xmlSchemaWildcardNsPtr negNsSet; /* The negated namespace */
+    xmlSchemaWildcardNs *nsSet; /* The list of allowed namespaces */
+    xmlSchemaWildcardNs *negNsSet; /* The negated namespace */
     int flags;
 };
 
 /**
- * XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED:
- *
  * The attribute wildcard has been built.
  */
 #define XML_SCHEMAS_ATTRGROUP_WILDCARD_BUILDED 1 << 0
 /**
- * XML_SCHEMAS_ATTRGROUP_GLOBAL:
- *
  * The attribute group has been defined.
  */
 #define XML_SCHEMAS_ATTRGROUP_GLOBAL 1 << 1
 /**
- * XML_SCHEMAS_ATTRGROUP_MARKED:
- *
  * Marks the attr group as marked; used for circular checks.
  */
 #define XML_SCHEMAS_ATTRGROUP_MARKED 1 << 2
 
 /**
- * XML_SCHEMAS_ATTRGROUP_REDEFINED:
- *
  * The attr group was redefined.
  */
 #define XML_SCHEMAS_ATTRGROUP_REDEFINED 1 << 3
 /**
- * XML_SCHEMAS_ATTRGROUP_HAS_REFS:
- *
  * Whether this attr. group contains attr. group references.
  */
 #define XML_SCHEMAS_ATTRGROUP_HAS_REFS 1 << 4
 
+/** Attribute group */
+typedef struct _xmlSchemaAttributeGroup xmlSchemaAttributeGroup;
+typedef xmlSchemaAttributeGroup *xmlSchemaAttributeGroupPtr;
 /**
  * An attribute group definition.
  *
  * xmlSchemaAttribute and xmlSchemaAttributeGroup start of structures
  * must be kept similar
  */
-typedef struct _xmlSchemaAttributeGroup xmlSchemaAttributeGroup;
-typedef xmlSchemaAttributeGroup *xmlSchemaAttributeGroupPtr;
 struct _xmlSchemaAttributeGroup {
     xmlSchemaTypeType type;        /* The kind of type */
     struct _xmlSchemaAttribute *next;/* the next attribute if in a group ... */
@@ -366,75 +341,63 @@ struct _xmlSchemaAttributeGroup {
     const xmlChar *id;
     const xmlChar *ref; /* Deprecated; not used */
     const xmlChar *refNs; /* Deprecated; not used */
-    xmlSchemaAnnotPtr annot;
+    xmlSchemaAnnot *annot;
 
-    xmlSchemaAttributePtr attributes; /* Deprecated; not used */
-    xmlNodePtr node;
+    xmlSchemaAttribute *attributes; /* Deprecated; not used */
+    xmlNode *node;
     int flags;
-    xmlSchemaWildcardPtr attributeWildcard;
+    xmlSchemaWildcard *attributeWildcard;
     const xmlChar *refPrefix; /* Deprecated; not used */
-    xmlSchemaAttributeGroupPtr refItem; /* Deprecated; not used */
+    xmlSchemaAttributeGroup *refItem; /* Deprecated; not used */
     const xmlChar *targetNamespace;
     void *attrUses;
 };
 
+/** Linked list of schema types */
+typedef struct _xmlSchemaTypeLink xmlSchemaTypeLink;
+typedef xmlSchemaTypeLink *xmlSchemaTypeLinkPtr;
 /**
- * xmlSchemaTypeLink:
  * Used to build a list of types (e.g. member types of
  * simpleType with variety "union").
  */
-typedef struct _xmlSchemaTypeLink xmlSchemaTypeLink;
-typedef xmlSchemaTypeLink *xmlSchemaTypeLinkPtr;
 struct _xmlSchemaTypeLink {
     struct _xmlSchemaTypeLink *next;/* the next type link ... */
-    xmlSchemaTypePtr type;/* the linked type */
+    xmlSchemaType *type;/* the linked type */
 };
 
+/** Linked list of schema facets */
+typedef struct _xmlSchemaFacetLink xmlSchemaFacetLink;
+typedef xmlSchemaFacetLink *xmlSchemaFacetLinkPtr;
 /**
- * xmlSchemaFacetLink:
  * Used to build a list of facets.
  */
-typedef struct _xmlSchemaFacetLink xmlSchemaFacetLink;
-typedef xmlSchemaFacetLink *xmlSchemaFacetLinkPtr;
 struct _xmlSchemaFacetLink {
     struct _xmlSchemaFacetLink *next;/* the next facet link ... */
-    xmlSchemaFacetPtr facet;/* the linked facet */
+    xmlSchemaFacet *facet;/* the linked facet */
 };
 
 /**
- * XML_SCHEMAS_TYPE_MIXED:
- *
  * the element content type is mixed
  */
 #define XML_SCHEMAS_TYPE_MIXED                1 << 0
 /**
- * XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION:
- *
  * the simple or complex type has a derivation method of "extension".
  */
 #define XML_SCHEMAS_TYPE_DERIVATION_METHOD_EXTENSION                1 << 1
 /**
- * XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION:
- *
  * the simple or complex type has a derivation method of "restriction".
  */
 #define XML_SCHEMAS_TYPE_DERIVATION_METHOD_RESTRICTION                1 << 2
 /**
- * XML_SCHEMAS_TYPE_GLOBAL:
- *
  * the type is global
  */
 #define XML_SCHEMAS_TYPE_GLOBAL                1 << 3
 /**
- * XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD:
- *
  * the complexType owns an attribute wildcard, i.e.
  * it can be freed by the complexType
  */
 #define XML_SCHEMAS_TYPE_OWNED_ATTR_WILDCARD    1 << 4 /* Obsolete. */
 /**
- * XML_SCHEMAS_TYPE_VARIETY_ABSENT:
- *
  * the simpleType has a variety of "absent".
  * TODO: Actually not necessary :-/, since if
  * none of the variety flags occur then it's
@@ -442,162 +405,112 @@ struct _xmlSchemaFacetLink {
  */
 #define XML_SCHEMAS_TYPE_VARIETY_ABSENT    1 << 5
 /**
- * XML_SCHEMAS_TYPE_VARIETY_LIST:
- *
  * the simpleType has a variety of "list".
  */
 #define XML_SCHEMAS_TYPE_VARIETY_LIST    1 << 6
 /**
- * XML_SCHEMAS_TYPE_VARIETY_UNION:
- *
  * the simpleType has a variety of "union".
  */
 #define XML_SCHEMAS_TYPE_VARIETY_UNION    1 << 7
 /**
- * XML_SCHEMAS_TYPE_VARIETY_ATOMIC:
- *
  * the simpleType has a variety of "union".
  */
 #define XML_SCHEMAS_TYPE_VARIETY_ATOMIC    1 << 8
 /**
- * XML_SCHEMAS_TYPE_FINAL_EXTENSION:
- *
  * the complexType has a final of "extension".
  */
 #define XML_SCHEMAS_TYPE_FINAL_EXTENSION    1 << 9
 /**
- * XML_SCHEMAS_TYPE_FINAL_RESTRICTION:
- *
  * the simpleType/complexType has a final of "restriction".
  */
 #define XML_SCHEMAS_TYPE_FINAL_RESTRICTION    1 << 10
 /**
- * XML_SCHEMAS_TYPE_FINAL_LIST:
- *
  * the simpleType has a final of "list".
  */
 #define XML_SCHEMAS_TYPE_FINAL_LIST    1 << 11
 /**
- * XML_SCHEMAS_TYPE_FINAL_UNION:
- *
  * the simpleType has a final of "union".
  */
 #define XML_SCHEMAS_TYPE_FINAL_UNION    1 << 12
 /**
- * XML_SCHEMAS_TYPE_FINAL_DEFAULT:
- *
  * the simpleType has a final of "default".
  */
 #define XML_SCHEMAS_TYPE_FINAL_DEFAULT    1 << 13
 /**
- * XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE:
- *
  * Marks the item as a builtin primitive.
  */
 #define XML_SCHEMAS_TYPE_BUILTIN_PRIMITIVE    1 << 14
 /**
- * XML_SCHEMAS_TYPE_MARKED:
- *
  * Marks the item as marked; used for circular checks.
  */
 #define XML_SCHEMAS_TYPE_MARKED        1 << 16
 /**
- * XML_SCHEMAS_TYPE_BLOCK_DEFAULT:
- *
  * the complexType did not specify 'block' so use the default of the
- * <schema> item.
+ * `<schema>` item.
  */
 #define XML_SCHEMAS_TYPE_BLOCK_DEFAULT    1 << 17
 /**
- * XML_SCHEMAS_TYPE_BLOCK_EXTENSION:
- *
  * the complexType has a 'block' of "extension".
  */
 #define XML_SCHEMAS_TYPE_BLOCK_EXTENSION    1 << 18
 /**
- * XML_SCHEMAS_TYPE_BLOCK_RESTRICTION:
- *
  * the complexType has a 'block' of "restriction".
  */
 #define XML_SCHEMAS_TYPE_BLOCK_RESTRICTION    1 << 19
 /**
- * XML_SCHEMAS_TYPE_ABSTRACT:
- *
  * the simple/complexType is abstract.
  */
 #define XML_SCHEMAS_TYPE_ABSTRACT    1 << 20
 /**
- * XML_SCHEMAS_TYPE_FACETSNEEDVALUE:
- *
  * indicates if the facets need a computed value
  */
 #define XML_SCHEMAS_TYPE_FACETSNEEDVALUE    1 << 21
 /**
- * XML_SCHEMAS_TYPE_INTERNAL_RESOLVED:
- *
  * indicates that the type was typefixed
  */
 #define XML_SCHEMAS_TYPE_INTERNAL_RESOLVED    1 << 22
 /**
- * XML_SCHEMAS_TYPE_INTERNAL_INVALID:
- *
  * indicates that the type is invalid
  */
 #define XML_SCHEMAS_TYPE_INTERNAL_INVALID    1 << 23
 /**
- * XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE:
- *
  * a whitespace-facet value of "preserve"
  */
 #define XML_SCHEMAS_TYPE_WHITESPACE_PRESERVE    1 << 24
 /**
- * XML_SCHEMAS_TYPE_WHITESPACE_REPLACE:
- *
  * a whitespace-facet value of "replace"
  */
 #define XML_SCHEMAS_TYPE_WHITESPACE_REPLACE    1 << 25
 /**
- * XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE:
- *
  * a whitespace-facet value of "collapse"
  */
 #define XML_SCHEMAS_TYPE_WHITESPACE_COLLAPSE    1 << 26
 /**
- * XML_SCHEMAS_TYPE_HAS_FACETS:
- *
  * has facets
  */
 #define XML_SCHEMAS_TYPE_HAS_FACETS    1 << 27
 /**
- * XML_SCHEMAS_TYPE_NORMVALUENEEDED:
- *
  * indicates if the facets (pattern) need a normalized value
  */
 #define XML_SCHEMAS_TYPE_NORMVALUENEEDED    1 << 28
 
 /**
- * XML_SCHEMAS_TYPE_FIXUP_1:
- *
  * First stage of fixup was done.
  */
 #define XML_SCHEMAS_TYPE_FIXUP_1    1 << 29
 
 /**
- * XML_SCHEMAS_TYPE_REDEFINED:
- *
  * The type was redefined.
  */
 #define XML_SCHEMAS_TYPE_REDEFINED    1 << 30
+#if 0
 /**
- * XML_SCHEMAS_TYPE_REDEFINING:
- *
  * The type redefines an other type.
  */
-/* #define XML_SCHEMAS_TYPE_REDEFINING    1 << 31 */
+#define XML_SCHEMAS_TYPE_REDEFINING    1 << 31
+#endif
 
 /**
- * _xmlSchemaType:
- *
  * Schemas type definition.
  */
 struct _xmlSchemaType {
@@ -607,10 +520,10 @@ struct _xmlSchemaType {
     const xmlChar *id ; /* Deprecated; not used */
     const xmlChar *ref; /* Deprecated; not used */
     const xmlChar *refNs; /* Deprecated; not used */
-    xmlSchemaAnnotPtr annot;
-    xmlSchemaTypePtr subtypes;
-    xmlSchemaAttributePtr attributes; /* Deprecated; not used */
-    xmlNodePtr node;
+    xmlSchemaAnnot *annot;
+    xmlSchemaType *subtypes;
+    xmlSchemaAttribute *attributes; /* Deprecated; not used */
+    xmlNode *node;
     int minOccurs; /* Deprecated; not used */
     int maxOccurs; /* Deprecated; not used */
 
@@ -618,151 +531,113 @@ struct _xmlSchemaType {
     xmlSchemaContentType contentType;
     const xmlChar *base; /* Base type's local name */
     const xmlChar *baseNs; /* Base type's target namespace */
-    xmlSchemaTypePtr baseType; /* The base type component */
-    xmlSchemaFacetPtr facets; /* Local facets */
+    xmlSchemaType *baseType; /* The base type component */
+    xmlSchemaFacet *facets; /* Local facets */
     struct _xmlSchemaType *redef; /* Deprecated; not used */
     int recurse; /* Obsolete */
-    xmlSchemaAttributeLinkPtr *attributeUses; /* Deprecated; not used */
-    xmlSchemaWildcardPtr attributeWildcard;
+    xmlSchemaAttributeLink **attributeUses; /* Deprecated; not used */
+    xmlSchemaWildcard *attributeWildcard;
     int builtInType; /* Type of built-in types. */
-    xmlSchemaTypeLinkPtr memberTypes; /* member-types if a union type. */
-    xmlSchemaFacetLinkPtr facetSet; /* All facets (incl. inherited) */
+    xmlSchemaTypeLink *memberTypes; /* member-types if a union type. */
+    xmlSchemaFacetLink *facetSet; /* All facets (incl. inherited) */
     const xmlChar *refPrefix; /* Deprecated; not used */
-    xmlSchemaTypePtr contentTypeDef; /* Used for the simple content of complex types.
+    xmlSchemaType *contentTypeDef; /* Used for the simple content of complex types.
                                         Could we use @subtypes for this? */
-    xmlRegexpPtr contModel; /* Holds the automaton of the content model */
+    xmlRegexp *contModel; /* Holds the automaton of the content model */
     const xmlChar *targetNamespace;
     void *attrUses;
 };
 
-/*
- * xmlSchemaElement:
- * An element definition.
- *
- * xmlSchemaType, xmlSchemaFacet and xmlSchemaElement start of
- * structures must be kept similar
- */
 /**
- * XML_SCHEMAS_ELEM_NILLABLE:
- *
  * the element is nillable
  */
 #define XML_SCHEMAS_ELEM_NILLABLE        1 << 0
 /**
- * XML_SCHEMAS_ELEM_GLOBAL:
- *
  * the element is global
  */
 #define XML_SCHEMAS_ELEM_GLOBAL                1 << 1
 /**
- * XML_SCHEMAS_ELEM_DEFAULT:
- *
  * the element has a default value
  */
 #define XML_SCHEMAS_ELEM_DEFAULT        1 << 2
 /**
- * XML_SCHEMAS_ELEM_FIXED:
- *
  * the element has a fixed value
  */
 #define XML_SCHEMAS_ELEM_FIXED                1 << 3
 /**
- * XML_SCHEMAS_ELEM_ABSTRACT:
- *
  * the element is abstract
  */
 #define XML_SCHEMAS_ELEM_ABSTRACT        1 << 4
 /**
- * XML_SCHEMAS_ELEM_TOPLEVEL:
- *
  * the element is top level
  * obsolete: use XML_SCHEMAS_ELEM_GLOBAL instead
  */
 #define XML_SCHEMAS_ELEM_TOPLEVEL        1 << 5
 /**
- * XML_SCHEMAS_ELEM_REF:
- *
  * the element is a reference to a type
  */
 #define XML_SCHEMAS_ELEM_REF                1 << 6
 /**
- * XML_SCHEMAS_ELEM_NSDEFAULT:
- *
  * allow elements in no namespace
  * Obsolete, not used anymore.
  */
 #define XML_SCHEMAS_ELEM_NSDEFAULT        1 << 7
 /**
- * XML_SCHEMAS_ELEM_INTERNAL_RESOLVED:
- *
  * this is set when "type", "ref", "substitutionGroup"
  * references have been resolved.
  */
 #define XML_SCHEMAS_ELEM_INTERNAL_RESOLVED        1 << 8
  /**
- * XML_SCHEMAS_ELEM_CIRCULAR:
- *
  * a helper flag for the search of circular references.
  */
 #define XML_SCHEMAS_ELEM_CIRCULAR        1 << 9
 /**
- * XML_SCHEMAS_ELEM_BLOCK_ABSENT:
- *
  * the "block" attribute is absent
  */
 #define XML_SCHEMAS_ELEM_BLOCK_ABSENT        1 << 10
 /**
- * XML_SCHEMAS_ELEM_BLOCK_EXTENSION:
- *
  * disallowed substitutions are absent
  */
 #define XML_SCHEMAS_ELEM_BLOCK_EXTENSION        1 << 11
 /**
- * XML_SCHEMAS_ELEM_BLOCK_RESTRICTION:
- *
  * disallowed substitutions: "restriction"
  */
 #define XML_SCHEMAS_ELEM_BLOCK_RESTRICTION        1 << 12
 /**
- * XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION:
- *
  * disallowed substitutions: "substitution"
  */
 #define XML_SCHEMAS_ELEM_BLOCK_SUBSTITUTION        1 << 13
 /**
- * XML_SCHEMAS_ELEM_FINAL_ABSENT:
- *
  * substitution group exclusions are absent
  */
 #define XML_SCHEMAS_ELEM_FINAL_ABSENT        1 << 14
 /**
- * XML_SCHEMAS_ELEM_FINAL_EXTENSION:
- *
  * substitution group exclusions: "extension"
  */
 #define XML_SCHEMAS_ELEM_FINAL_EXTENSION        1 << 15
 /**
- * XML_SCHEMAS_ELEM_FINAL_RESTRICTION:
- *
  * substitution group exclusions: "restriction"
  */
 #define XML_SCHEMAS_ELEM_FINAL_RESTRICTION        1 << 16
 /**
- * XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD:
- *
  * the declaration is a substitution group head
  */
 #define XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD        1 << 17
 /**
- * XML_SCHEMAS_ELEM_INTERNAL_CHECKED:
- *
  * this is set when the elem decl has been checked against
  * all constraints
  */
 #define XML_SCHEMAS_ELEM_INTERNAL_CHECKED        1 << 18
 
+/** Schema element definition */
 typedef struct _xmlSchemaElement xmlSchemaElement;
 typedef xmlSchemaElement *xmlSchemaElementPtr;
+/**
+ * An element definition.
+ *
+ * xmlSchemaType, xmlSchemaFacet and xmlSchemaElement start of
+ * structures must be kept similar
+ */
 struct _xmlSchemaElement {
     xmlSchemaTypeType type; /* The kind of type */
     struct _xmlSchemaType *next; /* Not used? */
@@ -770,10 +645,10 @@ struct _xmlSchemaElement {
     const xmlChar *id; /* Deprecated; not used */
     const xmlChar *ref; /* Deprecated; not used */
     const xmlChar *refNs; /* Deprecated; not used */
-    xmlSchemaAnnotPtr annot;
-    xmlSchemaTypePtr subtypes; /* the type definition */
-    xmlSchemaAttributePtr attributes;
-    xmlNodePtr node;
+    xmlSchemaAnnot *annot;
+    xmlSchemaType *subtypes; /* the type definition */
+    xmlSchemaAttribute *attributes;
+    xmlNode *node;
     int minOccurs; /* Deprecated; not used */
     int maxOccurs; /* Deprecated; not used */
 
@@ -787,34 +662,26 @@ struct _xmlSchemaElement {
     const xmlChar *value; /* The original value of the value constraint. */
     struct _xmlSchemaElement *refDecl; /* This will now be used for the
                                           substitution group affiliation */
-    xmlRegexpPtr contModel; /* Obsolete for WXS, maybe used for RelaxNG */
+    xmlRegexp *contModel; /* Obsolete for WXS, maybe used for RelaxNG */
     xmlSchemaContentType contentType;
     const xmlChar *refPrefix; /* Deprecated; not used */
-    xmlSchemaValPtr defVal; /* The compiled value constraint. */
+    xmlSchemaVal *defVal; /* The compiled value constraint. */
     void *idcs; /* The identity-constraint defs */
 };
 
-/*
- * XML_SCHEMAS_FACET_UNKNOWN:
- *
+/**
  * unknown facet handling
  */
 #define XML_SCHEMAS_FACET_UNKNOWN        0
-/*
- * XML_SCHEMAS_FACET_PRESERVE:
- *
+/**
  * preserve the type of the facet
  */
 #define XML_SCHEMAS_FACET_PRESERVE        1
-/*
- * XML_SCHEMAS_FACET_REPLACE:
- *
+/**
  * replace the type of the facet
  */
 #define XML_SCHEMAS_FACET_REPLACE        2
-/*
- * XML_SCHEMAS_FACET_COLLAPSE:
- *
+/**
  * collapse the types of the facet
  */
 #define XML_SCHEMAS_FACET_COLLAPSE        3
@@ -826,23 +693,24 @@ struct _xmlSchemaFacet {
     struct _xmlSchemaFacet *next;/* the next type if in a sequence ... */
     const xmlChar *value; /* The original value */
     const xmlChar *id; /* Obsolete */
-    xmlSchemaAnnotPtr annot;
-    xmlNodePtr node;
+    xmlSchemaAnnot *annot;
+    xmlNode *node;
     int fixed; /* XML_SCHEMAS_FACET_PRESERVE, etc. */
     int whitespace;
-    xmlSchemaValPtr val; /* The compiled value */
-    xmlRegexpPtr    regexp; /* The regex for patterns */
+    xmlSchemaVal *val; /* The compiled value */
+    xmlRegexp      *regexp; /* The regex for patterns */
 };
 
+/** Schema notation */
+typedef struct _xmlSchemaNotation xmlSchemaNotation;
+typedef xmlSchemaNotation *xmlSchemaNotationPtr;
 /**
  * A notation definition.
  */
-typedef struct _xmlSchemaNotation xmlSchemaNotation;
-typedef xmlSchemaNotation *xmlSchemaNotationPtr;
 struct _xmlSchemaNotation {
     xmlSchemaTypeType type; /* The kind of type */
     const xmlChar *name;
-    xmlSchemaAnnotPtr annot;
+    xmlSchemaAnnot *annot;
     const xmlChar *identifier;
     const xmlChar *targetNamespace;
 };
@@ -854,71 +722,49 @@ struct _xmlSchemaNotation {
 * on the component level as per spec.
 */
 /**
- * XML_SCHEMAS_QUALIF_ELEM:
- *
  * Reflects elementFormDefault == qualified in
  * an XML schema document.
  */
 #define XML_SCHEMAS_QUALIF_ELEM                1 << 0
 /**
- * XML_SCHEMAS_QUALIF_ATTR:
- *
  * Reflects attributeFormDefault == qualified in
  * an XML schema document.
  */
 #define XML_SCHEMAS_QUALIF_ATTR            1 << 1
 /**
- * XML_SCHEMAS_FINAL_DEFAULT_EXTENSION:
- *
  * the schema has "extension" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_EXTENSION        1 << 2
 /**
- * XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION:
- *
  * the schema has "restriction" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_RESTRICTION            1 << 3
 /**
- * XML_SCHEMAS_FINAL_DEFAULT_LIST:
- *
  * the schema has "list" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_LIST            1 << 4
 /**
- * XML_SCHEMAS_FINAL_DEFAULT_UNION:
- *
  * the schema has "union" in the set of finalDefault.
  */
 #define XML_SCHEMAS_FINAL_DEFAULT_UNION            1 << 5
 /**
- * XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION:
- *
  * the schema has "extension" in the set of blockDefault.
  */
 #define XML_SCHEMAS_BLOCK_DEFAULT_EXTENSION            1 << 6
 /**
- * XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION:
- *
  * the schema has "restriction" in the set of blockDefault.
  */
 #define XML_SCHEMAS_BLOCK_DEFAULT_RESTRICTION            1 << 7
 /**
- * XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION:
- *
  * the schema has "substitution" in the set of blockDefault.
  */
 #define XML_SCHEMAS_BLOCK_DEFAULT_SUBSTITUTION            1 << 8
 /**
- * XML_SCHEMAS_INCLUDING_CONVERT_NS:
- *
  * the schema is currently including an other schema with
  * no target namespace.
  */
 #define XML_SCHEMAS_INCLUDING_CONVERT_NS            1 << 9
 /**
- * _xmlSchema:
- *
  * A Schemas definition
  */
 struct _xmlSchema {
@@ -926,30 +772,30 @@ struct _xmlSchema {
     const xmlChar *targetNamespace; /* the target namespace */
     const xmlChar *version;
     const xmlChar *id; /* Obsolete */
-    xmlDocPtr doc;
-    xmlSchemaAnnotPtr annot;
+    xmlDoc *doc;
+    xmlSchemaAnnot *annot;
     int flags;
 
-    xmlHashTablePtr typeDecl;
-    xmlHashTablePtr attrDecl;
-    xmlHashTablePtr attrgrpDecl;
-    xmlHashTablePtr elemDecl;
-    xmlHashTablePtr notaDecl;
+    xmlHashTable *typeDecl;
+    xmlHashTable *attrDecl;
+    xmlHashTable *attrgrpDecl;
+    xmlHashTable *elemDecl;
+    xmlHashTable *notaDecl;
 
-    xmlHashTablePtr schemasImports;
+    xmlHashTable *schemasImports;
 
     void *_private;        /* unused by the library for users or bindings */
-    xmlHashTablePtr groupDecl;
-    xmlDictPtr      dict;
+    xmlHashTable *groupDecl;
+    xmlDict        *dict;
     void *includes;     /* the includes, this is opaque for now */
     int preserve;        /* whether to free the document */
     int counter; /* used to give anonymous components unique names */
-    xmlHashTablePtr idcDef; /* All identity-constraint defs. */
+    xmlHashTable *idcDef; /* All identity-constraint defs. */
     void *volatiles; /* Obsolete */
 };
 
-XMLPUBFUN void         xmlSchemaFreeType        (xmlSchemaTypePtr type);
-XMLPUBFUN void         xmlSchemaFreeWildcard(xmlSchemaWildcardPtr wildcard);
+XMLPUBFUN void         xmlSchemaFreeType        (xmlSchemaType *type);
+XMLPUBFUN void         xmlSchemaFreeWildcard(xmlSchemaWildcard *wildcard);
 
 #ifdef __cplusplus
 }