Skip to content

Commit 22b9031

Browse files
authored
Merge pull request doxygen#12049 from albert-github/feature/bug_plantuml_engines
Adding "engine"s chart, nwdiag, packetdiag and project for plantuml
2 parents 743f4f1 + e78c3c2 commit 22b9031

4 files changed

Lines changed: 14 additions & 3 deletions

File tree

addon/doxmlparser/doxmlparser/compound.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1131,6 +1131,11 @@ class DoxPlantumlEngine(str, Enum):
11311131
REGEX='regex'
11321132
EBNF='ebnf'
11331133
FILES='files'
1134+
CHART='chart'
1135+
NWDIAG='nwdiag'
1136+
PACKETDIAG='packetdiag'
1137+
PROJECT='project'
1138+
SPRITES='sprites'
11341139

11351140

11361141
class DoxProtectionKind(str, Enum):
@@ -24555,7 +24560,7 @@ def validate_DoxPlantumlEngine(self, value):
2455524560
self.gds_collector_.add_message('Value "%(value)s"%(lineno)s is not of the correct base simple type (str)' % {"value": value, "lineno": lineno, })
2455624561
return False
2455724562
value = value
24558-
enumerations = ['uml', 'bpm', 'wire', 'dot', 'ditaa', 'salt', 'math', 'latex', 'gantt', 'mindmap', 'wbs', 'yaml', 'creole', 'json', 'flow', 'board', 'git', 'hcl', 'regex', 'ebnf', 'files']
24563+
enumerations = ['uml', 'bpm', 'wire', 'dot', 'ditaa', 'salt', 'math', 'latex', 'gantt', 'mindmap', 'wbs', 'yaml', 'creole', 'json', 'flow', 'board', 'git', 'hcl', 'regex', 'ebnf', 'files', 'chart', 'nwdiag', 'packetdiag', 'project', 'sprites']
2455924564
if value not in enumerations:
2456024565
lineno = self.gds_get_node_lineno_()
2456124566
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.dox

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3590,7 +3590,7 @@ class Receiver
35903590
PlantUML `@start...` command. This will look like `@start<engine>` where currently supported are
35913591
the following `<engine>`s: `uml`, `bpm`, `wire`, `dot`, `ditaa`, `salt`, `math`, `latex`,
35923592
`gantt`, `mindmap`, `wbs`, `yaml`, `creole`, `json`, `flow`, `board`, `git`, `hcl`, `regex`, `ebnf`,
3593-
`files`, `chen` and `chronology`.
3593+
`chart`, `nwdiag`, `packetdiag`, `project`, `sprites`, `files`, `chen` and `chronology`.
35943594
By default the `<engine>` is `uml`. The `<engine>` can be specified as an option.
35953595
Also the file to write the resulting image to can be specified by means of an option, see the
35963596
description of the first (optional) argument for details.

src/docnode.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ static const StringUnorderedSet g_plantumlEngine {
7272
"salt", "math", "latex", "gantt", "mindmap",
7373
"wbs", "yaml", "creole", "json", "flow",
7474
"board", "git", "hcl", "regex", "ebnf",
75-
"files", "chen", "chronology"
75+
"files", "chen", "chronology", "chart", "nwdiag",
76+
"packetdiag", "project", "sprites"
7677
};
7778

7879
//---------------------------------------------------------------------------

templates/xml/compound.xsd

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1209,6 +1209,11 @@
12091209
<xsd:enumeration value="regex"/>
12101210
<xsd:enumeration value="ebnf"/>
12111211
<xsd:enumeration value="files"/>
1212+
<xsd:enumeration value="chart"/>
1213+
<xsd:enumeration value="nwdiag"/>
1214+
<xsd:enumeration value="packetdiag"/>
1215+
<xsd:enumeration value="project"/>
1216+
<xsd:enumeration value="sprites"/>
12121217
</xsd:restriction>
12131218
</xsd:simpleType>
12141219

0 commit comments

Comments
 (0)