Skip to content
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

Upstream merge conflict #1

Draft
wants to merge 4,662 commits into
base: master
Choose a base branch
from
Draft

Upstream merge conflict #1

wants to merge 4,662 commits into from

Conversation

shahmoradi
Copy link
Member

Upstream merge conflict with the fork by @shahmoradi

doxygen and others added 30 commits December 31, 2024 13:31
cmake: Fix flex version check for overriding the register keyword
- adding missing module part
- small corrections about available items
- small layout issues
To improve backward compatibility.
Also a warning is now raised for missing items when using layout version 2.0
Add module part to customize documentation
Also update the documentation regarding new layout behavior when
information is missing.
Running  a xml-lint checker over the documentation revealed:
- missing `</li>` tag.
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 not to issue #11310)
issue #11210 Support for Plus sign code fence directives - GitHub flavor
…ywizard

String representation at "show configuration" in doxywizard
…arkdown table

Detecting `\ilinebr` and seeing it as end of command as well.
The README says:
Furthermore you can display the doxygen version used at the top of the output using `--version` and
the warnings emitted by doxygen at the bottom of the output by means of `--debug`.
- special character for HTML needed to be escaped in HTML way
- added preformatted tags to debug message.
- adding different possible image formats to `DOT_IMAGE_FORMAT` (found by trying e.g. `dot -Tsvg:xx`  and inspecting the error given)
- Format `svg:cairo` and `svg:vcairo:cairo` cannot be used with `INTERACTIVE_SVG` and also have a slightly different place of `width` and `height`)
doxygen and others added 30 commits March 24, 2025 20:26
To speed up loading, especially for the graphical class hierarchy page
- Remove hover effect for navigation arrows
- Add animation effect for folder close to open
Adding the "loading attribute to the dtd as necessary due to:
```
Commit: eafe670 [eafe670]

Date: Monday, March 24, 2025 8:26:06 PM

Set lazy loading attribute for images

To speed up loading, especially for the graphical class hierarchy page
```
Small correction to internal documentation (similar documentation as with other classes within the `reg` namespace)
issue #11504 References not generated when tilde and dot in directory name
Small correction to internal documentation
In case `CASE_SENSE_NAMES=YES` the directory name `TestKernel` was matched with `EXCLUDE_PATTERNS=*/test*` on Windows.
When introducing the settings `SYSTEM` / `YES` / `NO` for `CASE_SENSE_NAMES` in:
```
Commit: f41a679 [f41a679]

Date: Thursday, August 18, 2022 3:23:54 PM

issue #9236 doxygen x_noenv should always diff system-dependent settings

Making the `CASE_SENSE_NAMES` settings an enum with values `SYSTEM`, `YES` and `NO`.
In case `SYSTEM` is chosen the value is, system dependently changed at runtime.
```
no automatic overruling should take place anymore.
The value `.ixx` was mentioned twice with configuration setting `FILE_PATTERNS`
Handling of case sensitive file / directory names
Correction of translation error
…e_value

Value mentioned twice with configuration setting `FILE_PATTERNS`
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.

10 participants