Merge pull request #9821 from albert-github/feature/bug_plantuml_hcl_…

…regex

Adding "engine" hcl and regex for plantuml

addon/doxmlparser/doxmlparser/compound.py

@@ -1119,6 +1119,8 @@ class DoxPlantumlEngine(str, Enum):
     FLOW='flow'
     BOARD='board'
     GIT='git'
+    HCL='hcl'
+    REGEX='regex'
     EBNF='ebnf'
 
 
@@ -23728,7 +23730,7 @@ def validate_DoxPlantumlEngine(self, value):
                 self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
                 return False
             value = value
-            enumerations = ['uml', 'bpm', 'wire', 'dot', 'ditaa', 'salt', 'math', 'latex', 'gantt', 'mindmap', 'wbs', 'yaml', 'creole', 'json', 'flow', 'board', 'git', 'ebnf']
+            enumerations = ['uml', 'bpm', 'wire', 'dot', 'ditaa', 'salt', 'math', 'latex', 'gantt', 'mindmap', 'wbs', 'yaml', 'creole', 'json', 'flow', 'board', 'git', 'hcl', 'regex', 'ebnf']
             if value not in enumerations:
                 lineno = self.gds_get_node_lineno_()
                 self.gds_collector_.add_message('Value "%(value)s"%(lineno)s does not match xsd enumeration restriction on DoxPlantumlEngine' % {"value" : encode_str_2_3(value), "lineno": lineno} )

doc/commands.doc

@@ -3189,7 +3189,7 @@ class Receiver
   Not all diagrams can be created with the PlantUML `@startuml` command but need another
   PlantUML `@start...` command. This will look like `@start<engine>` where currently supported are
   the following `<engine>`s: `uml`, `bpm`, `wire`, `dot`, `ditaa`, `salt`, `math`, `latex`,
-  `gantt`, `mindmap`, `wbs`, `yaml`, `creole`, `json`, `flow`, `board`, `git` and `ebnf`.
+  `gantt`, `mindmap`, `wbs`, `yaml`, `creole`, `json`, `flow`, `board`, `git`, `hcl`, `regex` and `ebnf`.
   By default the `<engine>` is `uml`. The `<engine>` can be specified as an option.
   Also the file to write the resulting image to can be specified by means of an option, see the
   description of the first (optional) argument for details.

src/docnode.cpp

@@ -57,7 +57,7 @@ static const std::set<std::string> g_plantumlEngine {
   "uml", "bpm", "wire", "dot", "ditaa",
   "salt", "math", "latex", "gantt", "mindmap",
   "wbs", "yaml", "creole", "json", "flow",
-  "board", "git", "ebnf"
+  "board", "git", "hcl", "regex", "ebnf"
 };
 
 //---------------------------------------------------------------------------

templates/xml/compound.xsd

@@ -1017,6 +1017,8 @@
       <xsd:enumeration value="flow"/>
       <xsd:enumeration value="board"/>
       <xsd:enumeration value="git"/>
+      <xsd:enumeration value="hcl"/>
+      <xsd:enumeration value="regex"/>
       <xsd:enumeration value="ebnf"/>
     </xsd:restriction>
   </xsd:simpleType>