Skip to content

Upstream merge conflict #1

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

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

Upstream merge conflict #1

wants to merge 4,760 commits into from

Conversation

shahmoradi
Copy link
Member

Upstream merge conflict with the fork by @shahmoradi

doxygen and others added 30 commits January 31, 2025 20:12
Issue #11371 Odd behavior of line breaks in double quotes
There are 2 problems (introduced by #11172):
- handling of `@ilinebr` in commentcnv, so farther handling after alias substitution works when a `@ilinebr` is found
- handling of `@ilinebr` in the markdown parser, in the *scanner.l this was already done by `stripIndentation` added this for markdown as well.
Verbatim blocks need a bit of special treatment (see also html version).
Adding possibility for man pages to the test suite
Based om the comment with the issue #11373, mentioning the `ruff` checker for python, adjusted the used python scripts where necessary and possible.
…D macro that's defined in an included header file.

Also the setting `EXPAND_ONLY_PREDEF` should be taken into consideration
issue #11393 With `EXPAND_ONLY_PREDEF`, Doxygen won't expand `PREDEFINED` macro that's defined in an included header file.
Correcting python scripts in respect to style
Create possibility to have also man pages generated in test suite
Support `<span>` tag analogous to other style change tags (like `<b>`).
When having an ampersand in an URL like:
```
https://en.wikipedia.org/w/index.php?title=Unsharp_masking&oldid=750486803#Photographic_unsharp_masking
```
this can lead to a warning in the xmllint checker like:
```
html\md_aa.html:108: parser error : EntityRef: expecting ';'
ck"><p><a href="https://en.wikipedia.org/w/index.php?title=Unsharp_masking&oldid
                                                                               ^
```

Note in e.g. the xml and docbook format there were already twice the filter call.
… wrong indentation beyond 8 spaces

Ignore the line after """! when determining the indentation to
strip.
issue #11310 "^^" in aliases not proper evaluated
After the change for #11310 / 11385 got the message:
```
.../generated_src/commentcnv.l:1074: warning, dangerous trailing context
```
with this equivalent statement this message is gone
To enable this layout set:
- DISABLE_INDEX     = NO
- GENERATE_TREEVIEW = YES
- FULL_SIDEBAR      = YES
…rail

Dangerous trailing context in commentcnv.l
issue #11420 Triple underscores in Markdown mode not supported
doxygen and others added 30 commits April 30, 2025 19:59
…uctor call (C++)

Handling of `{` as well.
(Note a new state and some reordering had to be done of the lex code, otherwise an infinite loop was possible or the wrong rule was chosen)
See to it that a comment block with `@}` is handled better after an inline comment.
…ith inline code

Also fix issue with search results showing HTML tags
…ith inline code

- properly process section/page/group titles for the search results
- keep section formatting in page outline panel as well
This avoids links not being generated if a definition in a non-linkable
file has higher priority than the one in the linkable file.

Add a flag `onlyLinkable` to `getResolvedSymbolRec` which makes it skip
over unlinkable definitions. This flag is only set in `getDefsNew`. The
result of this function is ultimately used in

- DocParser::handleLinkedWord via resolveRef
- DocRef::DocRef via resolveLink
- DocLink::DocLink via resolveLink
- linkifyText via getDefs

All these users ignore unlinkable definitions.

Fixes #11560.
Issue #9843 Incomplete call graph when using curly brackets in constructor call (C++)
Add missing translations from 1.8.19 to fill the gap to the current version.
Translation german update
Also fixes problem interpreting page titles with \<tag\> as <tag> in the navigation panel
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.