Upstream merge conflict #1
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
… wrong indentation beyond 8 spaces
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
Incorrect field when ampersand in URL
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
Support the `_` analogous to `*`
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
…onfiguring file Based on the comment #11416 (comment) Made definitions of `M_PI` and `strcasecmp` consistent between `gd.h` and `mscgen_config.h`
…onfiguring file Fixed usage of `CMAKE_SOURCE_DIR` versus `CMAKE_CURRENT_SOURCE_DIR` so doxygen can be used as "cloned sub-project"
issue #11420 Add documentation about triple underscore emphasis
issue #11416 CMake: Error in doc_internal/CMakeLists.txt:22 Problem configuring file
issue #11416 CMake: Error in doc_internal/CMakeLists.txt:22 Problem configuring file
When having in the html or latex header or footer the substitute pattern `$showdata` without the mandatory format so something like `$showdate(%Y %H %M %S)` doxygen will go into an endless loop as the input pointer is not changed. - handling incorrect, e.g. `$showdata` - giving an appropriate warning (substitute [pattern is not shown and might get unnoticed
…ith inline code - properly process section/page/group titles for the search results - keep section formatting in page outline panel as well
…ith inline code
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.
Fix links not being generated
…sing std::numeric_limits
… evaluated javascript
…/doxygen into albert-github-feature/issue_8731
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
Since the last update of the German translator (good and necessary, #11570) the compilation under Cygwin gives problems: ``` /usr/lib/gcc/x86_64-pc-cygwin/12/../../../../x86_64-pc-cygwin/bin/as: CMakeFiles/doxymain.dir/language.cpp.o: too many sections (32796) /tmp/ccdnzEmx.s: Assembler messages: /tmp/ccdnzEmx.s: Fatal error: can't write 14 bytes to section .text of CMakeFiles/doxymain.dir/language.cpp.o: 'file too big' /usr/lib/gcc/x86_64-pc-cygwin/12/../../../../x86_64-pc-cygwin/bin/as: CMakeFiles/doxymain.dir/language.cpp.o: too many sections (32796) /tmp/ccdnzEmx.s: Fatal error: CMakeFiles/doxymain.dir/language.cpp.o: file too big make[2]: *** [src/CMakeFiles/doxymain.dir/build.make:1672: src/CMakeFiles/doxymain.dir/language.cpp.o] Error 1 ``` by setting the `big-obj` option this can be overcome.
Linking doxygen under Cygwin
…e-jt/doxygen into dmccabe-jt-trailing-return-type-pure
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Upstream merge conflict with the fork by @shahmoradi