summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed marker replacement for a placeholder at the end of the commandDimitri van Heesch2020-10-291-2/+2
|
* Merge branch 'albert-github-feature/bug_aliases_cmd'Dimitri van Heesch2020-10-291-38/+27
|\
| * Some further simplications and modernizationsDimitri van Heesch2020-10-291-50/+30
| |
| * Merge branch 'feature/bug_aliases_cmd' of ↵Dimitri van Heesch2020-10-291-12/+21
| |\ |/ / | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_aliases_cmd
| * Handling commands for backslash and at-sign in ALIASESalbert-github2020-10-291-12/+21
| | | | | | | | | | | | When we have an command like `\\`, `\@`, `@@` or `@\`in ALIASES this should not disturb the recognition of the replacement strings like `\2`, so e.g. `\\2` should not be replaced by `\y` but remain `\\2` (assuming the `\2` is linked to `y` in an ALIASES). This issue was found after #8137 had been fixed and was already present in older versions as well.
* | Refactoring: modernize getUsedClasses() methodDimitri van Heesch2020-10-2910-143/+144
|/
* Merge pull request #8140 from albert-github/feature/issue_8139Dimitri van Heesch2020-10-291-1/+1
|\ | | | | issue #8139 Segfault after a8bf5d3
| * issue #8139 Segfault after a8bf5d3albert-github2020-10-291-1/+1
|/ | | | As indicated in the issue the proposed fix fixes OP's problem (according to his initial tests) as well as the problem in the CGAL documentation.
* Merge pull request #8131 from albert-github/feature/issue_8130Dimitri van Heesch2020-10-281-2/+6
|\ | | | | issue #8130 Markdown relative links - not working for other folders
| * issue #8130 Markdown relative links - not working for other foldersalbert-github2020-10-261-2/+6
| | | | | | | | Always convert links to absolute path even when path exists
* | Merge pull request #8136 from albert-github/feature/bug_latex_doubleDimitri van Heesch2020-10-282-7/+3
|\ \ | | | | | | Remove double usepackage / RequirePackage from LaTeX
| * | Remove ouble usepackage / RequirePackage from LaTeXalbert-github2020-10-272-7/+3
| | | | | | | | | | | | Remove double usepackage / RequirePackage from LaTeX initialization files (but keen multirow / multicol together)
* | | Merge branch 'albert-github-feature/issue_8137'Dimitri van Heesch2020-10-281-1/+1
|\ \ \
| * \ \ Merge branch 'feature/issue_8137' of ↵Dimitri van Heesch2020-10-281-1/+1
| |\ \ \ |/ / / / | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/issue_8137
| * | | issue #8137 Whitespace/Separator required to recognize custom command argumentalbert-github2020-10-281-1/+1
| |/ / | | | | | | | | | In case the character directly following the number of a substitution marker is a backslash search directly a new substitution pattern
* | | Merge branch 'symbolresolver'Dimitri van Heesch2020-10-289-1163/+1331
|\ \ \ | |/ / |/| |
| * | Refactoring: introduce SymbolResolver to group symbol lookup routinesDimitri van Heesch2020-10-289-1163/+1331
| | | | | | | | | | | | - Main goal was to avoid use of global state.
* | | Merge pull request #8133 from albert-github/feature/issue_8127Dimitri van Heesch2020-10-261-10/+18
|\ \ \ | | | | | | | | issue #8127 Java: xml output of preformatted (`<pre>`) block adds para-block for blank lines (hindering certain manual parsing)
| * | | issue #8127 Java: xml output of preformatted (`<pre>`) block adds para-block ↵albert-github2020-10-261-10/+18
| | |/ | |/| | | | | | | | | | | | | for blank lines (hindering certain manual parsing) Don't terminate a paragraph and remove the whitespace when inside a pre block, but output the blanks.
* | | Merge pull request #8134 from albert-github/feature/issue_8132Dimitri van Heesch2020-10-261-0/+4
|\ \ \ | |/ / |/| | issue #8132 Markdown inclusion of images broken after 39db9f48
| * | issue #8132 Markdown inclusion of images broken after 39db9f48albert-github2020-10-261-0/+4
|/ / | | | | | | see to it that the `\ilinebr` cannot be seen as part of the file name (backslashes can be present as path especially in case of windows).
* | Merge pull request #8124 from albert-github/feature/bug_cmake_versionDimitri van Heesch2020-10-241-1/+0
|\ \ | | | | | | Redundant / incorrect required version of cmake
| * | Redundant / incorrect required version of cmakealbert-github2020-10-221-1/+0
| | | | | | | | | | | | In the clang part the required version for cmake was 3.1 though in the general part (on the main directory) already version 3.3. was required.
* | | Merge pull request #8123 from albert-github/feature/bug_cnt_md_codeDimitri van Heesch2020-10-241-1/+1
|\ \ \ | | | | | | | | Miscounting lines with markdown backtick section
| * | | Miscounting lines with markdown backtick sectionalbert-github2020-10-221-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have a program like: ``` # test ~~~ npm ~~~ \aa5 ~~~ npm ~~~ \aa8 ``` we get the warnings like: ``` .../aa.md:6: warning: Found unknown command '\aa5' .../aa.md:10: warning: Found unknown command '\aa8' ``` instead of: ``` .../aa.md:5: warning: Found unknown command '\aa5' .../aa.md:8: warning: Found unknown command '\aa8' ``` This has been corrected. Note: in the example tildes are used so the backticks show up in the github issue as well.
* | | Merge pull request #8122 from albert-github/feature/bug_warn_lexDimitri van Heesch2020-10-247-9/+9
|\ \ \ | | | | | | | | Remove warnings from lexers
| * | | Remove warnings from lexersalbert-github2020-10-207-9/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | Remove warnings (Windows 64 bit compilation) like: ``` warning C4267: '+=': conversion from 'size_t' to 'int', possible loss of data ``` from the different lexers by making use of more consistent data types.
* | | Merge pull request #8125 from albert-github/feature/bug_cnt_md_tableDimitri van Heesch2020-10-241-4/+4
|\ \ \ | | | | | | | | Miscounting lines with markdown table
| * | | Miscounting lines with markdown tablealbert-github2020-10-221-4/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have a program like: ``` # Test1 | \aa3 | | ---- | | \aa5 | \aa6 ``` we get the warnings like: ``` .../cc.md:3: warning: Found unknown command '\aa3' .../cc.md:4: warning: Found unknown command '\aa5' .../cc.md:6: warning: Found unknown command '\aa6' ``` instead of: ``` .../cc.md:4: warning: Found unknown command '\aa3' .../cc.md:5: warning: Found unknown command '\aa5' .../cc.md:6: warning: Found unknown command '\aa6' ``` The external counting was correct, not the internal counting. This has been corrected.
* | | Merge pull request #8126 from albert-github/feature/bug_cnt_md_blockquoteDimitri van Heesch2020-10-241-3/+3
|\ \ \ | |_|/ |/| | Miscounting lines with markdown blockquote
| * | Miscounting lines with markdown blockquotealbert-github2020-10-221-3/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have a program like: ``` # test \aa2 > \aa3 \aa4 ``` we get the warnings like: ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:4: warning: Found unknown command '\aa3' .../aa.md:6: warning: Found unknown command '\aa4' ``` instead of: ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:3: warning: Found unknown command '\aa3' .../aa.md:4: warning: Found unknown command '\aa4' ``` This has been corrected.
* | Use correct #includeDimitri van Heesch2020-10-231-1/+1
| |
* | Fixed regression for test 027 due to use of unordered mapDimitri van Heesch2020-10-231-1/+1
| |
* | Refactoring: Remove unused DefinitionIntf and DefinitionList classesDimitri van Heesch2020-10-236-58/+29
| |
* | Merge branch 'symbolmap'Dimitri van Heesch2020-10-238-304/+163
|\ \
| * | Refactoring: modernize Doxygen::symbolMapDimitri van Heesch2020-10-238-304/+163
| | |
* | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2020-10-231-3/+7
|\ \ \ | |/ / |/| / | |/
| * Merge pull request #8114 from albert-github/feature/bug_cnt_md_extra_lineDimitri van Heesch2020-10-201-3/+7
| |\ | | | | | | Miscounting in case of markdown wanted newline due to spaces at end of line
| | * Update markdown.cppDimitri van Heesch2020-10-201-1/+1
| | | | | | | | | Added size check
| | * When we have some simple markdown files like with extra spaces (after ↵albert-github2020-10-181-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `\aa2`, `\bb2` and `\ccs2` to give in markdown a newline): ``` First test: 2 extra spaces after first line with error no extra empty lines \aa2 \aa3 ``` and ``` First test: 2 extra spaces after first line with error one extra empty line \bb2 \bb4 ``` and ``` First test: 2 extra spaces after first line with error two extra empty lines \cc2 \cc5 ``` we get warnings like: ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:4: warning: Found unknown command '\aa3' .../bb.md:2: warning: Found unknown command '\bb2' .../bb.md:5: warning: Found unknown command '\bb4' .../cc.md:2: warning: Found unknown command '\cc2' .../cc.md:6: warning: Found unknown command '\cc5' ``` whilst this should be: ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:3: warning: Found unknown command '\aa3' .../bb.md:2: warning: Found unknown command '\bb2' .../bb.md:4: warning: Found unknown command '\bb4' .../cc.md:2: warning: Found unknown command '\cc2' .../cc.md:5: warning: Found unknown command '\cc5' ``` This has been corrected by placing the `<br>` straight after the extra spaces and by not adding an extra newline.
* | | Pass QCString by const referenceDimitri van Heesch2020-10-201-9/+9
|/ /
* | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2020-10-202-3/+6
|\ \
| * \ Merge pull request #8117 from albert-github/feature/bug_cnt_md_ref_imageDimitri van Heesch2020-10-201-1/+1
| |\ \ | | | | | | | | Miscounting of line in case of markdown `\ref` image
| | * | Miscounting of line in case of markdown `\ref` imagealbert-github2020-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case we have: ``` The page \aa2 Doxygen's Doxygen Documentation: <a href="https://codedocs.xyz/doxygen/doxygen/"><img src="https://codedocs.xyz/doxygen/doxygen.svg"/></a>\aa2 \aa3 \aa4 ![Caption text](@ref https://codedocs.xyz/doxygen/doxygen.svg) \aa4 \aa5 ![Caption text](@ref https://codedocs.xyz/doxygen/doxygen.svg) \aa9 ``` we get the warnings: ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:3: warning: Found unknown command '\aa3' .../aa.md:4: warning: Found unknown command '\aa4' .../aa.md:8: warning: Found unknown command '\aa4' .../aa.md:9: warning: Found unknown command '\aa5' .../aa.md:17: warning: Found unknown command '\aa9' ``` instead of the expected ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:3: warning: Found unknown command '\aa3' .../aa.md:4: warning: Found unknown command '\aa4' .../aa.md:4: warning: Found unknown command '\aa4' .../aa.md:5: warning: Found unknown command '\aa5' .../aa.md:9: warning: Found unknown command '\aa9' ``` this is due to the fact that the markdown convertor adds some extra line wit `\n` instead of an internal line break `\ilinebr`.
| * | | Merge pull request #8116 from albert-github/feature/bug_docu_hor_rulerDimitri van Heesch2020-10-201-1/+4
| |\ \ \ | | | | | | | | | | Incomplete documentation in respect to hyphens for horizontal rulers
| | * | | Incomplete documentation in respect to hyphens for horizontal rulersalbert-github2020-10-181-1/+4
| | | |/ | | |/| | | | | | | | | | | | | In case of a sequence of hyphens the documentation was incomplete. (found during implementation of "Miscounting in markdown in case of a horizontal ruler", #8115)
| * | | Merge pull request #8115 from albert-github/feature/bug_cnt_md_hor_rulerDimitri van Heesch2020-10-201-1/+1
| |\ \ \ | | | | | | | | | | Miscounting in markdown in case of a horizontal ruler.
| | * | | Miscounting in markdown in case of a horizontal ruler.albert-github2020-10-181-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When having code like: ``` A horizonal ruler by means of underscores \aa2 ____ \aa4 A horizonal ruler by means of hyphens \bb7 - --- \bb9 A horizonal ruler by means of asterisks \cc12 **** \cc14 ``` we get wanungs like: ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:5: warning: Found unknown command '\aa4' .../aa.md:8: warning: Found unknown command '\bb7' .../aa.md:11: warning: Found unknown command '\bb9' .../aa.md:14: warning: Found unknown command '\cc12' .../aa.md:17: warning: Found unknown command '\cc14' ``` instead of ``` .../aa.md:2: warning: Found unknown command '\aa2' .../aa.md:4: warning: Found unknown command '\aa4' .../aa.md:7: warning: Found unknown command '\bb7' .../aa.md:9: warning: Found unknown command '\bb9' .../aa.md:12: warning: Found unknown command '\cc12' .../aa.md:14: warning: Found unknown command '\cc14' ``` This has been fixed.
* | | | Merge branch 'cimeq-test/uml'Dimitri van Heesch2020-10-203-5/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Some tweaks & fixesDimitri van Heesch2020-10-202-28/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed DOT_MAX_FOLD to DOT_WRAP_THRESHOLD - Improved documentation - Applied DOT_WRAP_THRESHOLD to the whole string instead of individual parts.