summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename template filter '|e' to '|escape' to keep in line with DjangoDimitri van Heesch2021-05-142-3/+3
|
* Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2021-05-141-1/+5
|\
| * Merge pull request #8548 from albert-github/feature/bug_formula_environmentDimitri van Heesch2021-05-131-1/+5
| |\ | | | | | | Formulas with a new environment handled as inline formulas
| | * Formulas with a new environment handled as inline formulasalbert-github2021-05-131-1/+5
| |/ | | | | | | As a regression of #8509 formulas that start a new environment (`\f{`) were considered as inline formulas as teh inline test looked for a `\{` but should look for `\begin{`.
* | Some fixes for template.cpp and improve the template outputDimitri van Heesch2021-05-1422-269/+466
|/
* Reintroducing the sidebar layout via new FULL_SIDEBAR option.Dimitri van Heesch2021-05-0912-545/+342
| | | | | - This new page layout is only enabled if DISABLE_INDEX=YES, GENERATE_TREEVIEW=YES, and FULL_SIDEBAR=YES.
* Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2021-05-092-5/+8
|\
| * Merge pull request #8533 from albert-github/feature/bug_sqlite_externDimitri van Heesch2021-05-081-4/+8
| |\ | | | | | | Adding field extern for sqlite output
| | * Adding field extern for sqlite outputalbert-github2021-05-031-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | In case we have: ``` extern int var; ``` the `extern` was not recorded in case of sqlite output.
| * | Merge pull request #8538 from albert-github/feature/bug_page_mainpageDimitri van Heesch2021-05-081-1/+0
| |\ \ | | | | | | | | Missing page when followed by mainpage
| | * | Missing page when followed by mainpagealbert-github2021-05-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have in one file a `\page` followed by a `\mainpage` than this page is not shown / completely ignore, an example: ``` @page pg_tst_1 Test 1 the 1 page @mainpage Test MainPage the mainpage ``` this problem is due to the fact that `handleMainPage` is called when a `\mainpage` command is found, and this is also the case at the end of the content of `\page` resulting in the fact that the name of this page is removed (and thus actually the complete page).
* | | | Reverted the layout change introduced in ↵Dimitri van Heesch2021-05-096-21/+20
|/ / / | | | | | | | | | | | | | | | | | | a9d29861fe6ad3c182d6cded2e3636a20086fc96 - Caused issues with existing projects that customized the page header to add own navigation tabs (e.g. CGAL).
* | | Merge branch 'sidebar_layout'Dimitri van Heesch2021-05-0815-46/+80
|\ \ \ | |/ / |/| |
| * | Optimized the layout in case DISABLE_INDEX=YES and GENERATE_TREEVIEW=YESDimitri van Heesch2021-05-0815-46/+80
| | | | | | | | | | | | | | | - also illustrated the various layouts in the customization section of the manual to make choosing easier.
* | | Merge pull request #8431 from albert-github/feature/bug_idl_inconsit_2Dimitri van Heesch2021-05-031-1/+1
|\ \ \ | |/ / |/| | Warnings regarding Internal inconsistency: namespace in IDL
| * | Warnings regarding Internal inconsistency: namespace in IDLalbert-github2021-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | n the ACE TAO package we find a number of warnings like: ``` .../ACE_TAO/ACE/html/libtao-doc/security/TAO_Security.tag:1: error: Internal inconsistency: namespace in IDL not module, library or constant group .../ACE_TAO/TAO/orbsvcs/orbsvcs/CosEventChannelAdmin.idl:30: error: Internal inconsistency: namespace in IDL not module, library or constant group ``` There are a number of reasons for these warnings a.o. IDL modules not handled properly but seen as namespaces and when type is not an IDL modules a warning is given. This happens especially when the module is documented with `@namespace` or there is a namespace definition with the same name in a C++ file (which is just a mapping between IDL and C++). Based on the discussion in https://github.com/DOCGroup/ACE_TAO/pull/1450#issuecomment-799277574 and the results from pull request #8429 a new version has been crated with just the extra test this just removes all Internal inconsistency warnings.
* | | issue #8193: Better warning in case of error in dot / msc / dia imageDimitri van Heesch2021-05-0322-249/+321
| |/ |/|
* | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2021-05-021-0/+3
|\ \
| * \ Merge pull request #8422 from albert-github/feature/bug_preprocDimitri van Heesch2021-05-021-0/+3
| |\ \ | | | | | | | | Problem with non escaped double quote in preprocessor
| | * | Problem with non escaped double quote in preprocessoralbert-github2021-03-101-0/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When having the (lex) program like: ``` %% [\"] {} %% #ifdef SHARED_OBJECT int filter_func(FILE *in, FILE *out) { /* " */ } #else int main(void) { } #endif ``` we get the messages like: ``` .../htuml2txt.lex:11: warning: Found an #else without a preceding #if. .../htuml2txt.lex:13: warning: More #endif's than #if's found. ``` due to the fact that the escaped double quote is not seen as an escaped character.
* | | Merge branch 'DuyDang007-vertical_alignment_table'Dimitri van Heesch2021-05-023-13/+51
|\ \ \ | |/ / |/| |
| * | Minor performance/code duplication tweaksDimitri van Heesch2021-05-021-16/+20
| | |
| * | Merge branch 'vertical_alignment_table' of ↵Dimitri van Heesch2021-05-023-1/+35
| |\ \ |/ / / | | | | | | https://github.com/DuyDang007/doxygen into DuyDang007-vertical_alignment_table
| * | Add check for middle vertical alignmentDuy Dang2021-02-012-0/+4
| | |
| * | Support vertical alignment in multirow tableDuy Dang2021-02-013-1/+31
| | |
* | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2021-05-027-7/+58
|\ \ \
| * \ \ Merge pull request #8427 from lcarlier/bug_anonymous_namespaceDimitri van Heesch2021-05-021-1/+15
| |\ \ \ | | | | | | | | | | Fix bug linking C++ anonymous namespace
| | * | | Fix bug linking C++ anonymouus workspaceLaurent Carlier2021-03-131-1/+15
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | When using the \copydoc or \copybrief command, a variable declared inside an anonymous workspace couldn't be fixed. This patch resolves this issue.
| * | | Merge pull request #8333 from albert-github/feature/bug_305773Dimitri van Heesch2021-05-026-6/+43
| |\ \ \ | | | | | | | | | | bug_305773 Volatile declaration is missing for variables in XML output
| | * \ \ Merge branch 'master' into feature/bug_305773Dimitri van Heesch2021-04-29472-91840/+64744
| | |\ \ \
| | * | | | bug_305773 Volatile declaration is missing for variables in XML outputalbert-github2021-01-136-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | Handle "const" and "volatile" in the same way, they are bit cv-qualifiers
* | | | | | Merge branch 'albert-github-feature/bug_linecnt_define'Dimitri van Heesch2021-05-021-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'feature/bug_linecnt_define' of ↵Dimitri van Heesch2021-05-021-0/+1
| |\ \ \ \ \ |/ / / / / / | | | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_linecnt_define
| * | | | | Incorrect line count for normal comment in definealbert-github2021-01-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When having the program: ``` /// \file #define A_DEF 2 /* A line * A line */ /** * the wrong line \line7 */ void fie(void) {} `` we get the message: ``` aa.c:6: warning: Found unknown command '\line7' ``` instead of ``` aa.c:7: warning: Found unknown command '\line7' ``` Also in the source code and the reference to it we see a wrong line number for the function `fie`.
* | | | | | Merge branch 'albert-github-feature/bug_code_lang'Dimitri van Heesch2021-05-028-35/+72
|\ \ \ \ \ \
| * | | | | | Fixed missing comma and improved constnessDimitri van Heesch2021-05-022-3/+3
| | | | | | |
| * | | | | | Merge branch 'master' into feature/bug_code_langDimitri van Heesch2021-05-02476-92113/+65450
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #8327 from albert-github/feature/bug_enum_structDimitri van Heesch2021-05-025-2/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Incorrect type for enum struct
| * | | | | | | Incorrect type for enum structalbert-github2021-01-125-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case we have the simple file: ``` /// \file /// docu with nothing enum MyEnum_not { v1_0, v2_0 }; /// docu with class enum class MyEnum_cls { v1_2, v2_2 }; /// docu with struct enum struct MyEnum_str { v1_3, v2_3 }; ``` with settings: ``` QUIET=YES ALWAYS_DETAILED_SEC=YES ``` the `enum struct` is shown as `enum class` in the brief description and in the detailed description just as `enum` (the later also is the case for the `enum class).
* | | | | | | | Merge pull request #8509 from albert-github/feature/bug_formula_mjDimitri van Heesch2021-05-0112-28/+88
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Problems with some commands in MathJax
| * \ \ \ \ \ \ \ Merge branch 'master' into feature/bug_formula_mjDimitri van Heesch2021-04-28271-8793/+9239
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Problems with some commands in MathJaxalbert-github2021-04-2012-28/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Especially with commands like `\f$\mbox{\LaTeX}\f$`MathJax has some problem as it is not, yet, able to use the commands `\raise` and `lower` inside the `\mbox` as used in this LaTeX command. Also switching in and out of math-mode doesn't work as the resulting code either doesn't work in MathJax or in LaTeX, hence the new command s `\f(` and `\f)`.
* | | | | | | | | | Merge pull request #8530 from albert-github/feature/bug_spell_20210105Dimitri van Heesch2021-05-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Spelling correction
| * | | | | | | | | | Spelling correctionalbert-github2021-05-011-1/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Small spelling correction
* | | | | | | | | | Fix compilation issue in doxyparse.cppDimitri van Heesch2021-05-011-0/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'albert-github-feature/bug_startuml'Dimitri van Heesch2021-05-0111-21/+97
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Changed plantumlStart from const char *[] to std::set<QCString>Dimitri van Heesch2021-05-011-19/+17
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'feature/bug_startuml' of ↵Dimitri van Heesch2021-05-0111-18/+96
| |\ \ \ \ \ \ \ \ \ \ |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_startuml
| * | | | | | | | | | Extending startuml with extra figure typesalbert-github2021-04-062-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2 more supported exgines / figure types: `board` and `git` (thanks to: The-Lu, see https://forum.plantuml.net/13557/support-for-the-different-%40start-commands?show=13564#a13564)
| * | | | | | | | | | Extending startuml with extra figure typesalbert-github2021-04-0411-18/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all diagrams can be created with the PlantUML `@startuml` command but need another PlantUML `@start...` command. This wil look like `@start<engine>` where currently supported are the following `<engine>`'s: `uml`, `bpm`, `wire`, `dot`, `ditaa`, `salt`, `math`, `latex`, `gantt`, `mindmap`, `wbs`, `yaml`, `creole`, `json` and `flow`. By default the `<engine>` is `uml`. The `<engine>` can be specified as an option. Explicitly the option variant has been chosen so we won't get an explosion of extra commands.