Skip to content

Upstream merge conflict - #1

Draft
shahmoradi wants to merge 6231 commits into
cdslaborg:masterfrom
doxygen:master
Draft

Upstream merge conflict#1
shahmoradi wants to merge 6231 commits into
cdslaborg:masterfrom
doxygen:master

Conversation

@shahmoradi

Copy link
Copy Markdown
Member

Upstream merge conflict with the fork by @shahmoradi

lws-team and others added 30 commits May 23, 2026 06:43
These are some small XSS weaknesses noticed by Gemini.

 - harden mailto: handling against injection
 - harden UI state processing: coerce external state processing through int
   conversion to stop DOM-based injection
 - v3: For the inheritence toggle ID, don't depend on any systemic ID naming other
   than "pick the class not called 'inherit_header'
Assisted-by: Gemini Pro 3.1
Signed-off-by: Andy Green <andy@warmcat.com>
Consistent usage of newlines between generated documentation elements.
Preventing superfluous white lines e.g. at end of documentation.
Minor fix for XHTML output and to avoid warnings in non-interactive SVGs
Consistent usage of newlines between generated documentation elements.
Bumps [docker/metadata-action](https://github.com/docker/metadata-action) from 6.0.0 to 6.1.0.
- [Release notes](https://github.com/docker/metadata-action/releases)
- [Commits](docker/metadata-action@030e881...80c7e94)

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

Signed-off-by: dependabot[bot] <support@github.com>
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.1.0 to 4.2.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@4907a6d...650006c)

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

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

Bump docker/metadata-action from 6.0.0 to 6.1.0
…er/login-action-4.2.0

Bump docker/login-action from 4.1.0 to 4.2.0
# Conflicts:
#	addon/doxywizard/expert.cpp
… comments like:

```
#define c_function_symbol(F)           T_Sym(c_function_data(F)->sam.c_sym)        /* f is c_function or c_macro, but not c_function* -- doesn't fit current checks */
```

There is a chance of getting an error like:
```
input buffer overflow, can't enlarge buffer because scanner uses REJECT
    lexical analyzer: .../doxygen/src/pre.l (for: .../s7.c)
```

this type of comment is of no interest to the `#define` / doxygen and should not be copied into the "define" buffer.
Error due to insufficient internal buffer size
Move "generator" part to the logical part in `config....xml`
Small corrections doxywizard generator translations
- correction to `<code>` tag
- order of statements
- German translation correction (`{0}` now inside code)
Small corrections doxywizard generator translations
Small update of the doxywizard documentation in respect to the new possibilities
- updating existing images
- adding new images for the new features
- adjusting / adding  documentation
With issue #9236 (and resulting PR #9526) the possibility to have a "system dependent value" through the attribute `altdefval` has been removed from the configuration file, though in the coded references still existed as well as (now) in the translation files.
The possibility has been removed completely now.
Some more obsolete references to `altdefval`
When having an example like:
```
# [![Vim The editor](https://github.com/vim/vim/raw/master/runtime/vimlogo.gif)](https://www.vim.org)

## sect

## sect

### sub sect

### sub sect
```
the text of the sections will be , in the treeview, left panel, mixed with the image whilst in the right panel (the local table of contents) it will be properly displayed (as it will also be properly displayed in the main window).

The limiting factor here is the setting of the "height" for the image and this looks like not topo be necessary.
The "height was introduced with:
```
Commit: b5d08f6 [b5d08f6]

Commit Date: Wednesday, March 19, 2025 9:35:42 PM

Modernize HTML look and feel for dir/section arrows
```
Remove obsolete attribute `altdefval` from configuration settings
doxygen and others added 30 commits July 30, 2026 14:36
…n-configs

Add translated doxywizard header section to i18n config files
In the header part of the configuration files we see `\" \"` and the backslashes (`\`) remain present in the resulting Doxyfile which is not intended.
Removed the superfluous backslashes.
…anslations

Adding report facility to internal documentation for configuration translations
Adding dependencies for report on the translated configuration files. The used technique is based on InsightSoftwareConsortium/ITK#6550
…guration files.

Adding checks and auto-correction for header part of translated configuration files.
…guration files.

Added some safeguards in case an element does not exist at all
Due to the change:
```
Commit: b117bea [b117bea]

Date: Saturday, July 22, 2023 6:33:09 PM

Add foldable sections for variables with multiline brace initializers
```
the initializer is also shown as `INLINE_SOURCES`, this is not the intention.
Before adding the numbers and plus sign in a "language name" (`CODEID`) it was possible to have a minus sign as well, this has been readded.
issue #12270 `@code{.shell-session}` is broken since 1.14.0
Notable changes
int  s.find    -> size_t s.find
int  s.findRev -> size_t s.rfind
bool s.isEmpty -> bool   s.empty
- Doxygen's QCString implementation's relation to Qt's QCString has become more distant over time, so it is
  now renamed to a DString (Doxygen's internal string)
…ader

Adding checks and auto-correction for header part of translated configuration files.
…t_dependencies

Adding dependencies for report on the translated configuration files
Remove superfluous `\` from header part of configuration files
Small correction about the name of the guard at the closing `#endif`
… of member's in Data Fields table and Field Documentation
Spelling correction
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.

6 participants