Skip to content

Commit f523a2d

Browse files
committed
Merge pull request #284 from tetengo/doxygen_upgrade
Doxygen upgrade (cherry picked from commit b722d0c)
1 parent 5a68917 commit f523a2d

File tree

3 files changed

+114
-68
lines changed

3 files changed

+114
-68
lines changed

.github/workflows/linux-clang.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
CONCURRENT_BUILD: 4
1717
CLANG_COMMAND: clang-14
1818
CLANGXX_COMMAND: clang++-14
19-
DOXYGEN_VER: 1.9.5
19+
DOXYGEN_VER: 1.9.7
2020
DOXYGEN_CACHE_REV: 0
2121
BOOST_VER: 1_82_0
2222
BOOST_VER_DOT: 1.82.0

Doxyfile

Lines changed: 111 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.9.5
1+
# Doxyfile 1.9.7
22

33
# This file describes the settings to be used by the documentation system
44
# doxygen (www.doxygen.org) for a project.
@@ -86,7 +86,7 @@ CREATE_SUBDIRS = NO
8686
# level increment doubles the number of directories, resulting in 4096
8787
# directories at level 8 which is the default and also the maximum value. The
8888
# sub-directories are organized in 2 levels, the first level always has a fixed
89-
# numer of 16 directories.
89+
# number of 16 directories.
9090
# Minimum value: 0, maximum value: 8, default value: 8.
9191
# This tag requires that the tag CREATE_SUBDIRS is set to YES.
9292

@@ -353,6 +353,17 @@ MARKDOWN_SUPPORT = YES
353353

354354
TOC_INCLUDE_HEADINGS = 5
355355

356+
# The MARKDOWN_ID_STYLE tag can be used to specify the algorithm used to
357+
# generate identifiers for the Markdown headings. Note: Every identifier is
358+
# unique.
359+
# Possible values are: DOXYGEN Use a fixed 'autotoc_md' string followed by a
360+
# sequence number starting at 0. and GITHUB Use the lower case version of title
361+
# with any whitespace replaced by '-' and punctations characters removed..
362+
# The default value is: DOXYGEN.
363+
# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
364+
365+
MARKDOWN_ID_STYLE = DOXYGEN
366+
356367
# When enabled doxygen tries to link words that correspond to documented
357368
# classes, or namespaces to their corresponding documentation. Such a link can
358369
# be prevented in individual cases by putting a % sign in front of the word or
@@ -477,6 +488,14 @@ LOOKUP_CACHE_SIZE = 0
477488

478489
NUM_PROC_THREADS = 1
479490

491+
# If the TIMESTAMP tag is set different from NO then each generated page will
492+
# contain the date or date and time when the page was generated. Setting this to
493+
# NO can help when comparing the output of multiple runs.
494+
# Possible values are: YES, NO, DATETIME and DATE.
495+
# The default value is: NO.
496+
497+
TIMESTAMP = YES
498+
480499
#---------------------------------------------------------------------------
481500
# Build related configuration options
482501
#---------------------------------------------------------------------------
@@ -558,7 +577,8 @@ HIDE_UNDOC_MEMBERS = NO
558577
# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
559578
# undocumented classes that are normally visible in the class hierarchy. If set
560579
# to NO, these classes will be included in the various overviews. This option
561-
# has no effect if EXTRACT_ALL is enabled.
580+
# will also hide undocumented C++ concepts if enabled. This option has no effect
581+
# if EXTRACT_ALL is enabled.
562582
# The default value is: NO.
563583

564584
HIDE_UNDOC_CLASSES = NO
@@ -849,11 +869,26 @@ WARN_IF_INCOMPLETE_DOC = YES
849869

850870
WARN_NO_PARAMDOC = YES
851871

872+
# If WARN_IF_UNDOC_ENUM_VAL option is set to YES, doxygen will warn about
873+
# undocumented enumeration values. If set to NO, doxygen will accept
874+
# undocumented enumeration values. If EXTRACT_ALL is set to YES then this flag
875+
# will automatically be disabled.
876+
# The default value is: NO.
877+
878+
WARN_IF_UNDOC_ENUM_VAL = NO
879+
852880
# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
853881
# a warning is encountered. If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS
854882
# then doxygen will continue running as if WARN_AS_ERROR tag is set to NO, but
855883
# at the end of the doxygen process doxygen will return with a non-zero status.
856-
# Possible values are: NO, YES and FAIL_ON_WARNINGS.
884+
# If the WARN_AS_ERROR tag is set to FAIL_ON_WARNINGS_PRINT then doxygen behaves
885+
# like FAIL_ON_WARNINGS but in case no WARN_LOGFILE is defined doxygen will not
886+
# write the warning messages in between other messages but write them at the end
887+
# of a run, in case a WARN_LOGFILE is defined the warning messages will be
888+
# besides being in the defined file also be shown at the end of a run, unless
889+
# the WARN_LOGFILE is defined as - i.e. standard output (stdout) in that case
890+
# the behavior will remain as with the setting FAIL_ON_WARNINGS.
891+
# Possible values are: NO, YES, FAIL_ON_WARNINGS and FAIL_ON_WARNINGS_PRINT.
857892
# The default value is: NO.
858893

859894
WARN_AS_ERROR = FAIL_ON_WARNINGS
@@ -1032,9 +1067,6 @@ EXCLUDE_PATTERNS =
10321067
# output. The symbol name can be a fully qualified name, a word, or if the
10331068
# wildcard * is used, a substring. Examples: ANamespace, AClass,
10341069
# ANamespace::AClass, ANamespace::*Test
1035-
#
1036-
# Note that the wildcards are matched against the file with absolute path, so to
1037-
# exclude all test directories use the pattern */test/*
10381070

10391071
EXCLUDE_SYMBOLS =
10401072

@@ -1231,10 +1263,11 @@ VERBATIM_HEADERS = YES
12311263

12321264
ALPHABETICAL_INDEX = YES
12331265

1234-
# In case all classes in a project start with a common prefix, all classes will
1235-
# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
1236-
# can be used to specify a prefix (or a list of prefixes) that should be ignored
1237-
# while generating the index headers.
1266+
# The IGNORE_PREFIX tag can be used to specify a prefix (or a list of prefixes)
1267+
# that should be ignored while generating the index headers. The IGNORE_PREFIX
1268+
# tag works for classes, function and member names. The entity will be placed in
1269+
# the alphabetical list under the first letter of the entity name that remains
1270+
# after removing the prefix.
12381271
# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
12391272

12401273
IGNORE_PREFIX =
@@ -1313,7 +1346,12 @@ HTML_STYLESHEET =
13131346
# Doxygen will copy the style sheet files to the output directory.
13141347
# Note: The order of the extra style sheet files is of importance (e.g. the last
13151348
# style sheet in the list overrules the setting of the previous ones in the
1316-
# list). For an example see the documentation.
1349+
# list).
1350+
# Note: Since the styling of scrollbars can currently not be overruled in
1351+
# Webkit/Chromium, the styling will be left out of the default doxygen.css if
1352+
# one or more extra stylesheets have been specified. So if scrollbar
1353+
# customization is desired it has to be added explicitly. For an example see the
1354+
# documentation.
13171355
# This tag requires that the tag GENERATE_HTML is set to YES.
13181356

13191357
HTML_EXTRA_STYLESHEET =
@@ -1329,17 +1367,13 @@ HTML_EXTRA_STYLESHEET =
13291367
HTML_EXTRA_FILES =
13301368

13311369
# The HTML_COLORSTYLE tag can be used to specify if the generated HTML output
1332-
# should be rendered with a dark or light theme. Default setting AUTO_LIGHT
1333-
# enables light output unless the user preference is dark output. Other options
1334-
# are DARK to always use dark mode, LIGHT to always use light mode, AUTO_DARK to
1335-
# default to dark mode unless the user prefers light mode, and TOGGLE to let the
1336-
# user toggle between dark and light mode via a button.
1337-
# Possible values are: LIGHT Always generate light output., DARK Always generate
1338-
# dark output., AUTO_LIGHT Automatically set the mode according to the user
1339-
# preference, use light mode if no preference is set (the default)., AUTO_DARK
1340-
# Automatically set the mode according to the user preference, use dark mode if
1341-
# no preference is set. and TOGGLE Allow to user to switch between light and
1342-
# dark mode via a button..
1370+
# should be rendered with a dark or light theme.
1371+
# Possible values are: LIGHT always generate light mode output, DARK always
1372+
# generate dark mode output, AUTO_LIGHT automatically set the mode according to
1373+
# the user preference, use light mode if no preference is set (the default),
1374+
# AUTO_DARK automatically set the mode according to the user preference, use
1375+
# dark mode if no preference is set and TOGGLE allow to user to switch between
1376+
# light and dark mode via a button.
13431377
# The default value is: AUTO_LIGHT.
13441378
# This tag requires that the tag GENERATE_HTML is set to YES.
13451379

@@ -1375,15 +1409,6 @@ HTML_COLORSTYLE_SAT = 100
13751409

13761410
HTML_COLORSTYLE_GAMMA = 80
13771411

1378-
# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
1379-
# page will contain the date and time when the page was generated. Setting this
1380-
# to YES can help to show when doxygen was last run and thus if the
1381-
# documentation is up to date.
1382-
# The default value is: NO.
1383-
# This tag requires that the tag GENERATE_HTML is set to YES.
1384-
1385-
HTML_TIMESTAMP = YES
1386-
13871412
# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
13881413
# documentation will contain a main index with vertical navigation menus that
13891414
# are dynamically created via JavaScript. If disabled, the navigation index will
@@ -1533,6 +1558,16 @@ BINARY_TOC = NO
15331558

15341559
TOC_EXPAND = NO
15351560

1561+
# The SITEMAP_URL tag is used to specify the full URL of the place where the
1562+
# generated documentation will be placed on the server by the user during the
1563+
# deployment of the documentation. The generated sitemap is called sitemap.xml
1564+
# and placed on the directory specified by HTML_OUTPUT. In case no SITEMAP_URL
1565+
# is specified no sitemap is generated. For information about the sitemap
1566+
# protocol see https://www.sitemaps.org
1567+
# This tag requires that the tag GENERATE_HTML is set to YES.
1568+
1569+
SITEMAP_URL =
1570+
15361571
# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
15371572
# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
15381573
# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
@@ -2021,9 +2056,16 @@ PDF_HYPERLINKS = YES
20212056

20222057
USE_PDFLATEX = YES
20232058

2024-
# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
2025-
# command to the generated LaTeX files. This will instruct LaTeX to keep running
2026-
# if errors occur, instead of asking the user for help.
2059+
# The LATEX_BATCHMODE tag ignals the behavior of LaTeX in case of an error.
2060+
# Possible values are: NO same as ERROR_STOP, YES same as BATCH, BATCH In batch
2061+
# mode nothing is printed on the terminal, errors are scrolled as if <return> is
2062+
# hit at every error; missing files that TeX tries to input or request from
2063+
# keyboard input (\read on a not open input stream) cause the job to abort,
2064+
# NON_STOP In nonstop mode the diagnostic message will appear on the terminal,
2065+
# but there is no possibility of user interaction just like in batch mode,
2066+
# SCROLL In scroll mode, TeX will stop only for missing files to input or if
2067+
# keyboard input is necessary and ERROR_STOP In errorstop mode, TeX will stop at
2068+
# each error, asking for user intervention.
20272069
# The default value is: NO.
20282070
# This tag requires that the tag GENERATE_LATEX is set to YES.
20292071

@@ -2044,14 +2086,6 @@ LATEX_HIDE_INDICES = NO
20442086

20452087
LATEX_BIB_STYLE = plain
20462088

2047-
# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
2048-
# page will contain the date and time when the page was generated. Setting this
2049-
# to NO can help when comparing the output of multiple runs.
2050-
# The default value is: NO.
2051-
# This tag requires that the tag GENERATE_LATEX is set to YES.
2052-
2053-
LATEX_TIMESTAMP = NO
2054-
20552089
# The LATEX_EMOJI_DIRECTORY tag is used to specify the (relative or absolute)
20562090
# path from which the emoji images will be read. If a relative path is entered,
20572091
# it will be relative to the LATEX_OUTPUT directory. If left blank the
@@ -2217,7 +2251,7 @@ DOCBOOK_OUTPUT = docbook
22172251
#---------------------------------------------------------------------------
22182252

22192253
# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
2220-
# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
2254+
# AutoGen Definitions (see https://autogen.sourceforge.net/) file that captures
22212255
# the structure of the code including all documentation. Note that this feature
22222256
# is still experimental and incomplete at the moment.
22232257
# The default value is: NO.
@@ -2388,16 +2422,9 @@ EXTERNAL_GROUPS = YES
23882422
EXTERNAL_PAGES = YES
23892423

23902424
#---------------------------------------------------------------------------
2391-
# Configuration options related to the dot tool
2425+
# Configuration options related to diagram generator tools
23922426
#---------------------------------------------------------------------------
23932427

2394-
# You can include diagrams made with dia in doxygen documentation. Doxygen will
2395-
# then run dia to produce the diagram and insert it in the documentation. The
2396-
# DIA_PATH tag allows you to specify the directory where the dia binary resides.
2397-
# If left empty dia is assumed to be found in the default search path.
2398-
2399-
DIA_PATH =
2400-
24012428
# If set to YES the inheritance and collaboration graphs will hide inheritance
24022429
# and usage relations if the target is undocumented or is not a class.
24032430
# The default value is: YES.
@@ -2406,7 +2433,7 @@ HIDE_UNDOC_RELATIONS = YES
24062433

24072434
# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
24082435
# available from the path. This tool is part of Graphviz (see:
2409-
# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
2436+
# https://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
24102437
# Bell Labs. The other options in this section have no effect if this option is
24112438
# set to NO
24122439
# The default value is: NO.
@@ -2459,13 +2486,15 @@ DOT_NODE_ATTR = "shape=box,height=0.2,width=0.4"
24592486

24602487
DOT_FONTPATH =
24612488

2462-
# If the CLASS_GRAPH tag is set to YES (or GRAPH) then doxygen will generate a
2463-
# graph for each documented class showing the direct and indirect inheritance
2464-
# relations. In case HAVE_DOT is set as well dot will be used to draw the graph,
2465-
# otherwise the built-in generator will be used. If the CLASS_GRAPH tag is set
2466-
# to TEXT the direct and indirect inheritance relations will be shown as texts /
2467-
# links.
2468-
# Possible values are: NO, YES, TEXT and GRAPH.
2489+
# If the CLASS_GRAPH tag is set to YES or GRAPH or BUILTIN then doxygen will
2490+
# generate a graph for each documented class showing the direct and indirect
2491+
# inheritance relations. In case the CLASS_GRAPH tag is set to YES or GRAPH and
2492+
# HAVE_DOT is enabled as well, then dot will be used to draw the graph. In case
2493+
# the CLASS_GRAPH tag is set to YES and HAVE_DOT is disabled or if the
2494+
# CLASS_GRAPH tag is set to BUILTIN, then the built-in generator will be used.
2495+
# If the CLASS_GRAPH tag is set to TEXT the direct and indirect inheritance
2496+
# relations will be shown as texts / links.
2497+
# Possible values are: NO, YES, TEXT, GRAPH and BUILTIN.
24692498
# The default value is: YES.
24702499

24712500
CLASS_GRAPH = YES
@@ -2606,7 +2635,7 @@ DIR_GRAPH_MAX_DEPTH = 1
26062635
# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
26072636
# generated by dot. For an explanation of the image formats see the section
26082637
# output formats in the documentation of the dot tool (Graphviz (see:
2609-
# http://www.graphviz.org/)).
2638+
# https://www.graphviz.org/)).
26102639
# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
26112640
# to make the SVG files visible in IE 9+ (other browsers do not have this
26122641
# requirement).
@@ -2643,11 +2672,12 @@ DOT_PATH =
26432672

26442673
DOTFILE_DIRS =
26452674

2646-
# The MSCFILE_DIRS tag can be used to specify one or more directories that
2647-
# contain msc files that are included in the documentation (see the \mscfile
2648-
# command).
2675+
# You can include diagrams made with dia in doxygen documentation. Doxygen will
2676+
# then run dia to produce the diagram and insert it in the documentation. The
2677+
# DIA_PATH tag allows you to specify the directory where the dia binary resides.
2678+
# If left empty dia is assumed to be found in the default search path.
26492679

2650-
MSCFILE_DIRS =
2680+
DIA_PATH =
26512681

26522682
# The DIAFILE_DIRS tag can be used to specify one or more directories that
26532683
# contain dia files that are included in the documentation (see the \diafile
@@ -2724,3 +2754,19 @@ GENERATE_LEGEND = YES
27242754
# The default value is: YES.
27252755

27262756
DOT_CLEANUP = YES
2757+
2758+
# You can define message sequence charts within doxygen comments using the \msc
2759+
# command. If the MSCGEN_TOOL tag is left empty (the default), then doxygen will
2760+
# use a built-in version of mscgen tool to produce the charts. Alternatively,
2761+
# the MSCGEN_TOOL tag can also specify the name an external tool. For instance,
2762+
# specifying prog as the value, doxygen will call the tool as prog -T
2763+
# <outfile_format> -o <outputfile> <inputfile>. The external tool should support
2764+
# output file formats "png", "eps", "svg", and "ismap".
2765+
2766+
MSCGEN_TOOL =
2767+
2768+
# The MSCFILE_DIRS tag can be used to specify one or more directories that
2769+
# contain msc files that are included in the documentation (see the \mscfile
2770+
# command).
2771+
2772+
MSCFILE_DIRS =

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ How to Build and Install
8383

8484
- [Visual Studio 2022](https://visualstudio.microsoft.com/)
8585
- [Boost C++ libraries 1.82.0](https://www.boost.org/)
86-
- [Doxygen 1.9.5](https://www.doxygen.nl/)
86+
- [Doxygen 1.9.7](https://www.doxygen.nl/)
8787
- [Graphviz](https://www.graphviz.org/)
8888
- [WiX toolset 3.11.2](https://wixtoolset.org/)
8989
- [Python 3.9](https://www.python.org/) or
@@ -143,7 +143,7 @@ Doxygen will output the documents into the directory `doc`.
143143
[GCC 10](https://gcc.gnu.org/) or
144144
[GCC 12](https://gcc.gnu.org/)
145145
- [Boost C++ libraries 1.82.0](https://www.boost.org/)
146-
- [Doxygen 1.9.5](https://www.doxygen.nl/)
146+
- [Doxygen 1.9.7](https://www.doxygen.nl/)
147147
- [Graphviz](https://www.graphviz.org/)
148148
- [include-what-you-use 0.15](https://include-what-you-use.org/) or
149149
[include-what-you-use 0.17](https://include-what-you-use.org/)

0 commit comments

Comments
 (0)