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
…_trim Snippet with options `lineno` and `trimleft`
…n Doxygen 1.12 Don't remove "common initial space" in the replacement of `^^`.
- Moved stripping of special commant from parse phase to render phase so the code needs to be parsed only once. - Fixed issue with duplicate anchors when multiple code fragments were shown with line numbers in a single comment. - Fixed typo in test case 032
…n Doxygen 1.12 The stripping was for Fortran and python not done at all, added.
issue #10569 First sentence after defgroup no longer used as brief decriptions
…n Doxygen 1.12 After review
When we have multiple spaces at the end of a brief description like in:
```
#define BRLAPI_PACKET_RESUMEDRIVER0 'R' /**< Resume driver */
```
and settings:
```
JAVADOC_AUTOBRIEF = YES
MARKDOWN_SUPPORT = YES
GENERATE_MAN = YES
```
This leads in e.g. the HTML output to some extra white space for the brief description and in the MAN output to:
```
#define BRLAPI_PACKET_RESUMEDRIVER0 'R'
Resume driver
"
```
The problem is the empty spaces at the end of the brief description that are converted ny the `MARKDOWN_SUPPORT` to `\ilinbr<br>`, the brief description is now stripped of leading and trailing whitespce and also the later is now stripped.
issue #11172 Aliases with embed:rst:leading-asterisk no longer work in Doxygen 1.12
When running bison we get warnings like:
```
Sebastien Loriot
9:07 AM (5 hours ago)
to me, Laurent
Hello,
today's testsuite is fully red because of a python issue that has
nothing to do with doxygen.
While writing to you, here are some warnings you might want to fix:
/home/cgal-testsuite/cgal_doc_build/CGAL-6.0.1-Ic-349/doc/scripts/doxygen_master/src/constexp.y:36.1-25:
warning: deprecated directive: ‘%name-prefix "constexpYY"’, use ‘%define
api.prefix {constexpYY}’ [-Wdeprecated]
36 | %name-prefix "constexpYY"
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| %define api.prefix {constexpYY}
/home/cgal-testsuite/cgal_doc_build/CGAL-6.0.1-Ic-349/doc/scripts/doxygen_master/src/constexp.y:36.1-25:
warning: deprecated directive: ‘%name-prefix "constexpYY"’, use ‘%define
api.prefix {constexpYY}’ [-Wdeprecated]
36 | %name-prefix "constexpYY"
| ^~~~~~~~~~~~~~~~~~~~~~~~~
| %define api.prefix {constexpYY}
/home/cgal-testsuite/cgal_doc_build/CGAL-6.0.1-Ic-349/doc/scripts/doxygen_master/src/constexp.y:
```
The problem was called because of the usage of an old bison version (2.7) in GitHub Actions for windows so the `%name-prefix "constexpYY"` was necessary.
There is a newer version of bison available on chocolaty and also on sourceforge so no reason for using the old version.
Removing some compiler warnings of type: ``` conversion from 'size_t' to 'int', possible loss of data ```
Remove warnings regarding bison package
Removing compiler warnings
Remove warnings of type: ``` warning C4018: '>=': signed/unsigned mismatch ```
…smatch Remove some warnings regarding signed/unsigned mismatch
…cumented struct problem looks like to be that the mentioned fields (`date` and `day_of_the_week`) are evaluated against the outer class of the current class (so against `example::sit` instead of `example::sit::`). Similar problems occur with the namespace (and probably also with modules and concepts) so this also has been fixed.
When using the debug options `-d preprocessor` and `-d stderr` the resulting code text is not redirected to stderr but still written to stdout.
The handling of the `#pragma once` was different from the handling of a file with the `#ifndef` guard construction, making, especially when nested include files were in e.g. a namespace, very slow.
The README says: Furthermore you can display the doxygen version used at the top of the output using `--version` and the warnings emitted by doxygen at the bottom of the output by means of `--debug`.
- special character for HTML needed to be escaped in HTML way - added preformatted tags to debug message.
…in the same output file
- adding different possible image formats to `DOT_IMAGE_FORMAT` (found by trying e.g. `dot -Tsvg:xx` and inspecting the error given) - Format `svg:cairo` and `svg:vcairo:cairo` cannot be used with `INTERACTIVE_SVG` and also have a slightly different place of `width` and `height`)
…to invalid links
issue #11308 SVG dot graphs have added padding
…bert-github/doxygen into albert-github-feature/bug_commentview_debug
Also added line numbers to the user input
…in the same output file
Handling lines that just contain white space or are completely empty as having no effect on indentation
Should take initial white space line also into consideration
issue #11330 Snippet trimleft option does not handle newlines well
…xplicitPage with doxygen 1.13.1
These appear to have been accidentally introduced in 0019111 and cause the output of `doxygen -l` to be invalid XML.
Remove redundant 'visible' attrs in layout
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.10.0 to 6.11.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@48aba3b...b32b51a) --- 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]>
…er/build-push-action-6.11.0 Bump docker/build-push-action from 6.10.0 to 6.11.0
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