Skip to content

Upstream merge conflict - #1

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

shahmoradi wants to merge 6417 commits into
cdslaborg: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 July 22, 2026 16:08
…hor}`

In case we have in the bibliography author something like:
```
author       = "Herv{\'e} Br{\"o}nnimann"
```
and we give `\cite{shortauthor}` this is shown as:
```
Brönnimann
```
instead of
```
Brönnimann
```
… of member's in Data Fields table and Field Documentation
…ons/setup-python-7

Bump actions/setup-python from 6 to 7
Preprocessor problem with `'` in comment inside a define call
…ation

Error with Fortran string concatenation (`//`) and preprocessing
…wlines / whitespace

When having a markdown part like:
~~~
```dot

digraph G {
    "Welcome spacing" -> "To"
    "To" -> "Web"
    "To" -> "GraphViz!"
  }
```
~~~
this block is completely ignored in the output.

This looks like a regression introduced in doxygen version 1.9.7 by the handling as added in:
~~~
Commit: dac50e8 [dac50e8]

Date: Sunday, April 9, 2023 2:32:42 PM
Also handle the case with newlines before the @startuml command

Example:
```{plantuml}

@startuml
A -> B
@enduml
```
~~~

When adding `@<cmd>` the `pl` string contains just the command with its contents but no leading newlines or whitespace so we have to look from the beginning of the `pl` string.
…lock

Regression in (image) fenced code block when the block starts with newlines / whitespace
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.4.0 to 4.5.0.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@af1e73f...06fb636)

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

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

Bump docker/login-action from 4.4.0 to 4.5.0
Bumps [docker/login-action](https://github.com/docker/login-action) from 4.5.0 to 4.5.1.
- [Release notes](https://github.com/docker/login-action/releases)
- [Commits](docker/login-action@06fb636...abd2ef4)

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

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

Bump docker/login-action from 4.5.0 to 4.5.1
- requires less maintenance (versions are updated often)
…jects declared outside function scope starting from v1.13.0
albert-github and others added 30 commits September 11, 2026 11:36
After review
- using `stripPrefix`
- placing the used string in a constant
…her struct/union is not kept close to the documentation of the parent.
issue #12339 Broken `@todo` styling in HTML output
For issue #10552 (PR #10557) the handling of preformatted comment blocks was added. Here an exception was made for "verbatim" but this is not useful as Fortran comments are line comments (not block comments) and there is no way of formulation preformatted comments blocks in a way that the `!>` part of the comment will not be shown.

- strip comment indicators also for "verbatim" parts
- don't indent (also for non "verbatim" parts)
In running text there should not be a white space, so test on first column is necessary.
(based on a remark in #12340)
Spurious white space in column 1 of man page
Comment out brew update commands for MacOS installations.
issue #12340 fortranfixed `@verbatim` doesn't remove "!>"
Spelling correction
As noted in the issue parts of the dot logic are rewritten and due to this the `DOT_IMAGE_FORMAT` with renderer arn't working properly anymore as a file with extension `renderer.format` is created automatically while in the past a file with an explicit extension `format` was created.
- Adds support for use of @headerfile for namespaces and files (next to
  class, struct, union).
issue #12346 `DOT_IMAGE_FORMAT=svg:cairo` fails since 1.17.0
Remove some obsolete code from configimpl.l as this correction is already done by the reading / handling of the enum config variable.
We should use everywhere the doxygen version of the commands like `\sub...section`
In the HTML output the `<tt>` tag is translated into `<span class="tt" ...>`, in case the `<tt>` has the `class`  this is not merged properly, i.e. code like
```
<tt class="special">.h</tt>
```
is translated into
```
<span class="tt" class="special">.h</span>
```
instead of
```
<span class="tt special">.h</span>
```
Add the `A3` `PAPER_TYPE`.

(Note: #12352 has to be integrated beforehand as otherwise we still jump back to the `A4` default).
…bsub

Latex usage of `doxysub...section`
issue #12351 Add support to PAPER_TYPE for A3 paper.
#12356 Spurious "Incomplete input: scope for class std::hash< Foo > not found!" for a template specialization
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.

9 participants