Skip to content

Upstream merge conflict#1

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

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

Conversation

@shahmoradi
Copy link
Member

Upstream merge conflict with the fork by @shahmoradi

doxygen and others added 30 commits November 7, 2025 19:44
issue #11838 It is not possible to add long tables in pdf documentation
Discussion  #11852 Why is name of docSect6Type sect5 in docInternalS5Type?
Rationale:
- not really beneficial to use a custom type anymore.
- Using same type as return type gives the compiler more options for return value optimization (RVO).
* refactor(xmlgen): remove dead finish method

* refactor(layout): remove dead clear method

* refactor(growbuf): remove dead reserve, get, and empty method

* refactor(textstream): remove dead stream, and file function

* refactor(arguments): remove dead front, and at method

* fix(xmlgen): remove commented line

* Revert "refactor(arguments): remove dead front, and at method"

This reverts commit 5d16d41.

* Revert "refactor(growbuf): remove dead reserve, get, and empty method"

This reverts commit 5227489.
…enerated HTML

The current situation is a bit inconsistent as depending on the number of paragraphs in an item the `<p class="startli">` is added or nor.

In case one of the items consists of multiple paragraphs the `<p class="startli">` is added for all paragraphs in the items in the current item block.
When having maximal 1 paragraph for each item the  `<p class="startlisingle">` is added so the user can (through a css file) choose a different layout for both situations.
Made the test so that extra empty lines etc. due to a change in xml writing library doesn't influence the tests.
Adding warning about the cause of the problem (unterminated fenced comment block)
issue #11863 parse of markdown does not exclude Code blocks
…exed parameters

making the `\mbox` usage a bit more sophisticated (checking the length so long links can be wrapped) using `\doxymbox`.
Based on
- idea from https://tex.stackexchange.com/a/18577/44119 , there were problems with a.o. `\hbox` in hyperlinks, so using:
  - strategy / code used for length determination of tables
- don't break lines before a `:` but after it (be careful with `::`)
- add `/` as place for line breaking
Handle the `ilinebr` command properly after a file mask (i.e. ending the file mask and pushing the` ilinebr` command back_
- Merged with master branch
- added breakpoint at `#` sign.
Bumps [actions/checkout](https://github.com/actions/checkout) from 5 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](actions/checkout@v5...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
issue #11702 LaTeX output does not properly break lines with long indexed parameters
…ons/checkout-6

build(deps): bump actions/checkout from 5 to 6
albert-github and others added 30 commits February 17, 2026 13:24
Analogous to the  the problem with the `//` comments also with the `/*` type of comments the problem was present.
…output, no error) in 1.16.1

The BOM characters are not allowed by doxygen and under windows these non printable characters caused problems.
Reformulated warning in case if a non printable character.
…gen into albert-github-feature/issue_11984_2
Updated Polish translation to 1.16.0
Until now only in `code.l` and `lexcode.l` the disabling or enabling of the line numbers was implemented (could be seen when using the `\example` command) resulting in that for the non mentioned parsers the line numbers were shown.
Keep ///< style comments in concept definition as-is.
issue #11989 Doxyfile with UTF-8 BOM Doxyfile causes silent exit (no output, no error) in 1.16.1
Missing closing round bracket with `\cite` description
…tions_lineNumbers

Handling of line numbers with e.g.  `\example` command
Building the doxygen CHM documentation we got the warning:
```
When enabling GENERATE_HTMLHELP the HTML_CODE_FOLDING option should be disabled. I'll adjust it for you.
```
due to the removal of jquery, setting `HTML_CODE_FOLDING=NO`
The examples for the CHM documentation also contained some incorrect settings.
Disable `INTERACTIVE_SVG` when `GENERATE_HTMLHELP=YES`
…sidered the same from doxygen 1.16.1

Removing left over debug statement
Discussion #12000 CHM Viewer JavaScript Problem with svg.min.js
Issue #11985 C++20 function signature with different requirements considered the same from doxygen 1.16.1
Fix ObjC base list state leak between interface and protocol declarations
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.