summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ImgBot] Optimize imagesImgBotApp2018-12-0715-0/+0
| | | | | | | | | | | | | | | | | | | | *Total -- 536.41kb -> 410.38kb (23.5%) /doc/extsearch_flow.png -- 20.57kb -> 7.41kb (64%) /testing/sample.png -- 3.69kb -> 2.50kb (32.26%) /doc/doxywizard_main.png -- 55.86kb -> 38.51kb (31.07%) /doc/doxywizard_page1.png -- 38.72kb -> 29.24kb (24.47%) /doc/doxywizard_page4.png -- 42.69kb -> 32.57kb (23.72%) /doc/doxywizard_page3.png -- 49.71kb -> 37.95kb (23.66%) /doc/doxywizard_page2.png -- 38.13kb -> 29.21kb (23.41%) /addon/doxywizard/images/tunecolor.png -- 99.90kb -> 77.30kb (22.62%) /doc/doxywizard_menu.png -- 57.29kb -> 45.09kb (21.28%) /doc/doxywizard_expert.png -- 29.35kb -> 23.73kb (19.15%) /templates/html/mag_sel.png -- 0.55kb -> 0.45kb (17.41%) /templates/html/mag.png -- 0.51kb -> 0.44kb (14.31%) /doc/infoflow.png -- 98.24kb -> 84.89kb (13.59%) /templates/html/search_r.png -- 0.60kb -> 0.54kb (9.64%) /templates/html/search_l.png -- 0.59kb -> 0.55kb (6.13%)
* Merge branch 'albert-github-feature/issue_6657'Dimitri van Heesch2018-12-041-1/+1
|\
| * Further simplified the fixDimitri van Heesch2018-12-041-3/+2
| |
| * issue #6657 "QGDict::hashAsciiKey: Invalid null key" when using anonymous ↵albert-github2018-12-041-1/+2
|/ | | | | | union/struct Protect findAt against empty string.
* Fixed merge problemDimitri van Heesch2018-12-031-4/+3
|
* Merge pull request #6602 from albert-github/feature/bug_tparamDimitri van Heesch2018-12-034-15/+6
|\ | | | | Consistency in headings and layout for template parameters (tparam)
| * Consistency in headings and layout for template parameters (tparam)albert-github2018-11-064-15/+6
| | | | | | | | | | - at some places the translation of the "Template Parameters" was not yet done - layout of the template parameters table in HTML had no default. Should be analogous to the table for normal parameters
* | Merge pull request #6643 from albert-github/feature/bug_xhtml_test_30Dimitri van Heesch2018-12-0310-11/+60
|\ \ | | | | | | Incorrect number tag sequence for xhtml with htmlinclude command possible
| * | Incorrect number tag sequence for xhtml with htmlinclude command possiblealbert-github2018-11-2510-11/+60
| | | | | | | | | | | | | | | | | | Analogous to the `\htmlonly` also with the `\htmlinclude` command it is possible that some parts are added that cannot be inside a `<p> ... <\/p>` and thus we have to temporary close (and later reopen) the paragraph. The option `[block]` has been added to the `\htmlinclude` command (analogous to the `\htmlonly` command). Problem can be seen with the default doxygen test 30 (`[030_htmlinclude.dox]: test the \htmlinclude command`).
* | | Merge pull request #6656 from albert-github/feature/bug_xhtml_latexincludeDimitri van Heesch2018-12-031-0/+1
|\ \ \ | | | | | | | | Incorrect tag sequence for xhtml with latexinclude command possible
| * | | Incorrect tag sequence for xhtml with latexinclude command possiblealbert-github2018-12-031-0/+1
| | | | | | | | | | | | | | | | Analogous to DontInclude (test 21) the wrong xhtml tag sequence can also occur with `\latexinclude`
* | | | Merge pull request #6655 from albert-github/feature/bug_xhtml_test_27Dimitri van Heesch2018-12-034-31/+77
|\ \ \ \ | |/ / / |/| | | Incorrect tag sequence possible for images possible in case of xhtml
| * | | Incorrect tag sequence possible for images possible in case of xhtmlalbert-github2018-12-034-31/+77
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Message: `< Element map content does not follow the DTD, expecting ((p | h1 | h2 | h3 | h4 | h5 | h6 | div | ul | ol | dl | menu | dir | pre | hr | blockquote | address | center | noframes | isindex | fieldset | table | form | noscript | ins | del | script)+ | area+), got (area area div)` The problem first surfaced with test 11 (empty map tag), but the solution given at that moment (`<div/>)`) did work for test 11, but was not correct for test 27. Problem can be seen with the default doxygen test 27 (`[027_extends.c]: test the \extends, \implements, \memberof, \private, and \public commands`).
* | | Fixed incorrect XHTML output for test 021Dimitri van Heesch2018-12-021-28/+55
| | |
* | | Merge pull request #6516 from albert-github/feature/issue_6513_2Dimitri van Heesch2018-12-011-22/+9
|\ \ \ | | | | | | | | Does not generate TOC for markdown
| * | | Does not generate TOC for markdownalbert-github2018-09-161-22/+9
| | | | | | | | | | | | | | | | | | | | The markdown handling has been moved to a more logical place and as a consequence the section headers were added and thus checked twice but didn't show the TOC. Also setting up the table of contents level in a more standard way.
* | | | Merge pull request #6644 from albert-github/feature/bug_xmllint_xhtmlDimitri van Heesch2018-12-014-5/+5
|\ \ \ \ | | | | | | | | | | Warning running xmllint for xhtml
| * | | | Warning running xmllint for xhtmlalbert-github2018-11-264-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running xmllint in the error output the following message appears: `I/O error : Attempt to load network entity http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd` Going to the website we see that there an automatic redirect was done from `http` to `https`.
* | | | | Trying to get test 012 to work again with appveyorDimitri van Heesch2018-12-011-1/+3
| | | | |
* | | | | Merge pull request #6645 from albert-github/feature/bug_xhtml_test_11Dimitri van Heesch2018-12-013-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Incorrect tag sequence for xhtml with class diagram possible
| * | | | | Incorrect tag sequence for xhtml with class diagram possiblealbert-github2018-11-263-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case of a class diagram without mapping information the `map` tag is written without content. This is not allowed and results in xhtml (as reported by xmllint) in: `Element map content does not follow the DTD, expecting ((p | h1 | h2 | h3 | h4 | h5 | h6 | div | ul | ol | dl | menu | dir | pre | hr | blockquote | address | center | noframes | isindex | fieldset | table | form | noscript | ins | del | script)+ | area+), got ()` By adding a dummy 'paragraph' `<div/>` this can be overcome, The closing tag for `map` has been placed on a bit a more logical place, showing the open and close tag together. Problem can be seen with the default doxygen test 11 (`[011_category.m]: test the \interface and \category command`).
* | | | | Merge pull request #6648 from albert-github/feature/bug_registerDimitri van Heesch2018-12-0112-75/+75
|\ \ \ \ \ | | | | | | | | | | | | Keyword register (in code) is deprecated since C++11
| * | | | | Keyword register (in code) is deprecated since C++11albert-github2018-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The keyword `register` is deprecated since C++11 but the Darwin platform gave some warnings (on generated_src/doxywizard/config_doxyw.cpp) so reintroduced here -Wno-deprecated-register. Message like: /Users/travis/build/doxygen/doxygen/build/generated_src/doxywizard/config_doxyw.cpp:1008:2: warning: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register] register yy_state_type yy_current_state; ^~~~~~~~~ total of 15 times.
| * | | | | Keyword register (in code) is deprecated since C++11albert-github2018-11-2713-77/+77
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | The keyword `register` is deprecated since C++11: - for the Darwin platform it was already filtered (-Wno-deprecated-register) - CLan emits: 'register' storage class specifier is deprecated and incompatible with C++17 [-Wdeprecated-register]
* | | | | Disabled Appveyor documentation build due to unreliability of MikTeX downloadDimitri van Heesch2018-11-261-8/+11
| | | | |
* | | | | Merge pull request #6634 from albert-github/feature/issue_6631Dimitri van Heesch2018-11-261-5/+0
|\ \ \ \ \ | |/ / / / |/| | | | Issue #6631 Code blocks incorrectly formatted in Latex
| * | | | Issue #6631 Code blocks incorrectly formatted in Latexalbert-github2018-11-211-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The line wrapping is automatically done in the DoxyCodeLine environment, so no need for extra spaces etc. (The m_col is still required for resolving tab positions)
* | | | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2018-11-251-5/+5
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #6642 from albert-github/feature/bug_docbook_imageDimitri van Heesch2018-11-251-5/+5
| |\ \ \ \ | | | | | | | | | | | | Improvement regarding width and title for docbook
| | * | | | Improvement regarding width and title for docbookalbert-github2018-11-251-5/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | - In case no with and no height is given don't scale automatically to `width=50%` - in case of inline image and a title don't display title.
* | | | | Merge branch 'albert-github-feature/bug_xhtml_test_31'Dimitri van Heesch2018-11-254-41/+59
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Restructured code to avoid the need for global stateDimitri van Heesch2018-11-254-44/+60
| | | | |
| * | | | Merge branch 'feature/bug_xhtml_test_31' of ↵Dimitri van Heesch2018-11-251-2/+4
| |\ \ \ \ |/ / / / / | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_xhtml_test_31
| * | | | Incorrect number of start / end paragraph tags for xhtml with image commandalbert-github2018-11-241-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | In case of `\image` a force closed paragraph is not always force opened again. Problem can be seen with the default doxygen test 31 (`[031_image.dox]: test the \image command`).
* | | | | Merge branch 'albert-github-feature/bug_docbook_figure'Dimitri van Heesch2018-11-243-39/+64
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Refactored code a bit (use const references and made global functions members)Dimitri van Heesch2018-11-243-33/+48
| | | | |
| * | | | Merge branch 'feature/bug_docbook_figure' of ↵Dimitri van Heesch2018-11-243-32/+42
| |\ \ \ \ |/ / / / / | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_docbook_figure
| * | | | Doxygen creates empty image titles for Docbook outputalbert-github2018-11-233-32/+42
| |/ / / | | | | | | | | | | | | | | | | | | | | The title of an image needs to be at a specific place in docbook. The current place was incorrect (based on https://stackoverflow.com/questions/53448764/doxygen-creates-empty-image-titles-for-docbook-output)
* | | | Merge branch 'albert-github-feature/issue_6632'Dimitri van Heesch2018-11-241-1/+1
|\ \ \ \
| * | | | Fixed differently by changing root cause for introducing the spaceDimitri van Heesch2018-11-243-13/+5
| | | | |
| * | | | Merge branch 'feature/issue_6632' of ↵Dimitri van Heesch2018-11-242-4/+12
| |\ \ \ \ |/ / / / / | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/issue_6632
| * | | | issue #6632 References to Objective C protocols by name broken in 1.8.12albert-github2018-11-232-4/+12
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue is the change in the spacing for protocols. In 1.8.11 the option `-r functions` gave (a.o): `member callbackMethod of class MyProtocol-p` In 1.8.12 the result is: `member callbackMethod of class MyProtocol -p` (Note the extra space).
* | | | Merge branch 'albert-github-feature/bug_emoji_objc'Dimitri van Heesch2018-11-241-3/+12
|\ \ \ \
| * | | | Refactored code a bitDimitri van Heesch2018-11-241-20/+10
| | | | |
| * | | | Merge branch 'feature/bug_emoji_objc' of ↵Dimitri van Heesch2018-11-241-1/+20
| |\ \ \ \ |/ / / / / | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_emoji_objc
| * | | | Reference text in reference list seen as emojialbert-github2018-11-231-1/+20
| |/ / / | | | | | | | | | | | | | | | | In Objective-C the separator for classes / protocols / functions is a single colon `:` resulting in recognizing it as an non existing emoji. Note that this can only happen with generated names, in e.g. a page name an emoji can be used.
* | | | Merge pull request #6640 from albert-github/feature/bug_xhtml_test_20Dimitri van Heesch2018-11-242-16/+21
|\ \ \ \ | | | | | | | | | | Incorrect number of start / end paragraph tags for xhtml with htmlonly
| * | | | Incorrect number of start / end paragraph tags for xhtml with htmlonlyalbert-github2018-11-242-16/+21
| |/ / / | | | | | | | | | | | | | | | | In case of `\htmlonly[block]` the a force closed paragraph is not always force opened again. Problem can be seen with the default doxygen test 20 (`[020_only.dox]: test the \*only and \*endonly commands`).
* | | | Merge pull request #6639 from albert-github/feature/bug_indexDimitri van Heesch2018-11-241-1/+0
|\ \ \ \ | |/ / / |/| | | Unbalanced start of lists resulting in not creatable pdf of rtf document
| * | | Unbalanced start of lists resulting in not creatable pdf of rtf documentalbert-github2018-11-241-1/+0
|/ / / | | | | | | | | | | | | Line was removed but #6415 but apparently reintroduced by a later issue. The problem shows with a number of the standard doxygen tests when enabling either e.g `--rtf` or `--latex`