summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Provide page brief in <briefdescription> of XML output.Vladimír Vondruš2017-11-2543-0/+89
| | | | | | | | | | | Until now the brief description of pages was prepended to the <detaileddescription> element and the <briefdescription> element was not present at all, which meant there was no easy way to extract the brief description for purposes of creating a page index, for example. With this patch, the brief description is included in both <briefdescription> and <detaileddescription>, thus duplicated, to avoid backwards compatibility issues.
* Merge pull request #621 from mosra/xml-programlisting-filenameDimitri van Heesch2017-11-1912-15/+35
|\ | | | | Propagate language information to all <programlisting> XML elements
| * Propagate language information to all <programlisting> XML elements.Vladimír Vondruš2017-11-1910-13/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on work done in 141dbfd5a4f79c98da14a1b414c6db4e1b34618b through ed9acb6e1bb81a2eec334180f7b8c1bf0598b444 and makes a few behavioral changes to it. There's a new attribute called `filename` and the `language` was removed, because it could provide misleading information. This allows for more flexibility on the user side. In particular: * For historical reasons, `*.txt` files are marked by Doxygen as C++ (see https://bugzilla.gnome.org/show_bug.cgi?id=760836 for details). In particular, code snippet included from a CMakeLists.txt file would be marked and highlighted as C++. So in this case, the language attribute would be very misleading. * Doxygen is aware only of a very small subset of languages and thus a lot of information can be lost when relying on its extension-to-language-name conversion -- in particular, all extensions that are not recognized are assumed to be C++. On the other hand, putting more effort into its language detection algorithms is not worth the time, as there will always be new languages that fail to detect. So let's leave that on the user of the XML output instead. * Using just file extension is not enough, it has to be a full filename. For example, `*.txt` can be either a plain text file or a `CMakeLists.txt`. * The path is not stripped from the filename, as it also may contain additional information that helps to detect the language better. In addition to that, filenames of code snippets included via the \include command and related are propagated to the <programlisting> element as well. With this change, (1) code snippets using simply \code some code \endcode will not produce any `filename` attribute and it's up to the user what to do -- assume C++, detect language from contents or not highlight anything. <programlisting> some code </programlisting> (2) Code snippets using \code{.cmake} some code \endcode will produce the following: <programlisting filename=".cmake"> some code </programlisting> (3) And finally, \include, \dontinclude and related \skip, \skipline etc. commands \include path/to/some-file.py will produce <programlisting filename="path/to/some-file.py"> some code </programlisting> The tests were updated to check all three cases. On the user side, when using Pygments for example, it's then just a matter of calling pygments.lexers.find_lexer_class_for_filename() with value of the `filename` attribute value and optionally also the code snippet for additional language analysis.
| * Pass strings as const references.Vladimír Vondruš2017-11-192-2/+2
| | | | | | | | It has refcounting, copy-on-write and all, but this is still better.
* | Merge pull request #620 from albert-github/feature/bug_ftn_code_commaDimitri van Heesch2017-11-191-8/+8
|\ \ | | | | | | Code color of , (comma) together with only in use statement
| * | Code color of , (comma) together with only in use statementalbert-github2017-11-181-8/+8
| |/ | | | | | | The comma was colored as part of the word only (keywordtype), this should not be the case.
* | Fix for regression in XML output generation after fixing bug 789168Dimitri van Heesch2017-11-191-1/+1
|/
* Bug 787952 - Problem parsing c++ gnu::visibilityDimitri van Heesch2017-11-091-1/+1
|
* Bug 789007 - Error in markdown emphasis examplesDimitri van Heesch2017-11-041-7/+7
|
* Merge pull request #618 from groleo/sqlite3-fixesDimitri van Heesch2017-10-311-132/+182
|\ | | | | Sqlite3 fixes
| * sqlite3gen: start checking operations statusAdrian Negreanu2017-10-251-112/+139
| | | | | | | | | | | | | | | | check return value and in case of failures, print the errmsg. to print the errmsg, the sqlite3* db is needed along with the prepared statement, so add a db member to SqlStmt. Signed-off-by: Adrian Negreanu <groleo@gmail.com>
| * sqlite3gen: add missing protectedsettable columnAdrian Negreanu2017-10-251-1/+1
| | | | | | | | Signed-off-by: Adrian Negreanu <groleo@gmail.com>
| * sqlite3gen: add index on paramsAdrian Negreanu2017-10-251-1/+11
| |
| * sqlite3gen: use sqlite3_exec for schema setupAdrian Negreanu2017-10-251-10/+3
| | | | | | | | | | | | | | executing the multiple statements in the schema, we also get the indeces created. Signed-off-by: Adrian Negreanu <groleo@gmail.com>
| * sqlite3gen: add openDbConnectionAdrian Negreanu2017-10-251-8/+28
| |
* | Bug 789168 - Increasing access of inherited C++ members with 'using...' is ↵Dimitri van Heesch2017-10-291-5/+4
| | | | | | | | not recognized by Doxygen
* | Restore 'make tests' ruleDimitri van Heesch2017-10-282-1/+6
| |
* | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-10-284-4/+4
|\ \
| * \ Merge pull request #619 from samtygier/update-mathjaxDimitri van Heesch2017-10-284-4/+4
| |\ \ | | |/ | |/| Update mathjax
| | * Async load of mathjax javascriptSam Tygier2017-10-251-1/+1
| | | | | | | | | | | | Use async keyword to prevent page load waiting.
| | * Update mathjax pathSam Tygier2017-10-253-3/+3
| |/ | | | | | | | | | | | | Set the default MATHJAX_RELPATH to the current recommended value: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/ (See https://www.mathjax.org/cdn-shutting-down/ )
* | Restore Makefile in vhdlparser dirDimitri van Heesch2017-10-281-397/+22
|/
* Merge pull request #617 from wich/plantuml-dot-pathDimitri van Heesch2017-10-241-0/+7
|\ | | | | Provide dot path to plantuml
| * Provide dot path to plantumlRemko van der Vossen2017-10-231-0/+7
| | | | | | | | If HAVE_DOT = YES and DOT_PATH is configured, pass the path to the dot executable to plantuml with the -graphvizdot option.
* | Merge pull request #142 from randomguy3/line-breaksDimitri van Heesch2017-10-241-0/+14
|\ \ | |/ |/| Implement "double-space line breaks" syntax in Markdown
| * Implement "double-space line breaks" syntax in MarkdownAlex Merry2014-03-181-0/+14
| | | | | | | | | | Ending a line with two spaces is supposed to create a line break in Markdown. This implements that syntax.
* | Merge pull request #615 from DerDakon/cmake-cleanupDimitri van Heesch2017-10-2111-74/+53
|\ \ | | | | | | clean up CMake code
| * | CMake: use GNUInstallDirs module for man pages directoryRolf Eike Beer2017-10-201-1/+2
| | |
| * | CMake: avoid if() around the whole contents of documentation CMakeLists.txtRolf Eike Beer2017-10-203-10/+5
| | |
| * | CMake: use add_test to create a testRolf Eike Beer2017-10-202-5/+3
| | | | | | | | | | | | | | | This checks the calling from "make tests" to "make test", but lets CMake handle all the rest.
| * | CMake: let CMake handle the C++ standard setting if ↵Rolf Eike Beer2017-10-201-2/+3
| | | | | | | | | | | | | | | | | | | | | target_compile_features() is used This raises the required CMake version for this branch to get a better error message. target_compile_features() was introduced in CMake 3.1.
| * | CMake: remove unused program searchingRolf Eike Beer2017-10-201-3/+0
| | |
| * | CMake: avoid if() around the whole contents of plugin CMakeLists.txtRolf Eike Beer2017-10-206-21/+18
| | | | | | | | | | | | Just don't call add_subdirectory() if the build flag is not set.
| * | CMake: search for Qt5 only in config file modeRolf Eike Beer2017-10-201-1/+1
| | |
| * | CMake: remove CUSTOM_(LINK|INCLUDE)_DIRRolf Eike Beer2017-10-201-10/+0
| | | | | | | | | | | | | | | | | | | | | When some header or library is not found introduce a proper find_* call for it and use the results. Especially injecting additional link directories would just confuse the automatic library ordering done by CMake and is basically never the right solution for any link problem.
| * | CMake: let file(MAKE_DIRECTORY) create all directories at onceRolf Eike Beer2017-10-202-5/+5
| | |
| * | CMake: remove needless variable expansionsRolf Eike Beer2017-10-203-18/+18
|/ /
* | Merge pull request #609 from msc-/masterDimitri van Heesch2017-10-151-2/+5
|\ \ | | | | | | Fix https://bugzilla.gnome.org/show_bug.cgi?id=782583.
| * | Fix https://bugzilla.gnome.org/show_bug.cgi?id=782583.msc-2017-10-131-2/+5
| | | | | | | | | | | | Don't write both page name and title to NAME section of man page, if they are the same.
* | | Merge pull request #610 from aqualogy/translator_deDimitri van Heesch2017-10-151-21/+48
|\ \ \ | | | | | | | | Updated translator_de.h to doxygen 1.8.13
| * | | Updated translator_de.h to doxygen 1.8.13Arnd Weber2017-10-131-21/+48
| |/ /
* | | Fix minor markup issue in the documentation.Dimitri van Heesch2017-10-151-1/+1
|/ /
* | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-10-101-1/+2
|\ \
| * \ Merge pull request #608 from albert-github/feature/bug_557094Dimitri van Heesch2017-10-011-1/+2
| |\ \ | | | | | | | | Bug 557094 - Wrong spacing in function names with french language (latex output)
| | * | Bug 557094 - Wrong spacing in function names with french language (latex output)albert-github2017-10-011-1/+2
| |/ / | | | | | | | | | Removed superfluous space in case of French as output language
* | | Correction display of backtick in LaTeXDimitri van Heesch2017-10-102-12/+11
|/ /
* | Merge pull request #607 from albert-github/feature/regression_cmake_lang_cfgDimitri van Heesch2017-09-301-2/+2
|\ \ | | | | | | build: fix the way lang_cfg.h is generated (regression to #574)
| * | build: fix the way lang_cfg.h is generated (regression to #574)albert-github2017-09-301-2/+2
|/ / | | | | | | | | All language defines were written onto one line and thus only the first language (normally AM, Armenian, would be active. Added \n as MESSAGE apparently automatically added it and APPEND doesn't.
* | Merge branch 'shi-yan-master'Dimitri van Heesch2017-09-283-3/+4
|\ \
| * | Use language identifier instead of file extension for language attributeDimitri van Heesch2017-09-283-4/+4
| | |