Skip to content

Upstream merge conflict #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 4,786 commits into
base: master
Choose a base branch
from
Draft

Upstream merge conflict #1

wants to merge 4,786 commits into from

Conversation

shahmoradi
Copy link
Member

Upstream merge conflict with the fork by @shahmoradi

albert-github and others added 30 commits February 19, 2025 18:31
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
We have to distinguish for writing of the settings between
- writing to the, HTML, doxywizard "console"
- writing to file / pipe to run doxygen

In the first case characters like `<` have to be escaped, in the second case this should not happen.

This is actually a regression on:
```
Commit: d3d0a1d [d3d0a1d]
Date: Thursday, January 2, 2025 4:00:17 PM
String representation at "show configuration" in doxywizard

In case a string in the settings contains a `<` / `>` / `&` this can give strange results as they are literally interpreted but should be escaped.
(issue is a side note to issue #11310)
```
issue #11415 doxywizard replaces < and > in aliases with &lt; / &gt;
…titute

Incorrect substitute pattern in header / footer
Some warnings are repeated a number of times even though they refer to the same problem. By storing a md5sum of the warnings (less space than the full message) this can be prevented.
…_PATH`

When `SHOW_GROUPED_MEMB_INC` is set the filename respects `STRIP_FROM_PATH` and not `STRIP_FROM_INC_PATH` although the documentation already say it will add a `#include` statement.
…h absolute paths

This commit fixes the problem that the paths to external documentations were preceeded with resultsPath even if the external documentation has an absolute path resulting in the creation of invalid links like search/https://somepath
Prevent some code duplication and more generic way to get string values
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.13.0 to 6.14.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](docker/build-push-action@ca877d9...0adf995)

---
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]>
Fix wrong links created in search box for external documentations with absolute paths
…in template's documentation instead of the specialization's documentation.
…er/build-push-action-6.14.0

Bump docker/build-push-action from 6.13.0 to 6.14.0
Small omission found by tests
Spelling correction
After review, prevent thread save problems
…arkers

Corrected by removing 2nd `[` / `]`
The handling of the `\xrefitem` should also end at the end of a table element (start  / end of a row / cell / header row / table)
Made an exception for images starting with `http:://` and `https://"
…nings

In case no name is specified the current entry is not valid and should be "emptied"
Also the initializer line should be removed (might be a left over from some other parts as found some other tests).

Note this also tackles #11451
rstephan and others added 30 commits May 12, 2025 17:48
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.
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
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.