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
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
Nesting of `longtabu` environments is not possible, on other places already the inside environment was already `longtabularx` this has been done also for this case.
Spelling correction
Spelling correction
…b/doxygen into albert-github-feature/issue_11279
…ream project documentation (no uniquely matching class member found for)
…ream project documentation (no uniquely matching class member found for)
Based on the analyses in comment #8049 (comment) where a lone `<table>` tag was identified which resulted in an empty table in the LaTeX output. which resulted in the error: ``` ! Missing # inserted in alignment preamble. <to be read again> \cr l.24 \end{longtabu} ? ``` when building the pdf file. Source code: ``` /** * Defines the style from attributes and properties of an AbiWord <table>. */ void fetchAttributesFromAbiTable(const PP_AttrProp* pAP) { } ``` Empty tables (i.e. tables without any rows are discarded.
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.16.0 to 6.17.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@14487ce...1dc7386) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: 6.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…er/build-push-action-6.17.0 Bump docker/build-push-action from 6.16.0 to 6.17.0
Tables without any rows result in error in LaTeX
…he tags not properly rendered
…he tags not properly rendered
…t_underscore Disabling Mathjax 4 packages
Analogous to the problem fixed in #7697 for `\( ...\)` a similar problem can occur for `\[ .... \]`
…ANTS become part of the enumerated type's name
This addresses #11727
Increase maximum number of threads fix #11727
…uments contain comments starting with /*!<
…s to a macro are treated as detailed description
When having: ``` # Installing the AWS CLI v2 from source * to `pyproject.toml The ``` https://awscli.amazonaws.com/awscli.tar.gz ``` ``` we get the warning: ``` source-install.md:9: warning: Reached end of file while still searching closing '```' of a verbatim block starting at line 8 ``` this looks like a regression on: ``` Commit: 9defcc3 [9defcc3] Date: Sunday, June 22, 2025 3:03:57 PM issue #11621 Markdown code handling `` ` `` gets confused by unterminated `` ` `` within (introduced by 1.11) ```
Remove redundant test on `DOT_NUM_THREADS`, the test on the maximum is already done when reading the value from the configuration file.
The name of 2 arguments was interchanged in the (internal) documentation
Text should not be present twice (especially when the first occurrence is a constexpr
….chm files that link to each other using TAGFILES Added `ms-its` protocol for HTMLHELP files
… a member f with the same name.
Remove double used text
…nk to a member f with the same name.
issue #11740 Regression: Doxygen >= 1.11.0 no longer able to produce chm files that link to each other using TAGFILES
…rguments Wrong variable name used in (internal) documentation
…warning Incorrect warning regarding type and start of backtick type of block
Remove redundant test on `DOT_NUM_THREADS`
…ula_2 Text show as formula when USE_MATHJAX=YES (2)
The end tag `</td>` was repeated when converting `\copydoc` into `\copybrief` and `\copydetails` resulting in a warning and an incorrect table.
…still link to a member f with the same name." This reverts commit 4e38c0e.
issue #11742 Handling \copydoc inside table
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