summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6679 from coliff/masterDimitri van Heesch2018-12-1415-0/+0
|\ | | | | Losslessly optimize images
| * Merge pull request #1 from coliff/imgbotChristian Oliff2018-12-1415-0/+0
| |\ | | | | | | [ImgBot] Optimize images
| | * [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 pull request #6680 from albert-github/feature/bug_793076Dimitri van Heesch2018-12-142-1/+7
|\ \ | | | | | | Bug 793076 - Segmentation fault when generating graphical class hierarchy
| * | Bug 793076 - Segmentation fault when generating graphical class hierarchyalbert-github2018-12-142-1/+7
| | | | | | | | | | | | Prevent endless loop during renumbering
* | | Merge pull request #6681 from albert-github/feature/bug_xhtml_dtdDimitri van Heesch2018-12-141-0/+19
|\ \ \ | |/ / |/| | Adjustment of xhtml1-transitional.dtd
| * | Adjustment of xhtml1-transitional.dtdalbert-github2018-12-141-0/+19
|/ / | | | | | | | | | | | | Adding attributes: - async - doxygen to be able to validate doxygen generated xhtml documents
* | Merge pull request #6624 from albert-github/feature/bug_rtf_listsDimitri van Heesch2018-12-134-252/+142
|\ \ | | | | | | RTF lists more levels and removing extra paragraphs
| * | RTF lists more levels and removing extra paragraphsalbert-github2018-11-184-252/+142
| | | | | | | | | | | | | | | - In a RTF list after the last indent a number of extra paragraphs were displayed (with e.g. bullets), these extra paragraphs are removed - Increased the number of levels conform the changes for latex (#6622)
* | | Merge pull request #6675 from albert-github/feature/bug_xhtml_svg_imageDimitri van Heesch2018-12-131-13/+3
|\ \ \ | | | | | | | | Tag sequence incorrect for svg image (XHTML)
| * | | Tag sequence incorrect for svg image (XHTML)albert-github2018-12-111-13/+3
| | | | | | | | | | | | | | | | svg images should also follow the rules a for other type images regarding div tag and paragraph tags
* | | | Merge pull request #6674 from albert-github/feature/bug_empty_memberlist_tableDimitri van Heesch2018-12-131-2/+12
|\ \ \ \ | |/ / / |/| | | Prevent empty member list table (XHTML)
| * | | Prevent empty member list table (XHTML)albert-github2018-12-111-2/+12
|/ / / | | | | | | | | | The table tag should only be written in case a table has at least one row, otherwise a non valid table is generated (XHTML)
* | | Merge pull request #6671 from ↵Dimitri van Heesch2018-12-102-2/+2
|\ \ \ | | | | | | | | | | | | | | | | albert-github/feature/bug_xhtml_vhdl_use_clauses_name_2 XHTML problem with name attribute with VHDL name attribute
| * | | XHTML problem with name attribute with VHDL name attributealbert-github2018-12-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running xhtml checker on the doxygen diagram example we get: Syntax of value for attribute name of a is not valid Document mux/xhtml/classmux__using__with.xhtml does not validate This is due to a space in the name tag, substituting the appropriate code solves the problem. As this is a VHDL specific problem only these strings are converted.
* | | | Merge pull request #6672 from albert-github/feature/bug_starting_extensionsDimitri van Heesch2018-12-101-32/+26
|\ \ \ \ | |/ / / |/| | | Update parsing extension table in documentation
| * | | Update parsing extension table in documentationalbert-github2018-12-101-32/+26
|/ / / | | | | | | | | | | | | The text underneath the table in the documentation regarding the use of extensions was not correct. Also added the C / C++ category and made the table a bit better readable.
* | | 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`).