Upstream merge conflict #1
Draft
Conversation
This file contains 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
When having in the new syntax where the last "comment" character was not separated from the `-->` the `-->` was shown in the output.
…ctions using protected inheritance on Doxygen trunk
…ss if protected functions in base class is not documented (Origin: bugzilla #751453)
issue #10959 Capability to render GitHub flavor Markdown comments
Create variable to check whether a doxygen `.git` directory exists, i.e. we have a git version of doxygen or just a distribution with the source files.
…he undocumented class (Origin: bugzilla #738840)
issue #10995 Build issue: Build picks up wrong git info
# Conflicts: # doc/commands.dox # src/commentscan.l # src/docbookgen.h # src/entry.cpp # src/entry.h # src/htmlgen.h # src/latexgen.h # src/mangen.h # src/memberdef.cpp # src/outputlist.h # src/rtfgen.cpp # src/rtfgen.h
issue #8256 Possible to get enum values in the Enumeration Type documentation
…rt-github/doxygen into albert-github-feature/bug_py_cls_var_init
…e code block contains a derived class definition calling the base class function in Doxygen 1.9.5 or later
For "verbatim" type commands the initial indentation counting as done in `detab()` during the markdown phase should be disabled. For the ease of the implementation (not to repeat logics about these, nested, "verbatim" commands the new internal command `\iskip` has bveen andded together with its counterpart `\endiskip`.
Small corrections: - wrong line was deleted - side effect with single backtick corrected
Small corrections: - wrong line reinserted
Better place for the `\iskip` command so that the space in the beginning of commands is preserverd better like in rules like:
```
<DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*/(".")?[a-zA-Z0-9#_-]+ |
<DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]*/"{"[^}]+"}" |
<DocBlock>^({B}*"*"+)?{B}{0,3}"```"[`]* {
<DocBlock>{B}*"<"{CODE}">"
```
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.3.0 to 6.4.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@1a16264...a254f8c) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…e no longer generated
…" instead of "operator<=>" in related symbols Prevent that declinfo sees `<=>` as a template specifier
…Doxygen 1.9.5 - trunk (7e18605)
issue #11130 three-way comparison operator is showing up as "operator" instead of "operator<=>" in related symbols
Change JAVADOC_BLOCK to JAVADOC_BANNER in example
bug 729344 Ignoring an items when / or \ is placed after \addindex
When Doxygen is built with libstdc++ assertions enabled (passing
`-Wp,-D_GLIBCXX_ASSERTIONS` to the compiler, which is for example how
the ArchLinux doxygen package is built), the markdown processing code
can hit an OOB condition when processing en- and em-dashes. Which then
manifests as a quite nasty abort:
/usr/include/c++/14.2.1/string_view:256: constexpr const std::basic_string_view<_CharT, _Traits>::value_type& std::basic_string_view<_CharT, _Traits>::operator[](size_type) const [with _CharT = char; _Traits = std::char_traits<char>; const_reference = const char&; size_type = long unsigned int]: Assertion '__pos < this->_M_len' failed.
Added a minimal reproduction case to the markdown test and updated the
expected output to verify this doesn't regress again in the future.
…L_PATH On Windows don't use `::getenv` but `GetEnvironmentVariable` as `::getenv` doesn't always work properly with `GetEnvironmentVariable`
Fix out-of-bounds `std::string_view` access in Markdown n-/m-dash processing
for typedef'" That commit only fixed the problem partially, and in a way that duplicates a lot of the logic. A better fix is in the next commit. This partially reverts commit 70aff92.
And if they are merged, don't leave them in there, because that makes them subsequently treated as functions.
issue #11135 The anchors don't work
…oxygen into mosra-typedef-merge-with-scope
issue #11134 gswin64c.exe not recognized if path added to EXTERNAL_TOOL_PATH
…rt-github/doxygen into albert-github-feature/bug_formula_newline
Contrary to classes (`HIDE_UNDOC_CLASSES`) there is for namespaces no possibility to flexible show / hide them (only by means of documenting the namespace or set `EXTRACT_ALL=YES`). With `HIDE_UNDOC_NAMESPACES` this possibility is created and the default behavior remains as it was (i.e. `HIDE_UNDOC_NAMESPACES=YES`).
When having a simple example like:
```
/// \file
enum class Enum_cls
{
All_cls
= 0,
Functions_cls,
New_cls
};
enum Enum
{
All
= 0,
Functions,
New
};
```
we see in the source listing (when `EXTRACT_ALL=YES`) that the lines 3, 6, 7, 9, 11, 14, 15 and 17 are (grey) marked instead of the lines 3, 6, 7, 8, 11, 13, 15 and 16.
This has been corrected
Incorrect marking of enum values in source browser
…amespaces More flexibility showing undocumented namespaces
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