Skip to content

Upstream merge conflict #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4,871 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4871 commits
Select commit Hold shift + click to select a range
d276ef2
Modernize declaration/brief section of the HTML output
doxygen Mar 16, 2025
d8ee35f
Modernize search results window
doxygen Mar 16, 2025
26ce0b2
Modernize HTML output for inherited members toggle
doxygen Mar 16, 2025
5201bad
Modernize toggling inheritance graph visibility
doxygen Mar 17, 2025
90794ba
Modernize HTML code folding plus/minus controls
doxygen Mar 17, 2025
be8cfc2
Fix for spacing in dynamic sub menus
doxygen Mar 17, 2025
b276235
Modernize search icon in HTML output
doxygen Mar 18, 2025
422b5a8
Fix expand/collapse directory icons in tree view
doxygen Mar 19, 2025
87e6838
issue #11504 References not generated when tilde and dot in directory…
albert-github Mar 20, 2025
739d06e
Merge pull request #11481 from albert-github/feature/bug_warn_msg
doxygen Mar 21, 2025
7e71d6a
Merge pull request #11499 from doxygen/dependabot/github_actions/dock…
doxygen Mar 21, 2025
d0128c2
Update build_cmake.yml
doxygen Mar 21, 2025
0bcc24b
Cleanup unused HTML/CSS elements
doxygen Mar 22, 2025
596ab42
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Mar 23, 2025
f612491
Fixing some incorrect tags in HTML output
albert-github Mar 23, 2025
901d0b8
Merge pull request #11509 from albert-github/feature/bug_html_div
doxygen Mar 23, 2025
eafe670
Set lazy loading attribute for images
doxygen Mar 24, 2025
477be98
Regression: folding all code sections showed minus icon instead of plus
doxygen Mar 24, 2025
84836e8
HTML output tweaks
doxygen Mar 24, 2025
894735c
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Mar 24, 2025
07a301f
Tweak looks of HTML member declaration section
doxygen Mar 25, 2025
68325e7
Adding "loading" attribute to dtd
albert-github Mar 28, 2025
a93ad6c
Tweaks to HTML output to reduce spacing for member declarations
doxygen Mar 28, 2025
55dd6a4
Fix a couple of visual issues in the example documentation
doxygen Mar 29, 2025
14e37bf
Tweaks to make the arrows of the dynamic HTML menu consistent with ot…
doxygen Mar 29, 2025
23759ca
Merge pull request #11513 from albert-github/feature/bug_dtd_loading
doxygen Mar 30, 2025
cca999d
Small correction to internal documentation
albert-github Mar 30, 2025
2723351
Merge pull request #11506 from albert-github/feature/issue_11504
doxygen Mar 30, 2025
fe441cb
Merge pull request #11514 from albert-github/feature/bug_reg_doc
doxygen Mar 30, 2025
db86ee1
Small visual tweaks to the HTML output
doxygen Mar 30, 2025
8e8257f
Merge branch 'feature/bug_hide_compound_reference' of https://github.…
doxygen Mar 30, 2025
b6beef9
PR #11482 Reduce code duplication
doxygen Mar 30, 2025
6d6235d
Merge branch 'albert-github-feature/bug_hide_compound_reference'
doxygen Mar 30, 2025
e7ca711
Apply subtle frosted glass effect on HTML floating windows
doxygen Mar 30, 2025
d79992f
Apply subtle frosted glass effect on HTML floating windows
doxygen Mar 30, 2025
d943608
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Mar 30, 2025
869d87f
CMakeLists.txt: use 64-bit file API on 32-bit linux
trofi Mar 30, 2025
38511a3
Handling of case sensitive file / directory names
albert-github Mar 31, 2025
2cc7340
Value mentioned twice with configuration setting `FILE_PATTERNS`
albert-github Mar 31, 2025
ae4ff9d
Replace sync-on/off bitmap icon by pure CSS version
doxygen Mar 31, 2025
2b017fc
Tweak margin of documentation examples to match other changes
doxygen Mar 31, 2025
75f8cf7
Merge pull request #11519 from albert-github/feature/bug_exclude
doxygen Mar 31, 2025
c9ba2f6
issue #11525 Translation error Dutch
albert-github Apr 1, 2025
9931ec4
Merge pull request #11526 from albert-github/feature/issue_11525
doxygen Apr 1, 2025
38e4281
Merge pull request #11521 from albert-github/feature/bug_config_doubl…
doxygen Apr 1, 2025
22452e4
Adjust the position of the sync-icon depending on scrollbar visibility
doxygen Apr 1, 2025
783550e
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Apr 1, 2025
1ca6d10
Disable sync-icon movement when FULL_SIDEBAR is enabled
doxygen Apr 2, 2025
abf9ae2
issue #11001 \copydoc does not respect section hierarchy in table of …
albert-github Apr 3, 2025
071d46f
issue #11528 `\example{lineno}` does not generate the example
albert-github Apr 6, 2025
2a25410
fix: fix regression of #11390
e-kwsm May 15, 2022
46e6a42
Warning ` mismatch `#if` / #endif` from preprocessor
albert-github Apr 6, 2025
0614d5f
doc: Dependencies for testing
fliiiix Apr 7, 2025
8a8de15
use correct definitions in debug mode with libc++ and libstdc++
dpronin Apr 7, 2025
932aa3d
Merge pull request #11535 from fliiiix/doc/add-test-section-to-install
doxygen Apr 8, 2025
da5005d
Merge pull request #11533 from e-kwsm/caseconvert.py
doxygen Apr 8, 2025
3948f97
Spelling corrections
albert-github Apr 16, 2025
98aca21
Add page outline navigation panel to HTML output
doxygen Apr 15, 2025
1bcdbda
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Apr 17, 2025
f9be6cb
Fixes for html output
doxygen Apr 17, 2025
1326f12
Update doxygen.css for CSS validation
KaruroChori Apr 18, 2025
9f5f608
Add page navigation for pages
doxygen Apr 18, 2025
5bd253e
Various tweaks and fixes for the HTML outline panel
doxygen Apr 18, 2025
87a0d13
Merge pull request #11545 from KaruroChori/KaruroChori-patch-1-css
doxygen Apr 18, 2025
f7011c7
Make page outline panel configurable via PAGE_OUTLINE_PANEL option
doxygen Apr 19, 2025
2f1ee38
Constrain the HTML panel sizes such that content is always visible
doxygen Apr 19, 2025
4721e56
Fix problem that special characters were not appearing in outline panel
doxygen Apr 20, 2025
1233ad5
Fix a rendering issue on Safari when resizing panels
doxygen Apr 20, 2025
b3c48d9
Add touch support for resizing the outline panel
doxygen Apr 20, 2025
fc4d5b7
Add missing entries for page outline for group pages
doxygen Apr 20, 2025
66fd650
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Apr 20, 2025
c941da7
Merge pull request #11544 from albert-github/feature/bug_spell_20250416
doxygen Apr 20, 2025
ffac374
Update doxygen.css to fix validation issue (II)
KaruroChori Apr 18, 2025
ac6ede4
Fix issues with page outline panel when generating XHTML files
doxygen Apr 21, 2025
f92e43d
Fixed issue with drifting dark/light mode button when resizing the page
doxygen Apr 21, 2025
22e19e8
Increase brightness of sync-icon in darkmode
doxygen Apr 21, 2025
2ac144c
Fix XHTML render issue for group pages when PAGE_OUTLINE_PANEL=NO
doxygen Apr 21, 2025
12ceaa1
Disable PAGE_OUTLINE_PANEL for user manual and examples
doxygen Apr 21, 2025
35868b0
Don't include resize.js if GENERATE_TREEVIEW is disabled.
doxygen Apr 21, 2025
1b17ec6
Apply scrollbar styling also when GENERATE_TREEVIEW is disabled
doxygen Apr 21, 2025
c6d79dd
@tableofcontents in the @mainpage didn't work if GENERATE_TREEVIEW=YE…
doxygen Apr 21, 2025
38147cf
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Apr 21, 2025
a088d7c
Merge pull request #11546 from KaruroChori/KaruroChori-patch-2-css
doxygen Apr 21, 2025
c9012e7
Merge pull request #11536 from dpronin/dpronin/libcpp/fix
doxygen Apr 21, 2025
553aac3
use c++20 as the standard for the project
dpronin Apr 7, 2025
518face
include a conditional usage of c++20 offered by @kaorihinata
dpronin Apr 21, 2025
5477225
Merge pull request #11537 from dpronin/dpronin/cxx/20
doxygen Apr 22, 2025
5690022
Merge pull request #11532 from albert-github/feature/issue_11528
doxygen Apr 22, 2025
ee0a08a
Merge pull request #11534 from albert-github/feature/bug_if_endif_pre
doxygen Apr 22, 2025
8d110ed
Increase contrast of the scrollbar in dark mode
doxygen Apr 22, 2025
5abd166
Improve panel resize behavior when moving the left slider
doxygen Apr 22, 2025
1223158
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Apr 22, 2025
5dacf41
issue #11549 Leftover variable in CSS (validation and possible logic …
albert-github Apr 23, 2025
c1ed060
Merge pull request #11550 from albert-github/feature/issue_11549
doxygen Apr 24, 2025
3752be7
Merge pull request #11518 from trofi/lfs-fix
doxygen Apr 24, 2025
d381765
Reintroduce removed Resource::CSS switch case
doxygen Apr 24, 2025
94eaa57
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Apr 24, 2025
f4c886e
Merging resize.js into navtree.js
doxygen Apr 24, 2025
19af1c0
Highlight visible part of the content in the page outline panel
doxygen Apr 25, 2025
f2dc693
Fix regression for resizing left panel
doxygen Apr 25, 2025
d29e2dd
issue #11543 Doxygen V.1.14 is very slow
doxygen Apr 26, 2025
c90748f
Tweaks to page outline panel to make it scroll more smoothly
doxygen Apr 26, 2025
623e52a
CSS resource files don't need special treatment
albert-github Apr 27, 2025
529bd90
More tweaks to page outline panel to make it scroll more smoothly
doxygen Apr 27, 2025
02ab809
Bump docker/build-push-action from 6.15.0 to 6.16.0
dependabot[bot] Apr 28, 2025
200cec9
issue #11541 Template specialisations get copies of members of the pr…
doxygen Apr 28, 2025
96e79ff
issue #11491 [BUG] Space character is not rendered in code block
doxygen Apr 29, 2025
947a456
Merge pull request #11554 from doxygen/dependabot/github_actions/dock…
doxygen Apr 29, 2025
4f23d0d
Merge pull request #11552 from albert-github/feature/bug_css_resource
doxygen Apr 29, 2025
2e5aa57
Merge pull request #11529 from albert-github/feature/issue_11001
doxygen Apr 29, 2025
1a2d3b4
Merge branch 'feature/issue_9437_defgroup' of https://github.com/albe…
doxygen Apr 30, 2025
c426503
Replace literal_at_local() with normal literal_at()
doxygen Apr 30, 2025
4e62f82
Merge branch 'albert-github-feature/issue_9437_defgroup'
doxygen Apr 30, 2025
dbcd4c6
Issue #9843 Incomplete call graph when using curly brackets in constr…
albert-github May 1, 2025
9b75105
issue #8731 grouping variables requires an empty line before closing @}
albert-github May 2, 2025
c2ada57
issue #11557 @tableofcontents shows <tt> tags for MarkDown headings w…
doxygen May 2, 2025
a3bd787
issue #11557 @tableofcontents shows <tt> tags for MarkDown headings w…
doxygen May 3, 2025
2604e3f
issue #11557 @tableofcontents shows <tt> tags for MarkDown headings w…
doxygen May 3, 2025
5421849
issue #11557 @tableofcontents shows <tt> tags for MarkDown headings w…
doxygen May 4, 2025
d1666a6
Ignore non-linkable definitions when resolving links
nwellnhof May 3, 2025
4bb67ed
issue #11538 Internal inconsistency: scope for class std::hash<...> n…
doxygen May 4, 2025
eb5d5ce
Merge pull request #11561 from nwellnhof/only-linkable
doxygen May 5, 2025
d1e0f0b
issue #11524 XML output is invalid for filenames with "<" or ">" (inc…
doxygen May 5, 2025
ebab8a2
issue #11510 enum class value not appearing in the documentation if u…
doxygen May 5, 2025
3c5255e
issue #6998 Markdown: Links in ATX headings processed incorrectly?
doxygen May 9, 2025
10d9a9d
Added missing parameter documentation
doxygen May 10, 2025
863d2c3
issue #11563 navtree.js causes Content Security Policy violation with…
doxygen May 10, 2025
e8f196a
Increase robustness of page outline panel
doxygen May 11, 2025
1a4eacf
Fixed issue parsing raw strings
doxygen May 11, 2025
22e5fe0
Merge branch 'feature/issue_8731' of https://github.com/albert-github…
doxygen May 11, 2025
141b854
Fix for PR #11559: don't remove fallback rule
doxygen May 11, 2025
f8ce920
Merge branch 'albert-github-feature/issue_8731'
doxygen May 11, 2025
20f8e3d
Merge pull request #11558 from albert-github/feature/issue_9843
doxygen May 11, 2025
8acb984
issue #11565 subpages named with capital letters are not found by LaTeX
doxygen May 11, 2025
dc4f001
Translation german update
rstephan May 12, 2025
8782816
From "Gedankenstrich" to comma.
rstephan May 12, 2025
723d609
Merge pull request #11570 from rstephan/de
doxygen May 12, 2025
92e9024
Fix compiler warning
doxygen May 12, 2025
def79ca
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 12, 2025
c2cc416
Merge branch 'feature/bug_cite_option' of https://github.com/albert-g…
doxygen May 12, 2025
3d97cea
Fix XML output for virtual modifiers with trailing return types
dmccabe-jt May 12, 2025
5111e92
Fix for section selection range offset in page outline panel
doxygen May 13, 2025
5682245
Linking doxygen under Cygwin
albert-github May 14, 2025
fa94478
Merge pull request #11573 from albert-github/feature/bug_cygwin_sect
doxygen May 14, 2025
5a9f335
Merge branch 'trailing-return-type-pure' of https://github.com/dmccab…
doxygen May 14, 2025
bfe3edb
Reformat code to match doxygen code styling
doxygen May 14, 2025
85f149d
Merge branch 'dmccabe-jt-trailing-return-type-pure'
doxygen May 14, 2025
e65c8b6
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 14, 2025
d9aa204
issue #11279 longtabu inside DoxyEnumFields breaks
albert-github May 15, 2025
6de4422
Added type-safe wrapper class around low-level bitfield type
doxygen May 15, 2025
0462d3a
Merge branch 'albert-github-feature/bug_cite_option'
doxygen May 15, 2025
d8e7438
Small logic fix for cite with only nopar or nocite option
doxygen May 15, 2025
724c583
Spelling correction
albert-github May 16, 2025
0612513
Merge pull request #11577 from albert-github/feature/bug_spell_20250516
doxygen May 16, 2025
82a63b6
Merge branch 'feature/issue_11279' of https://github.com/albert-githu…
doxygen May 16, 2025
6e3366a
PR #11575 Refactoring: turn statics into private members
doxygen May 16, 2025
afd3256
Merge branch 'albert-github-feature/issue_11279'
doxygen May 16, 2025
c099e71
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 16, 2025
b1bbfe8
issue #11569 Doxygen might generate invalid tag file, breaking downst…
doxygen May 17, 2025
95d4ef0
Prevent unsupported HTML tags from breaking the navigation tree
doxygen May 18, 2025
58cc4f3
issue #11569 Doxygen might generate invalid tag file, breaking downst…
doxygen May 18, 2025
2bca55c
Tables without any rows result in error in LaTeX
albert-github May 19, 2025
a76ae62
Bump docker/build-push-action from 6.16.0 to 6.17.0
dependabot[bot] May 19, 2025
59bcc28
Merge pull request #11581 from doxygen/dependabot/github_actions/dock…
doxygen May 20, 2025
18b0d05
Merge pull request #11580 from albert-github/feature/bug_empty_table
doxygen May 20, 2025
7a10ea4
issue #11579 HTML-tables in markdown files with empty lines between t…
doxygen May 22, 2025
2e44578
Fix HTML rendering issue for unnamed member groups
doxygen May 23, 2025
9509724
issue #11448 Handling of TIMESTAMP in html footer and header
doxygen May 24, 2025
a561ba4
Fix HTML rendering issue for unnamed member groups (part 2)
doxygen May 24, 2025
67e8672
Update build_cmake.yml
doxygen May 24, 2025
9c7ce4d
issue #11579 HTML-tables in markdown files with empty lines between t…
doxygen May 24, 2025
f15f86f
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 24, 2025
9f9a553
Update build_cmake.yml
doxygen May 24, 2025
5148014
Update changelog for release 1.14.0
doxygen May 24, 2025
cbe58f6
Minor fix for HTML output for named member groups
doxygen May 24, 2025
a629666
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 24, 2025
0ace21b
Bump development version to 1.15.0
doxygen May 24, 2025
b44c094
Update build_cmake.yml
doxygen May 24, 2025
50786c8
Spelling correction
albert-github May 25, 2025
5e717bf
Added missing structural command to "isOtherPage" list
doxygen May 25, 2025
df273ec
issue #11492 `@plantumlfile` command not recognized
albert-github Mar 17, 2025
e099909
PR #11500 Code simplifications
doxygen May 25, 2025
fcf690b
Merge branch 'albert-github-feature/issue_11492'
doxygen May 25, 2025
1bec4de
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 25, 2025
e6220a2
Merge pull request #11585 from albert-github/feature/bug_spell_20250525
doxygen May 25, 2025
26a251a
issue #11583 The search functionality does not find items any more si…
albert-github May 26, 2025
0592d39
issue #11587 Page outline navigation panel Glitch
doxygen May 26, 2025
8ca5feb
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 26, 2025
3cea721
Correction some quotes in changelog
albert-github May 27, 2025
29e24c1
Merge pull request #11591 from albert-github/feature/bug_spell_20250527
doxygen May 27, 2025
152e0b4
issue #11587 Page outline navigation panel Glitch
doxygen May 27, 2025
1be0bc3
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 27, 2025
22c1725
issue #11587 Page outline navigation panel Glitch
doxygen May 28, 2025
3fd4df3
Merge pull request #11589 from albert-github/feature/issue_11583
doxygen May 29, 2025
595bb3e
Some Fixes for MinGW-w64
MehdiChinoune May 29, 2025
1e99596
Merge pull request #11588 from MehdiChinoune/mingw
doxygen May 30, 2025
1ff9ca4
qt: Default to Qt 6 instead of Qt 5
gruenich May 31, 2025
2bf0cd1
issue #11593 Missing links for LaTex, RTF, ... with IMPLICIT_DIR_DOCS
doxygen May 31, 2025
703e0d6
Merge branch 'master' of github.com:doxygen/doxygen
doxygen May 31, 2025
116ebdd
Merge pull request #11596 from gruenich/feature/doxywizard-default-qt6
doxygen May 31, 2025
a1d7ad4
Bump docker/build-push-action from 6.17.0 to 6.18.0
dependabot[bot] Jun 2, 2025
d655469
Merge pull request #11599 from doxygen/dependabot/github_actions/dock…
doxygen Jun 2, 2025
c00a2de
issue #11593 Missing links for LaTex, RTF, ... with IMPLICIT_DIR_DOCS
doxygen Jun 3, 2025
feee36e
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Jun 3, 2025
2a892d6
issue #11600 Images with read-only file attributes can fail to copy
doxygen Jun 4, 2025
ee49bc3
issue #11600 Images with read-only file attributes can fail to copy
doxygen Jun 4, 2025
75b8578
Spelling correction
albert-github Jun 6, 2025
ae223cc
Handling of TIMESTAMP in html footer and header
albert-github Jun 6, 2025
817d9af
[libmd5] Smaller code cleanups
gruenich Jun 6, 2025
7546b65
Merge pull request #11603 from albert-github/feature/bug_html_timesta…
doxygen Jun 6, 2025
7165996
Merge pull request #11602 from albert-github/feature/bug_spell_20250606
doxygen Jun 6, 2025
b9d7d16
Merge pull request #11604 from gruenich/feature/cleanup-libmd5
doxygen Jun 6, 2025
8c2a629
[mscgen] Fix copy & past bug, probably max quality was ment
gruenich Jun 7, 2025
df652b4
[mscgen] Declared some variables as pointer to const
gruenich Jun 7, 2025
c8e0967
[mscgen] Make variables more local
gruenich Jun 7, 2025
cf145b3
[spdlog] Update spdlog to 1.15.3
gruenich Jun 7, 2025
915745a
Issue #11607 Broken HTML tables
albert-github Jun 8, 2025
2b3bfb1
Merge pull request #11605 from gruenich/feature/cleanup-mscgen
doxygen Jun 8, 2025
871d803
Merge pull request #11606 from gruenich/feature/update-spdlog-1.15.3
doxygen Jun 8, 2025
058b23d
Merge remote-tracking branch 'upstream/master' into feature/issue_11607
albert-github Jun 8, 2025
e98069f
Issue #11607 Broken HTML tables
albert-github Jun 8, 2025
f54d0ac
Issue #11607 Broken HTML tables
albert-github Jun 8, 2025
637c7da
Potential memory leak
albert-github Jun 9, 2025
a153ed0
issue #11590 Invalid LaTeX caused by unclosed markdown codeblocks. No…
doxygen Jun 9, 2025
0c05bc9
Merge pull request #11611 from albert-github/feature/bug_coverity_202…
doxygen Jun 9, 2025
df95c24
Consistent use of `{CMD}`
albert-github Jun 9, 2025
a329637
Limit warnings about unmatched */ to code blocks
doxygen Jun 9, 2025
9d479c8
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Jun 9, 2025
babbc98
Merge pull request #11612 from albert-github/feature/bug_consist_cmd
doxygen Jun 9, 2025
69916dd
Merge branch 'feature/issue_11607' of https://github.com/albert-githu…
doxygen Jun 10, 2025
5ceeafc
PR #11608 Avoid code duplications
doxygen Jun 11, 2025
d153939
Added test case for HTML tags
doxygen Jun 12, 2025
f134637
Merge branch 'albert-github-feature/issue_11607'
doxygen Jun 12, 2025
87c4001
Fix handling of trailing return types with `delete` and `default`
dmccabe-jt Jun 16, 2025
b1ce773
Use the correct reference hashes
dmccabe-jt Jun 16, 2025
d547539
Merge pull request #11620 from dmccabe-jt/trailing-default-delete
doxygen Jun 16, 2025
d0fb515
issue #11614 Multiple occurrences of the same macro definition in a f…
doxygen Jun 16, 2025
2b7b9d4
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Jun 16, 2025
c21f339
issue #11621 Markdown code handling ``` gets confused by unterminated…
doxygen Jun 18, 2025
6b26a63
issue #11619 Wrong Python module separator
albert-github Jun 19, 2025
629dffc
Merge pull request #11626 from albert-github/feature/issue_11619
doxygen Jun 19, 2025
84baf26
Issue #11625 Autolinking does not work with USE_MDFILE_AS_MAINPAGE
albert-github Jun 20, 2025
dcd9b42
Issue #11625 Autolinking does not work with USE_MDFILE_AS_MAINPAGE
albert-github Jun 21, 2025
fe16958
Merge pull request #11627 from albert-github/feature/issue_11625
doxygen Jun 21, 2025
f519f8f
Input buffer overflow
albert-github Jun 22, 2025
9defcc3
issue #11621 Markdown code handling `` ` `` gets confused by untermin…
doxygen Jun 22, 2025
a8479a7
Merge branch 'master' of github.com:doxygen/doxygen
doxygen Jun 23, 2025
0aa2496
Merge pull request #11628 from albert-github/feature/bug_php_reject
doxygen Jun 23, 2025
5d19e4b
issue #11621 Markdown code handling `` ` `` gets confused by untermin…
doxygen Jun 23, 2025
b3b06bd
Update build_cmake.yml
doxygen Jun 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
issue doxygen#11415 doxywizard replaces < and > in aliases with &lt; …
…/ &gt;

We have to distinguish for writing of the settings between
- writing to the, HTML, doxywizard "console"
- writing to file / pipe to run doxygen

In the first case characters like `<` have to be escaped, in the second case this should not happen.

This is actually a regression on:
```
Commit: d3d0a1d [d3d0a1d]
Date: Thursday, January 2, 2025 4:00:17 PM
String representation at "show configuration" in doxywizard

In case a string in the settings contains a `<` / `>` / `&` this can give strange results as they are literally interpreted but should be escaped.
(issue is a side note to issue doxygen#11310)
```
  • Loading branch information
albert-github committed Feb 21, 2025
commit 6e1faff896f6b3227a51a045cb3c296b8bcc7073
2 changes: 1 addition & 1 deletion addon/doxywizard/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ bool parseConfig(
const QHash<QString,Input *> &options
);

void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s);
void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s,bool convert);

// directly copied from ../../src/config.h to be consistent
enum
Expand Down
32 changes: 23 additions & 9 deletions addon/doxywizard/config_doxyw.l
Original file line number Diff line number Diff line change
Expand Up @@ -785,7 +785,7 @@ bool parseConfig(
return true;
}

void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s)
void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s,bool convert)
{
QChar c;
bool needsEscaping=false;
Expand Down Expand Up @@ -823,10 +823,17 @@ void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s)
if (*p ==QChar::fromLatin1(' ') &&
*(p+1)==QChar::fromLatin1('\0')) break; // skip inserted space at the end
if (*p ==QChar::fromLatin1('"')) t << "\\"; // escape quotes
if (*p ==QChar::fromLatin1('<')) t << "&lt;";
else if (*p ==QChar::fromLatin1('>')) t << "&gt;";
else if (*p ==QChar::fromLatin1('&')) t << "&amp;";
else t << *p;
if (convert)
{
if (*p ==QChar::fromLatin1('<')) t << "&lt;";
else if (*p ==QChar::fromLatin1('>')) t << "&gt;";
else if (*p ==QChar::fromLatin1('&')) t << "&amp;";
else t << *p;
}
else
{
t << *p;
}
p++;
}
}
Expand All @@ -835,10 +842,17 @@ void writeStringValue(QTextStream &t,TextCodecAdapter *codec,const QString &s)
p=s.data();
while (!p->isNull())
{
if (*p ==QChar::fromLatin1('<')) t << "&lt;";
else if (*p ==QChar::fromLatin1('>')) t << "&gt;";
else if (*p ==QChar::fromLatin1('&')) t << "&amp;";
else t << *p;
if (convert)
{
if (*p ==QChar::fromLatin1('<')) t << "&lt;";
else if (*p ==QChar::fromLatin1('>')) t << "&gt;";
else if (*p ==QChar::fromLatin1('&')) t << "&amp;";
else t << *p;
}
else
{
t << *p;
}
p++;
}
}
Expand Down
8 changes: 4 additions & 4 deletions addon/doxywizard/doxywizard.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void MainWindow::saveConfig(const QString &fileName)
}
QTextStream t(&f);
t.device()->setTextModeEnabled(false);
m_expert->writeConfig(t,false,false);
m_expert->writeConfig(t,false,false,false);
updateConfigFileName(fileName);
m_modified = false;
updateTitle();
Expand Down Expand Up @@ -586,7 +586,7 @@ void MainWindow::runDoxygen()
return;
}
QTextStream t(m_runProcess);
m_expert->writeConfig(t,false,false);
m_expert->writeConfig(t,false,false,false);
t.flush();
m_runProcess->closeWriteChannel();

Expand Down Expand Up @@ -718,11 +718,11 @@ void MainWindow::showSettings()
QTextStream t(&text);
if (m_showCondensedSettings->isChecked())
{
m_expert->writeConfig(t,true,true);
m_expert->writeConfig(t,true,true,true);
}
else
{
m_expert->writeConfig(t,true,false);
m_expert->writeConfig(t,true,false,true);
}
m_outputLog->clear();
m_outputLog->append(APPQT(text));
Expand Down
8 changes: 4 additions & 4 deletions addon/doxywizard/expert.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ void Expert::loadConfig(const QString &fileName)
}

void Expert::saveTopic(QTextStream &t,QDomElement &elem,TextCodecAdapter *codec,
bool brief,bool condensed)
bool brief,bool condensed,bool convert)
{
if (!brief)
{
Expand Down Expand Up @@ -832,7 +832,7 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,TextCodecAdapter *codec,
if (option && !option->isEmpty())
{
t << " ";
option->writeValue(t,codec);
option->writeValue(t,codec,convert);
}
t << "\n";
}
Expand All @@ -843,7 +843,7 @@ void Expert::saveTopic(QTextStream &t,QDomElement &elem,TextCodecAdapter *codec,
}
}

bool Expert::writeConfig(QTextStream &t,bool brief, bool condensed)
bool Expert::writeConfig(QTextStream &t,bool brief, bool condensed, bool convert)
{
// write global header
t << "# Doxyfile " << getDoxygenVersion().c_str() << "\n\n";
Expand All @@ -859,7 +859,7 @@ bool Expert::writeConfig(QTextStream &t,bool brief, bool condensed)
{
if (childElem.tagName()==SA("group"))
{
saveTopic(t,childElem,&codec,brief,condensed);
saveTopic(t,childElem,&codec,brief,condensed,convert);
}
childElem = childElem.nextSiblingElement();
}
Expand Down
4 changes: 2 additions & 2 deletions addon/doxywizard/expert.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class Expert : public QSplitter, public DocIntf
void loadSettings(QSettings *);
void saveSettings(QSettings *);
void loadConfig(const QString &fileName);
bool writeConfig(QTextStream &t,bool brief,bool condensed);
bool writeConfig(QTextStream &t,bool brief,bool condensed, bool convert);
QByteArray saveInnerState () const;
bool restoreInnerState ( const QByteArray & state );
const QHash<QString,Input*> &modelData() const { return m_options; }
Expand Down Expand Up @@ -67,7 +67,7 @@ class Expert : public QSplitter, public DocIntf

private:
void createTopics(const QDomElement &);
void saveTopic(QTextStream &t,QDomElement &elem,TextCodecAdapter *codec,bool brief,bool dondensed);
void saveTopic(QTextStream &t,QDomElement &elem,TextCodecAdapter *codec,bool brief,bool dondensed,bool convert);

QSplitter *m_splitter;
QTextBrowser *m_helper;
Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/input.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class Input
virtual void updateDependencies() = 0;
virtual void reset() = 0;
virtual bool isDefault() = 0;
virtual void writeValue(QTextStream &t,TextCodecAdapter *codec) = 0;
virtual void writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert) = 0;
virtual void setTemplateDocs(const QString &docs) = 0;
virtual bool isEmpty() { return false; };
};
Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputbool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ void InputBool::reset()
setValue(m_default);
}

void InputBool::writeValue(QTextStream &t,TextCodecAdapter *codec)
void InputBool::writeValue(QTextStream &t,TextCodecAdapter *codec,bool)
{
if (m_state)
t << codec->encode(QString::fromLatin1("YES"));
Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputbool.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class InputBool : public QObject, public Input
void setEnabled(bool);
void updateDependencies();
bool isDefault();
void writeValue(QTextStream &t,TextCodecAdapter *codec);
void writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert);
void setTemplateDocs(const QString &docs) { m_tdocs = docs; }
static bool convertToBool(const QVariant &v,bool &isValid);

Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void InputInt::reset()
setValue(m_default);
}

void InputInt::writeValue(QTextStream &t,TextCodecAdapter *)
void InputInt::writeValue(QTextStream &t,TextCodecAdapter *,bool)
{
t << m_val;
}
Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputint.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class InputInt : public QObject, public Input
void setEnabled(bool);
void updateDependencies() {}
bool isDefault();
void writeValue(QTextStream &t,TextCodecAdapter *codec);
void writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert);
void setTemplateDocs(const QString &docs) { m_tdocs = docs; }

public slots:
Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputobsolete.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class InputObsolete : public Input
void updateDependencies() {}
void reset() {}
bool isDefault() { return false; }
void writeValue(QTextStream &,TextCodecAdapter *) {}
void writeValue(QTextStream &,TextCodecAdapter *,bool) {}
void setTemplateDocs(const QString &) {}
bool isEmpty() { return false; };
Kind orgKind() const { return m_orgKind; }
Expand Down
4 changes: 2 additions & 2 deletions addon/doxywizard/inputstring.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,9 +253,9 @@ void InputString::reset()
setDefault();
}

void InputString::writeValue(QTextStream &t,TextCodecAdapter *codec)
void InputString::writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert)
{
writeStringValue(t,codec,m_str);
writeStringValue(t,codec,m_str,convert);
}

bool InputString::isDefault()
Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputstring.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class InputString : public QObject, public Input
void setEnabled(bool);
void updateDependencies() {}
bool isDefault();
void writeValue(QTextStream &t,TextCodecAdapter *codec);
void writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert);
void setTemplateDocs(const QString &docs) { m_tdocs = docs; }
bool isEmpty() { return m_str.isEmpty(); }
QString checkEnumVal(const QString &value);
Expand Down
4 changes: 2 additions & 2 deletions addon/doxywizard/inputstrlist.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ void InputStrList::reset()
setValue(m_default);
}

void InputStrList::writeValue(QTextStream &t,TextCodecAdapter *codec)
void InputStrList::writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert)
{
bool first=true;
foreach (QString s, m_strList)
Expand All @@ -253,7 +253,7 @@ void InputStrList::writeValue(QTextStream &t,TextCodecAdapter *codec)
t << " ";
}
first=false;
writeStringValue(t,codec,s);
writeStringValue(t,codec,s,convert);
}
}

Expand Down
2 changes: 1 addition & 1 deletion addon/doxywizard/inputstrlist.h
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class InputStrList : public QObject, public Input
void setEnabled(bool);
void updateDependencies() {}
bool isDefault();
void writeValue(QTextStream &t,TextCodecAdapter *codec);
void writeValue(QTextStream &t,TextCodecAdapter *codec,bool convert);
void setTemplateDocs(const QString &docs) { m_tdocs = docs; }
bool isEmpty();

Expand Down