summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fix test to support new programlisting attributeShi Yan2017-09-261-2/+2
| | | | | fix unit test to support the new programlisting attribute "language"
* update compound.xsd to add language attributeShi Yan2017-09-041-0/+1
| | | | | | | add language attribute (optional) to listingType Changes to be committed: modified: templates/xml/compound.xsd
* Use language in stead of lang for language name attributeShi Yan2017-08-221-1/+1
|
* Add language type attribute to programlisting tagShi Yan2017-08-221-1/+1
| | | | | | | | | | | | | | The current programlisting tag doesn't have any attribute to indicate the code's language. This makes code highlighting customization difficult. For example, the current doxygen generated document doesn't hightlight javascript code block. If one wants to customize the code block by parsing the xml files and uses 3rd party syntax highlighter, there is no way to tell from the xml file what language the code snippet is using. This change introduces an attribute "lang" to the programlisting tag.
* Merge pull request #586 from zachwick/librejs_fixesDimitri van Heesch2017-08-2118-478/+1126
|\ | | | | Marks JS as freely licensed
| * Merge branch 'master' into librejs_fixesDimitri van Heesch2017-08-2118-115/+269
| |\ | |/ |/|
* | Merge pull request #582 from artur-kink/masterDimitri van Heesch2017-08-211-1/+6
|\ \ | | | | | | Fixup man page NAME section when page has title
| * | Fixup man page NAME section when page has titleArtur Kink2017-07-191-1/+6
| | |
* | | Merge pull request #581 from jannick0/masterDimitri van Heesch2017-08-211-1/+1
|\ \ \ | | | | | | | | [preprocessing.doc] typo amended
| * | | [preprocessing.doc] typo amendedjannick02017-07-151-1/+1
| |/ / | | | | | | The preprocessor should read as amended.
* | | Merge pull request #576 from analizo/doxyparseDimitri van Heesch2017-08-216-30/+116
|\ \ \ | | | | | | | | add the number of conditionals path and bugfix
| * | | add the number of conditionals path and bugfixJoenio Costa2017-06-286-30/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rebased with upstream master * Added build instructions to README * Bug 398942 - fixes the problem with instance variables and arguments with the same name Signed-off-by: Antonio Terceiro <terceiro@softwarelivre.org> Signed-off-by: João M. Miranda <joaomm88@gmail.com> Signed-off-by: Paulo Meirelles <paulo@softwarelivre.org> Signed-off-by: Vinicius Daros <vkdaros@mercurio.eclipse.ime.usp.br> Signed-off-by: Jonathan Moraes <arkyebr@gmail.com>
* | | | Merge pull request #570 from grw1983/masterDimitri van Heesch2017-08-211-2/+2
|\ \ \ \ | | | | | | | | | | Fix whitespace handling in vhdldocgen.cpp when generating a flowchart
| * | | | Doxygen/VHDLdocgen:Guenther R. Wenninger2017-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Fix whitespace handling in vhdldocgen.cpp when generating a flowchart.
* | | | | Merge pull request #574 from brgl/fix_buildroot_buildDimitri van Heesch2017-08-212-6/+6
|\ \ \ \ \ | | | | | | | | | | | | build: fix the way lang_cfg.h is generated
| * | | | | build: fix the way lang_cfg.h is generatedBartosz Golaszewski2017-06-212-6/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This header is generated by running cmake/lang_cfg.cmake and redirecting its stderr. If any warning is emitted by this script, it ends up in the generated header and breaks the build. To avoid such problems: pass the path to the header as an argument to the cmake script and use the cmake 'file' command instead of 'message'. We can't even use message(STATUS...) as - although it prints to stdout as opposed to other types of messages - it prepends all output with a double hyphen.
* | | | | Merge pull request #571 from albert-github/feature/bug_652086Dimitri van Heesch2017-08-211-13/+57
|\ \ \ \ \ | | | | | | | | | | | | Bug 652086 - does ALIAS work for VHDL code?
| * | | | | Bug 652086 - does ALIAS work for VHDL code?albert-github2017-06-041-13/+57
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Terminating of the VHDL comment was not found as a result of the test against python. Added handling of end of python '#' comment and VHDL '--!' comment
* | | | | Merge pull request #568 from kossebau/makeNavEntriesNamespacesAndFilesLinkedDimitri van Heesch2017-08-211-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Add links behind nav entries "Namespaces" and "Files" (matching "Classes")
| * | | | | Add links behind nav entries "Namespaces" and "Files" (matching "Classes")Friedrich W. H. Kossebau2017-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When layout file has "namespacelist" resp. "filelist" set to visible=no, the files "namespaces.html" resp. "files.html" are still generated, but not reachable. So same fix as done for "classlist" should be used, cmp. 700a9ac3c177fdef25b9b00ed6bb5e0ea963d236 Also gives consistent result & at least in QCH files fix the error message shown when clicking on "Namespaces" or "Files" section titles.
| * | | | | Fetch filename property from object instead of hardcoded duplicated stringFriedrich W. H. Kossebau2017-06-131-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-08-206-15/+15
|\ \ \ \ \
* \ \ \ \ \ Merge branch 'dvj-master'Dimitri van Heesch2017-08-206-59/+78
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fixes for cross platform build with new LLVM/CLANG versionDimitri van Heesch2017-08-204-61/+15
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/dvj/doxygen into dvj-masterDimitri van Heesch2017-07-084-3/+68
| |\ \ \ \ \ |/ / / / / /
| * | | | | fix spellingDoug Johnston2017-05-311-1/+1
| | | | | |
| * | | | | make use of clang compilation databaseDoug Johnston2017-04-064-3/+68
| | | | | | | | | | | | | | | | | | | | | | | | See: https://clang.llvm.org/docs/JSONCompilationDatabase.html
| | | | | * Marks JS as freely licensedzachwick2017-08-0418-481/+1129
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Marking the resulting JS in this way ensures that visitors to the resulting HTML documentation do not have to choose between running non-free JS and experiencing the HTML documentation as it was intended. The JS was already freely licensed, so this change just ensures that the appropriate labelling occurs so that GNU LibreJS [0] parses the JS correctly as freely licensed. [0] https://www.gnu.org/software/librejs/ Signed-off-by: zachwick <zach@zachwick.com>
| | * | | Merge pull request #585 from luzpaz/doxy-typosDimitri van Heesch2017-08-025-14/+14
| | |\ \ \ | | | | | | | | | | | | Misc. doxy and comment typos
| | | * | | Misc. doxy and comment typosluzpaz2017-08-025-14/+14
| | |/ / /
| | * | | Merge pull request #584 from deece/fix-man-enumDimitri van Heesch2017-07-271-1/+1
| | |\ \ \ | |/ / / / |/| | | | Call endMemberItem consistently.
| | * | | Call endMemberItem consistently.Alastair D'Silva2017-07-251-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When generating man pages, enums erroneously output their description on the same line as the definition, with a trailing '"'. This is due to endMemberItem being called after the member description is emitted, rather than before, as it is elsewhere. This patch moves the call to the same place where it is called elsewhere. Bad output: enum foo { FOO = 0 } Description. " Good output: enum foo { FOO = 0 } Description. Signed-off-by: Alastair D'Silva <alastair@d-silva.org>
* | | | Merge pull request #579 from AdrianDC/mingwDimitri van Heesch2017-07-081-5/+7
|\ \ \ \ | | | | | | | | | | CMakeLists: Avoid MSVC iconv changes for MinGW builds
| * | | | CMakeLists: Avoid MSVC iconv changes for MinGW buildsAdrian DC2017-07-071-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibad47399f87511f6d8ef7c2238c932377777a333 Signed-off-by: Adrian DC <radian.dc@gmail.com>
* | | | | Merge pull request #580 from AdrianDC/dot-loopDimitri van Heesch2017-07-081-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | dot.cpp: Fix DotGfxHierarchyTable first class node loop
| * | | | dot.cpp: Fix DotGfxHierarchyTable first class node loopAdrian DC2017-07-071-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Upon 'inherits' diagram creation, the first element (alphabetically last parent name) would use a default node number 0, equal to the child element, and would result in a class looping on itself as parent * A simple test to confirm the issue can be done with the following lines in a test.h inside an empty project: // Test first class node loop class aChildClass : public zParentClass { }; class bChildClass : public yParentClass { }; Change-Id: I7901e5e13d9564747d112e0b8c758d239d43a380 Signed-off-by: Adrian DC <radian.dc@gmail.com>
* | | | Merge pull request #578 from cosmichound/patch-1Dimitri van Heesch2017-07-011-2/+2
|\ \ \ \ | |_|/ / |/| | | Documentation, correct referenced file
| * | | Documentation, correct referenced filecosmichound2017-06-301-2/+2
|/ / /
* | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-06-1216-63/+130
|\ \ \
| * \ \ Merge pull request #572 from albert-github/feature/html_links_docuDimitri van Heesch2017-06-0413-63/+63
| |\ \ \ | | |_|/ | |/| | Correction of non reachable links and redirected links in documentation.
| | * | Correction of non reachable links and redirected links in documentation.albert-github2017-06-0413-63/+63
| |/ / | | | | | | | | | | | | The W3C link checker reported a number of problems regarding non reachable links and permanent redirects. Most of these problems have been fixed with this patch
| * | Merge pull request #567 from wiertel/masterDimitri van Heesch2017-05-213-0/+67
| |\ \ | | | | | | | | Fix C# property initializer parsing
| | * | Fix C# property initializer parsingPiotr Szydełko2017-05-203-0/+67
| |/ / | | | | | | | | | | | | | | | int Property {get; set;} = 23; The parser was ending the property at the closing bracket, which resulted in the initializer being assigned to the following property.
* | | Avoid generating unused dir_* output files for non HTML output formatsDimitri van Heesch2017-06-121-0/+6
|/ /
* | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-05-1624-789/+761
|\ \
| * \ Merge pull request #566 from olagrottvik/bugfixDimitri van Heesch2017-05-1116-778/+743
| |\ \ | | | | | | | | fixes vhdl literal bug
| | * | add decimal to base identifierogre2017-05-102-3/+3
| | | |
| | * | fixes vhdl literal bugogre2017-05-0916-775/+740
| | | |
| * | | Merge pull request #564 from 3nids/masterDimitri van Heesch2017-05-111-1/+1
| |\ \ \ | | |/ / | |/| | fix typo
| | * | fix typoDenis Rouzaud2017-04-281-1/+1
| | |/