summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #621 from mosra/xml-programlisting-filenameDimitri van Heesch2017-11-195-8/+17
|\ | | | | Propagate language information to all <programlisting> XML elements
| * Propagate language information to all <programlisting> XML elements.Vladimír Vondruš2017-11-193-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
|
* 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
* | Async load of mathjax javascriptSam Tygier2017-10-251-1/+1
| | | | | | | | Use async keyword to prevent page load waiting.
* | Update mathjax pathSam Tygier2017-10-251-1/+1
|/ | | | | | | 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/ )
* 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.
* | 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 needless variable expansionsRolf Eike Beer2017-10-201-3/+2
| |
* | 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.
* | | Updated translator_de.h to doxygen 1.8.13Arnd Weber2017-10-131-21/+48
|/ /
* | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-10-101-1/+2
|\ \
| * | 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
|/ /
* | Use language identifier instead of file extension for language attributeDimitri van Heesch2017-09-281-1/+1
| |
* | Merge branch 'master' of https://github.com/shi-yan/doxygen into shi-yan-masterDimitri van Heesch2017-09-281-1/+1
|\ \
| * | 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 #605 from albert-github/feature/bug_js_regression_2Dimitri van Heesch2017-09-281-1/+1
|\ \ \ | | | | | | | | Mark JS as freely available (regression 2)
| * | | Mark JS as freely available (regression 2)albert-github2017-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | result of extra ';' was that part of the html file was not written and thus no correct end of script and thus garbled output. (problem was missed at first regression fix)
* | | | Merge pull request #606 from albert-github/feature/bug_743367Dimitri van Heesch2017-09-282-7/+16
|\ \ \ \ | | | | | | | | | | Bug 743367 - Duplicate attribute (target="_top" target="_top") generated in .SVG files
| * | | | Bug 743367 - Duplicate attribute (target="_top" target="_top") generated in ↵albert-github2017-09-282-7/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | .SVG files prevent to write multiple target attributes in one tag.
* | | | Removed -Wno-deprecated flag from bison as it is not support on the bison ↵Dimitri van Heesch2017-09-281-2/+2
|/ / / | | | | | | | | | 2.3 that ships with XCode
* | | const-ifyAdrian Negreanu2017-09-259-67/+69
| | |
* | | Merge pull request #595 from albert-github/feature/bug_776870Dimitri van Heesch2017-09-211-2/+2
|\ \ \ | | | | | | | | Bug 776870 - XML Parsing Error for operator<< methods when outputing to XHTML
| * | | Bug 776870 - XML Parsing Error for operator<< methods when outputing to XHTMLalbert-github2017-08-251-2/+2
| |/ / | | | | | | | | | The < sign in the title has to be escaped, especially in case of xhtml.
* | | Merge pull request #603 from lrineau/masterDimitri van Heesch2017-09-211-2/+2
|\ \ \ | | | | | | | | Suppression warnings about deprecated directive
| * | | Suppression warnings about deprecated directiveLaurent Rineau2017-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ``` constexp.y:46.1-13: warning: deprecated directive, use ‘%name-prefix’ [-Wdeprecated] %name-prefix="constexpYY" ^^^^^^^^^^^^^ [...]/src/constexp.y:46.1-13: warning: deprecated directive, use ‘%name-prefix’ [-Wdeprecated] %name-prefix="constexpYY" ^^^^^^^^^^^^^ ```
* | | | Merge pull request #600 from albert-github/feature/bug_778730Dimitri van Heesch2017-09-214-16/+34
|\ \ \ \ | |/ / / |/| | | Bug 778730 - doxygen build fails
| * | | Bug 778730 - doxygen build failsalbert-github2017-09-034-16/+34
| | | | | | | | | | | | | | | | | | | | When a hyperlink splits across a page boundary it can come to the problem of "\pdfendlink ended up in different nesting level than \pdfstartlink". To overcome this problem the \hyperlink is packed into a "\mbox" construct (as suffested e.g. in https://tex.stackexchange.com/questions/1522/pdfendlink-ended-up-in-different-nesting-level-than-pdfstartlink)
* | | | Further cleanup of lodepng codeDimitri van Heesch2017-09-182-176/+30
| | | |
* | | | Stripped unused LodePNG code to prevent false positives for coverityDimitri van Heesch2017-09-182-3223/+206
| | | |
* | | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2017-09-1617-518/+747
|\ \ \ \ | |/ / /
| * | | Merge pull request #587 from brglng/patch-1Dimitri van Heesch2017-09-021-2/+2
| |\ \ \ | | | | | | | | | | Improve Chinese translation
| | * | | Improve Chinese translationZhaosheng Pan2017-08-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "References" -> 引用了 "Referenced by" -> 被这些函数引用 These makes more sense than "参考" and "参考自"。
| * | | | Merge pull request #589 from albert-github/feature/bug_786409Dimitri van Heesch2017-09-021-0/+11
| |\ \ \ \ | | | | | | | | | | | | Bug 786409 - parsing error in Fortran file with preprocessing