Skip to content

Upstream merge conflict#1

Draft
shahmoradi wants to merge 5725 commits intocdslaborg:masterfrom
doxygen:master
Draft

Upstream merge conflict#1
shahmoradi wants to merge 5725 commits intocdslaborg:masterfrom
doxygen:master

Conversation

@shahmoradi
Copy link
Copy Markdown
Member

Upstream merge conflict with the fork by @shahmoradi

albert-github and others added 30 commits January 14, 2026 10:22
Small correction to usage help information
Sometimes we see in the documentation an incorrect repeated word, this has been corrected.
doc: fix archived Microsoft HTML Help Workshop download link
…cies

Remove jQuery dependencies from clipboard.js
…cies-navtree

Replace jQuery dependencies with vanilla JavaScript in navtree.js
…ections_tooltips.js

Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
Consistency corrections regarding usage of extensions.
(Removed an incorrect `s` in config.xml)
# Conflicts:
#	src/docnode.cpp
#	src/docparser.cpp
#	src/docparser_p.h
…cies-again

Replace jQuery with vanilla JavaScript ES6 in dynsections.js and dynsections_tooltips.js
Co-authored-by: David Hebbeker <david.hebbeker@gmail.com>
Consistency corrections regarding usage of extensions.
* Initial plan

* Replace jQuery with vanilla JavaScript in darkmode_toggle.js

Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>

* Replace deprecated keyCode with modern key property

Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>

* Fix timing issue: mimic jQuery ready() behavior with readyState check

Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: doxygen <1300762+doxygen@users.noreply.github.com>
Bumps [docker/login-action](https://github.com/docker/login-action) from 3.6.0 to 3.7.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@5e57cd1...c94ce9f)

---
updated-dependencies:
- dependency-name: docker/login-action
  dependency-version: 3.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…er/login-action-3.7.0

Bump docker/login-action from 3.6.0 to 3.7.0
Small precision regarding usage of the code span limits regarding `` ` ... ' ``
When having something like:
```
#if !defined(__linux__)

/*
@code
*/
#endif
```
we get a warning like:
```
warning: More #if's than #endif's found (might be in an included file).
```
as an attempt is made too match `@code` with `@endcode` even in a non doxygen comment
Mismatch `#if` / `#endif` when "verbatim" command in non doxygen comment
Replace jQuery based smartmenus with vanilla JavaScript in menu.js

-----

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: Dimitri van Heesch <doxygen@gmail.com>
When having something like:
```
## A fie
def aa_fie1:
  # Inside fie with `tick
  pass
```
we get a warning like:
```
a.py:8: warning: Reached end of file while still searching closing '`' of a verbatim block starting at line 6
```
this is not correct as line 8 is non-doxygen comment and should not be inspected.
doxygen and others added 30 commits April 6, 2026 14:25
Remove obsolete function
When we have an example with dot / msc /plantuml /dia / mermaid / formulas/ class / call graph ... and we have LaTeX / Docbook / rtf enabled and chm and / or qhp we get warnings when we generate the chm / qch file due to files hat were added to the `hhp` / `ghp` file.
Same occurs with the extra file specified for latex.
Warnings when generating diagrams with LaTeX and HTMLHelp / QHP enabled
When HtmlHelp is enabled the `MERMAID_RENDERMODE` should have the value `CLI` as the JavaScript is not understood.
`MERMAID_RENDER_MODE` should be set to `CLI` for the doxygen chm documentation as well
- support SVG for different formats in Mermaid diagrams
- synchronize handling of output format and output extension for Mermaid
We possibly only need the dark mode formulas for the HTML output format, not for the other formats
…maid_render_mode

HtmlHelp and mermaid render mode
Disable dark mode except for HTML output format
…xygen into albert-github-feature/bug_mermaid_svg
Changed

```
MermaidManager::OutputFormat MermaidManager::imageFormat(OutputFormat format)
```

to

```
MermaidManager::ImageFormat MermaidManager::convertToImageFormat(OutputFormat outputFormat)
```

to improve type safety and readability.
… struct and the parent class has a using-alias in another namespace
Solving new reported  `nullptr`problem reported by coverity.
- report imbalance in #if/#endif for the correct file
- keep track of the first \cond..\endcond section that causes an imbalance in
  #if/#endif for a file, and refer to it in the warning message.
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 7.0.0 to 7.1.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@d08e5c3...bcafcac)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-version: 7.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…fier and =

Handling of comment etc. "inside" an `using` statement.
Special handling is required in case the "name and "=" sign are not handled with the same rule (the other cases need a new variable, that is now added slightly delayed)
…er/build-push-action-7.1.0

Bump docker/build-push-action from 7.0.0 to 7.1.0
issue #12035 `using` ignored when attribute or comment between identifier and =
Updated the project version information and clarified the generation tools used for various files.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.