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
…issue) - `width: $width` is handled in navtree.js - css files are not handled by means of `copyResource...` anymore - handling of the contents of Luminance files is done solely in css files now, so no separate Luminace template files anymore
issue #11549 Leftover variable in CSS (validation and possible logic issue)
CMakeLists.txt: use 64-bit file API on 32-bit linux
As indicated in #11550 (comment) the css files don't need any special treatment anymore, so making them "Verbatim" and removing obsolete code. Removing in python script reverences to Luminace files as not used either.
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.15.0 to 6.16.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](docker/build-push-action@471d1dc...14487ce) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-version: 6.16.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…imary template
…er/build-push-action-6.16.0 Bump docker/build-push-action from 6.15.0 to 6.16.0
CSS resource files don't need special treatment
issue #11001 \copydoc does not respect section hierarchy in table of contents
…rt-github/doxygen into albert-github-feature/issue_9437_defgroup
…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
…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
…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.
Improvement layout html commands table in documentation (beginning of line was a bit ragged)
Based on review / tests
In case of a nested table an extra empty line was shown in the latex output, this has been removed. (When the user wants an extra line he bac always use e.g. a `\n`)
…ter READ attribute Allow besides spaces also newlines inside a `Q_PROPERTY`.
Consistency language version table between HTML and LaTeX
Possibility to use verbatim parts in `tblr` tables.
…er/login-action-3.5.0 Bump docker/login-action from 3.4.0 to 3.5.0
…er/metadata-action-5.8.0 Bump docker/metadata-action from 5.7.0 to 5.8.0
Improve headings of tables
Improvement layout html commands table
Explicitly search fmt in the use_sys_fmt=ON case
…table Improved handling of nested tables
issue #11698 Q_PROPERTY wrongly parsed when split on multiple line after READ attribute
Replace ShellExecuteExW with simple CreateProcessW #11699
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