summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6650 from albert-github/feature/bug_774118Dimitri van Heesch2018-12-091-0/+17
|\ | | | | Bug 774118 - EXTERNAL_GROUPS lose hierarchy
| * Bug 774118 - EXTERNAL_GROUPS lose hierarchyalbert-github2018-11-281-0/+17
| | | | | | | | Created relations between groups as specified in the tag file
* | Merge pull request #6662 from Croydon/croydon/ci3-9-prDimitri van Heesch2018-12-092-5/+9
|\ \ | | | | | | CI: Updates to Qt and Winflexbison
| * | Travis: Remove manual winflexbison installationCroydon2018-12-091-3/+1
| | | | | | | | | | | | Should have happened in the "AppVeyor: Install winflexbison via Conan" commit ealierer.
| * | Travis: Fix line breaks in conanfile.txt creationCroydon2018-12-091-2/+2
| | |
| * | AppVeyor: Remove Bincrafters remoteCroydon2018-12-091-1/+0
| | | | | | | | | | | | Not neccessary anymore as Winflexbison is now in conan-center
| * | Travis macOS: Update qt to 5.11.3Croydon2018-12-091-1/+1
| | |
| * | AppVeyor: Update winflexbison to 2.5.16Croydon2018-12-091-2/+2
| | |
| * | Make conanfile creation more readableCroydon2018-12-091-1/+3
| | |
| * | AppVeyor: Install winflexbison via ConanCroydon2018-12-091-1/+6
|/ /
* | Merge pull request #6668 from albert-github/feature/bug_examplesDimitri van Heesch2018-12-086-20/+12
|\ \ | | | | | | Correcting tag example and uniform calling all examples
| * | Correcting tag example and uniform calling all examplesalbert-github2018-12-076-20/+12
| | | | | | | | | | | | | | | | | | - tag example corrected in respect to changed definition (a while ago) regarding the name of the Example example - regenerating tag file (based on current doxygen version) - made building of all examples uniform
* | | Merge pull request #6660 from albert-github/feature/bug_vhdl_codeDimitri van Heesch2018-12-081-1/+1
|\ \ \ | | | | | | | | Wrong counting of lines during VHDL code output
| * | | Wrong counting of lines during VHDL code outputalbert-github2018-12-051-1/+1
| |/ / | | | | | | | | | | | | | | | The code coloring of the output stops at an early stage, resulting in incorrect HTML / LaTeX / ... output, due to a double counting of the lines in case of `STRIP_CODE_COMMENTS=NO`. Problem is visible when looking at the documentation of the VHDL documentation block in the manual for VHDL code in e.g. HTML and LaTex (Note problem occurs in the 1.8.15 master, not in the 1.8.14 version).
* | | Merge pull request #6670 from albert-github/feature/bug_xhtml_table_attributesDimitri van Heesch2018-12-081-0/+6
|\ \ \ | | | | | | | | XHTML incorrect attribute values for align and valign
| * | | XHTML incorrect attribute values for align and valignalbert-github2018-12-081-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | The attribute values of the `align` and `valign` attribute have to be in lowercase and the `valign` attribute value `center` does not exist but has to be `middle`. Most browsers do accept the 'incorrect' values but it is better to have the right values present. (Found by means of the CGAL/cgal repository)
* | | | Merge pull request #6669 from ↵Dimitri van Heesch2018-12-081-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | albert-github/feature/bug_xhtml_maparea_node_numbers XHTML problem with multiple use of node numbers in id attribute
| * | | | XHTML problem with multiple use of node numbers in id attributealbert-github2018-12-071-1/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running xhtml checker on the doxygen diagram example we get: diagrams/html/class_a.html:66: element area: validity error : ID node1 already defined <area shape="rect" id="node1" title=" " alt="" coords="5,5,44,32"/> ^ ID node1 already defined Document diagrams/html/class_a.html does not validate This is due to the fact that the map file is used as generated by dot, and here the id values start each time with node1. The id is not used and can be omitted.
* | | | Merge pull request #6667 from coliff/patch-1Dimitri van Heesch2018-12-081-4/+4
|\ \ \ \ | | | | | | | | | | Fix HTTPS links
| * | | | Fix HTTPS linksChristian Oliff2018-12-071-4/+4
| |/ / /
* | | | Merge pull request #6663 from albert-github/feature/bug_xhtml_class_tableDimitri van Heesch2018-12-081-4/+5
|\ \ \ \ | | | | | | | | | | XHTML problem with class index table
| * | | | XHTML problem with class index tablealbert-github2018-12-061-4/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When running xhtml checker on the doxygen diagram example we get: Element tr content does not follow the DTD, expecting (th | td)+, got Document diagrams/xhtml/classes.xhtml does not validate This is due to an empty `<tr></tr>`, adding the appropriate column definitions solves the problem.
* | | | Merge pull request #6661 from albert-github/feature/bug_xhtml_doxygen_docuDimitri van Heesch2018-12-086-333/+328
|\ \ \ \ | |_|/ / |/| | | Doxygen manual is not XHTML compliant
| * | | Doxygen manual is not XHTML compliantalbert-github2018-12-056-333/+328
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The doxygen manual is not XHTML compliant. In this, first, fix : - fixes the problems in the doc files (note that docblocks has a small extra problem, pull request for this is #6660) - determine output directory for HTML based on the doxyfile (for images). Note: Remaining problems with examples and old change log files (version 1.5 and earlier)
* | | Fix potential hangup when merging scopesDimitri van Heesch2018-12-071-1/+1
|/ /
* | 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