Skip to content

Commit 5624a23

Browse files
AlexlHerAlexlHer
authored
Merge pull request #2001 from arcaneframework/dev/ah-doxygen-1-10-0-support
Improves compatibility with Doxygen 1.10.0+
2 parents b53dc08 + 213cd88 commit 5624a23

File tree

5 files changed

+683
-431
lines changed

5 files changed

+683
-431
lines changed

‎arcane/doc/doc_user/layout.xml‎

Lines changed: 148 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
1-
<doxygenlayout version="1.0">
2-
<!-- Generated by doxygen 1.9.5 -->
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<doxygenlayout version="2.0">
3+
<!-- Generated by doxygen 1.13.2 -->
34
<!-- Navigation index tabs for HTML output -->
45
<navindex>
56
<tab type="mainpage" visible="yes" title=""/>
67
<tab type="pages" visible="yes" title="" intro=""/>
7-
8-
<tab type="modules" visible="yes" title="" intro=""/>
8+
<tab type="topics" visible="yes" title="" intro=""/>
9+
<tab type="modules" visible="yes" title="" intro="">
10+
<tab type="modulelist" visible="yes" title="" intro=""/>
11+
<tab type="modulemembers" visible="yes" title="" intro=""/>
12+
</tab>
913
<tab type="namespaces" visible="yes" title="">
1014
<tab type="namespacelist" visible="yes" title="" intro=""/>
1115
<tab type="namespacemembers" visible="yes" title="" intro=""/>
@@ -18,10 +22,10 @@
1822
<tab type="interfacehierarchy" visible="yes" title="" intro=""/>
1923
</tab>
2024
<tab type="classes" visible="yes" title="">
21-
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
2225
<tab type="classlist" visible="yes" title="" intro=""/>
23-
<tab type="hierarchy" visible="no" title="" intro=""/>
24-
<tab type="classmembers" visible="no" title="" intro=""/>
26+
<tab type="classindex" visible="$ALPHABETICAL_INDEX" title=""/>
27+
<tab type="hierarchy" visible="yes" title="" intro=""/>
28+
<tab type="classmembers" visible="yes" title="" intro=""/>
2529
</tab>
2630
<tab type="structs" visible="yes" title="">
2731
<tab type="structlist" visible="yes" title="" intro=""/>
@@ -43,55 +47,55 @@
4347
<class>
4448
<briefdescription visible="yes"/>
4549
<includes visible="$SHOW_HEADERFILE"/>
46-
<inheritancegraph visible="$CLASS_GRAPH"/>
47-
<collaborationgraph visible="$COLLABORATION_GRAPH"/>
50+
<inheritancegraph visible="yes"/>
51+
<collaborationgraph visible="yes"/>
4852
<memberdecl>
4953
<nestedclasses visible="yes" title=""/>
50-
<publictypes title=""/>
51-
<services title=""/>
52-
<interfaces title=""/>
53-
<publicslots title=""/>
54-
<signals title=""/>
55-
<publicmethods title=""/>
56-
<publicstaticmethods title=""/>
57-
<publicattributes title=""/>
58-
<publicstaticattributes title=""/>
59-
<protectedtypes title=""/>
60-
<protectedslots title=""/>
61-
<protectedmethods title=""/>
62-
<protectedstaticmethods title=""/>
63-
<protectedattributes title=""/>
64-
<protectedstaticattributes title=""/>
65-
<packagetypes title=""/>
66-
<packagemethods title=""/>
67-
<packagestaticmethods title=""/>
68-
<packageattributes title=""/>
69-
<packagestaticattributes title=""/>
70-
<properties title=""/>
71-
<events title=""/>
72-
<privatetypes title=""/>
73-
<privateslots title=""/>
74-
<privatemethods title=""/>
75-
<privatestaticmethods title=""/>
76-
<privateattributes title=""/>
77-
<privatestaticattributes title=""/>
78-
<friends title=""/>
79-
<related title="" subtitle=""/>
54+
<publictypes visible="yes" title=""/>
55+
<services visible="yes" title=""/>
56+
<interfaces visible="yes" title=""/>
57+
<publicslots visible="yes" title=""/>
58+
<signals visible="yes" title=""/>
59+
<publicmethods visible="yes" title=""/>
60+
<publicstaticmethods visible="yes" title=""/>
61+
<publicattributes visible="yes" title=""/>
62+
<publicstaticattributes visible="yes" title=""/>
63+
<protectedtypes visible="yes" title=""/>
64+
<protectedslots visible="yes" title=""/>
65+
<protectedmethods visible="yes" title=""/>
66+
<protectedstaticmethods visible="yes" title=""/>
67+
<protectedattributes visible="yes" title=""/>
68+
<protectedstaticattributes visible="yes" title=""/>
69+
<packagetypes visible="yes" title=""/>
70+
<packagemethods visible="yes" title=""/>
71+
<packagestaticmethods visible="yes" title=""/>
72+
<packageattributes visible="yes" title=""/>
73+
<packagestaticattributes visible="yes" title=""/>
74+
<properties visible="yes" title=""/>
75+
<events visible="yes" title=""/>
76+
<privatetypes visible="yes" title=""/>
77+
<privateslots visible="yes" title=""/>
78+
<privatemethods visible="yes" title=""/>
79+
<privatestaticmethods visible="yes" title=""/>
80+
<privateattributes visible="yes" title=""/>
81+
<privatestaticattributes visible="yes" title=""/>
82+
<friends visible="yes" title=""/>
83+
<related visible="yes" title="" subtitle=""/>
8084
<membergroups visible="yes"/>
8185
</memberdecl>
82-
<detaileddescription title=""/>
86+
<detaileddescription visible="yes" title=""/>
8387
<memberdef>
84-
<inlineclasses title=""/>
85-
<typedefs title=""/>
86-
<enums title=""/>
87-
<services title=""/>
88-
<interfaces title=""/>
89-
<constructors title=""/>
90-
<functions title=""/>
91-
<related title=""/>
92-
<variables title=""/>
93-
<properties title=""/>
94-
<events title=""/>
88+
<inlineclasses visible="yes" title=""/>
89+
<typedefs visible="yes" title=""/>
90+
<enums visible="yes" title=""/>
91+
<services visible="yes" title=""/>
92+
<interfaces visible="yes" title=""/>
93+
<constructors visible="yes" title=""/>
94+
<functions visible="yes" title=""/>
95+
<related visible="yes" title=""/>
96+
<variables visible="yes" title=""/>
97+
<properties visible="yes" title=""/>
98+
<events visible="yes" title=""/>
9599
</memberdef>
96100
<allmemberslink visible="yes"/>
97101
<usedfiles visible="$SHOW_USED_FILES"/>
@@ -109,23 +113,25 @@
109113
<concepts visible="yes" title=""/>
110114
<structs visible="yes" title=""/>
111115
<exceptions visible="yes" title=""/>
112-
<typedefs title=""/>
113-
<sequences title=""/>
114-
<dictionaries title=""/>
115-
<enums title=""/>
116-
<functions title=""/>
117-
<variables title=""/>
118-
<membergroups visible="yes"/>
116+
<typedefs visible="yes" title=""/>
117+
<sequences visible="yes" title=""/>
118+
<dictionaries visible="yes" title=""/>
119+
<enums visible="yes" title=""/>
120+
<functions visible="yes" title=""/>
121+
<variables visible="yes" title=""/>
122+
<properties visible="yes" title=""/>
123+
<membergroups visible="yes" visible="yes"/>
119124
</memberdecl>
120-
<detaileddescription title=""/>
125+
<detaileddescription visible="yes" title=""/>
121126
<memberdef>
122-
<inlineclasses title=""/>
123-
<typedefs title=""/>
124-
<sequences title=""/>
125-
<dictionaries title=""/>
126-
<enums title=""/>
127-
<functions title=""/>
128-
<variables title=""/>
127+
<inlineclasses visible="yes" title=""/>
128+
<typedefs visible="yes" title=""/>
129+
<sequences visible="yes" title=""/>
130+
<dictionaries visible="yes" title=""/>
131+
<enums visible="yes" title=""/>
132+
<functions visible="yes" title=""/>
133+
<variables visible="yes" title=""/>
134+
<properties visible="yes" title=""/>
129135
</memberdef>
130136
<authorsection visible="yes"/>
131137
</namespace>
@@ -135,16 +141,16 @@
135141
<briefdescription visible="yes"/>
136142
<includes visible="$SHOW_HEADERFILE"/>
137143
<definition visible="yes" title=""/>
138-
<detaileddescription title=""/>
144+
<detaileddescription visible="yes" title=""/>
139145
<authorsection visible="yes"/>
140146
</concept>
141147

142148
<!-- Layout definition for a file page -->
143149
<file>
144150
<briefdescription visible="yes"/>
145151
<includes visible="$SHOW_INCLUDE_FILES"/>
146-
<includegraph visible="$INCLUDE_GRAPH"/>
147-
<includedbygraph visible="$INCLUDED_BY_GRAPH"/>
152+
<includegraph visible="yes"/>
153+
<includedbygraph visible="yes"/>
148154
<sourcelink visible="yes"/>
149155
<memberdecl>
150156
<interfaces visible="yes" title=""/>
@@ -154,80 +160,102 @@
154160
<namespaces visible="yes" title=""/>
155161
<concepts visible="yes" title=""/>
156162
<constantgroups visible="yes" title=""/>
157-
<defines title=""/>
158-
<typedefs title=""/>
159-
<sequences title=""/>
160-
<dictionaries title=""/>
161-
<enums title=""/>
162-
<functions title=""/>
163-
<variables title=""/>
164-
<membergroups visible="yes"/>
163+
<defines visible="yes" title=""/>
164+
<typedefs visible="yes" title=""/>
165+
<sequences visible="yes" title=""/>
166+
<dictionaries visible="yes" title=""/>
167+
<enums visible="yes" title=""/>
168+
<functions visible="yes" title=""/>
169+
<variables visible="yes" title=""/>
170+
<properties visible="yes" title=""/>
171+
<membergroups visible="yes" visible="yes"/>
165172
</memberdecl>
166-
<detaileddescription title=""/>
173+
<detaileddescription visible="yes" title=""/>
167174
<memberdef>
168-
<inlineclasses title=""/>
169-
<defines title=""/>
170-
<typedefs title=""/>
171-
<sequences title=""/>
172-
<dictionaries title=""/>
173-
<enums title=""/>
174-
<functions title=""/>
175-
<variables title=""/>
175+
<inlineclasses visible="yes" title=""/>
176+
<defines visible="yes" title=""/>
177+
<typedefs visible="yes" title=""/>
178+
<sequences visible="yes" title=""/>
179+
<dictionaries visible="yes" title=""/>
180+
<enums visible="yes" title=""/>
181+
<functions visible="yes" title=""/>
182+
<variables visible="yes" title=""/>
183+
<properties visible="yes" title=""/>
176184
</memberdef>
177185
<authorsection/>
178186
</file>
179187

180188
<!-- Layout definition for a group page -->
181189
<group>
182190
<briefdescription visible="yes"/>
183-
<groupgraph visible="$GROUP_GRAPHS"/>
191+
<groupgraph visible="yes"/>
184192
<memberdecl>
185193
<nestedgroups visible="yes" title=""/>
194+
<modules visible="yes" title=""/>
186195
<dirs visible="yes" title=""/>
187196
<files visible="yes" title=""/>
188197
<namespaces visible="yes" title=""/>
189198
<concepts visible="yes" title=""/>
190199
<classes visible="yes" title=""/>
191-
<defines title=""/>
192-
<typedefs title=""/>
193-
<sequences title=""/>
194-
<dictionaries title=""/>
195-
<enums title=""/>
196-
<enumvalues title=""/>
197-
<functions title=""/>
198-
<variables title=""/>
199-
<signals title=""/>
200-
<publicslots title=""/>
201-
<protectedslots title=""/>
202-
<privateslots title=""/>
203-
<events title=""/>
204-
<properties title=""/>
205-
<friends title=""/>
200+
<defines visible="yes" title=""/>
201+
<typedefs visible="yes" title=""/>
202+
<sequences visible="yes" title=""/>
203+
<dictionaries visible="yes" title=""/>
204+
<enums visible="yes" title=""/>
205+
<enumvalues visible="yes" title=""/>
206+
<functions visible="yes" title=""/>
207+
<variables visible="yes" title=""/>
208+
<signals visible="yes" title=""/>
209+
<publicslots visible="yes" title=""/>
210+
<protectedslots visible="yes" title=""/>
211+
<privateslots visible="yes" title=""/>
212+
<events visible="yes" title=""/>
213+
<properties visible="yes" title=""/>
214+
<friends visible="yes" title=""/>
206215
<membergroups visible="yes"/>
207216
</memberdecl>
208-
<detaileddescription title=""/>
217+
<detaileddescription visible="yes" title=""/>
209218
<memberdef>
210219
<pagedocs/>
211-
<inlineclasses title=""/>
212-
<defines title=""/>
213-
<typedefs title=""/>
214-
<sequences title=""/>
215-
<dictionaries title=""/>
216-
<enums title=""/>
217-
<enumvalues title=""/>
218-
<functions title=""/>
219-
<variables title=""/>
220-
<signals title=""/>
221-
<publicslots title=""/>
222-
<protectedslots title=""/>
223-
<privateslots title=""/>
224-
<events title=""/>
225-
<properties title=""/>
226-
<friends title=""/>
220+
<inlineclasses visible="yes" title=""/>
221+
<defines visible="yes" title=""/>
222+
<typedefs visible="yes" title=""/>
223+
<sequences visible="yes" title=""/>
224+
<dictionaries visible="yes" title=""/>
225+
<enums visible="yes" title=""/>
226+
<enumvalues visible="yes" title=""/>
227+
<functions visible="yes" title=""/>
228+
<variables visible="yes" title=""/>
229+
<signals visible="yes" title=""/>
230+
<publicslots visible="yes" title=""/>
231+
<protectedslots visible="yes" title=""/>
232+
<privateslots visible="yes" title=""/>
233+
<events visible="yes" title=""/>
234+
<properties visible="yes" title=""/>
235+
<friends visible="yes" title=""/>
227236
</memberdef>
228237
<authorsection visible="yes"/>
229238
</group>
230239

240+
<!-- Layout definition for a C++20 module page -->
241+
<module>
242+
<briefdescription visible="yes"/>
243+
<exportedmodules visible="yes"/>
244+
<memberdecl>
245+
<concepts visible="yes" title=""/>
246+
<classes visible="yes" title=""/>
247+
<enums visible="yes" title=""/>
248+
<typedefs visible="yes" title=""/>
249+
<functions visible="yes" title=""/>
250+
<variables visible="yes" title=""/>
251+
<membergroups visible="yes" title=""/>
252+
</memberdecl>
253+
<detaileddescription visible="yes" title=""/>
254+
<memberdecl>
255+
<files visible="yes"/>
256+
</memberdecl>
257+
</module>
258+
231259
<!-- Layout definition for a directory page -->
232260
<directory>
233261
<briefdescription visible="yes"/>
@@ -236,6 +264,6 @@
236264
<dirs visible="yes"/>
237265
<files visible="yes"/>
238266
</memberdecl>
239-
<detaileddescription title=""/>
267+
<detaileddescription visible="yes" title=""/>
240268
</directory>
241269
</doxygenlayout>

0 commit comments

Comments
 (0)