Add range possibility in xsd

Complete the "todo" from the compound.xsd (as found by sonalcloud).
doxygen · Nov 27, 2023 · 5babbc7 · 5babbc7
1 parent c87ad3c
commit 5babbc7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/addon/doxmlparser/doxmlparser/compound.py b/addon/doxmlparser/doxmlparser/compound.py
@@ -19501,7 +19501,7 @@ def __init__(self, level=None, ulink=None, bold=None, s=None, strike=None, under
         self.original_tagname_ = None
         self.parent_object_ = kwargs_.get('parent_object_')
         self.ns_prefix_ = None
-        self.level = _cast(int, level)
+        self.level = _cast(None, level)
         self.level_nsprefix_ = None
         if ulink is None:
             self.ulink = []
@@ -20032,7 +20032,7 @@ def export(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='d
     def exportAttributes(self, outfile, level, already_processed, namespaceprefix_='', name_='docHeadingType'):
         if self.level is not None and 'level' not in already_processed:
             already_processed.add('level')
-            outfile.write(' level="%s"' % self.gds_format_integer(self.level, input_name='level'))
+            outfile.write(' level=%s' % (quote_attrib(self.level), ))
     def exportChildren(self, outfile, level, namespaceprefix_='', namespacedef_='', name_='docHeadingType', fromsubclass_=False, pretty_print=True):
         if not fromsubclass_:
             for item_ in self.content_:
@@ -20153,7 +20153,7 @@ def buildAttributes(self, node, attrs, already_processed):
         value = find_attr_value_('level', node)
         if value is not None and 'level' not in already_processed:
             already_processed.add('level')
-            self.level = self.gds_parse_integer(value, node, 'level')
+            self.level = value
     def buildChildren(self, child_, node, nodeName_, fromsubclass_=False, gds_collector_=None):
         if nodeName_ == 'ulink':
             obj_ = docURLLink.factory(parent_object_=self)

diff --git a/templates/xml/compound.xsd b/templates/xml/compound.xsd
@@ -683,9 +683,16 @@
     <xsd:attribute name="id" type="xsd:string" /> 
   </xsd:complexType>
 
+  <xsd:simpleType name="range_1_6">
+    <xsd:restriction base="xsd:integer">
+      <xsd:minInclusive value="1"/>
+      <xsd:maxInclusive value="6"/>
+    </xsd:restriction>
+  </xsd:simpleType>
+
   <xsd:complexType name="docHeadingType" mixed="true">
     <xsd:group ref="docTitleCmdGroup" minOccurs="0" maxOccurs="unbounded" />
-    <xsd:attribute name="level" type="xsd:integer" /> <!-- todo: range 1-6 -->
+    <xsd:attribute name="level" type="range_1_6" />
   </xsd:complexType>
 
   <xsd:complexType name="docImageType" mixed="true">