summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Show git version informationalbert-github2019-04-079-9/+301
| | | | | | | | Show the git version on designated places (currently version, help and Doxyfile difference). The implementation is based on the git_watcher.cmake (https://github.com/andrew-hardin/cmake-git-version-tracking). The information is useful to see which. master, version of doxygen is used for a build on systems where a lot of builds are make (Fossies.org) or very regular builds are made (CGAL) Furthermore the tracking of the VERSION file was not done (when changed the version.cpp was not updated), this is corrected as well.
* Merge pull request #6902 from albert-github/feature/issue_6896Dimitri van Heesch2019-03-301-6/+15
|\ | | | | issue #6896 empty sections in latex output
| * issue #6896 empty sections in latex outputalbert-github2019-03-281-6/+15
| | | | | | | | In pull request #6832 a fix was made for section captions that ran into the margins. For sections that should not appear in the the TOC (i.e. `*`-ed sections) this led to showing a `*`, this has been corrected.
* | Merge pull request #6903 from doxygen/revert-6859-feature/issue_6856Dimitri van Heesch2019-03-291-2/+5
|\ \ | |/ |/| Revert "issue #6856 Doxygen only expands macro defined in header file once when referred multiple times"
| * Revert "issue #6856 Doxygen only expands macro defined in header file once ↵Dimitri van Heesch2019-03-281-2/+5
|/ | | | when referred multiple times"
* Merge pull request #6890 from albert-github/feature/bug_xml_xsdDimitri van Heesch2019-03-253-19/+48
|\ | | | | Correcting errors in xml generation and xsd schema
| * Correcting errors in xml generation and xsd schemaalbert-github2019-03-183-19/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `xmlgen.cpp` make count test identical to restrictions in `generateXMLForMember` - `index.xsd` add missing selection possibility - `compound.xsd` - add missing `block` possibility for htmlonly - add missing `private` and `protected` possibilities - get order in description type right - make `sect[1-4]` more flexible - adding missing elements like `msc`, `linebreak` at the appropriate places - adding `vhdl` coloring enumeration values - adding `docbook` possibility for images results have been tested (a.o.) doxygen tests, doxygen examples, doxygen docu, CGAL source code.
* | Merge pull request #6859 from albert-github/feature/issue_6856Dimitri van Heesch2019-03-201-5/+2
|\ \ | | | | | | issue #6856 Doxygen only expands macro defined in header file once when referred multiple times
| * | issue #6856 Doxygen only expands macro defined in header file once when ↵albert-github2019-02-251-5/+2
| | | | | | | | | | | | | | | | | | referred multiple times In case the include file is already is already in the global stack it should not be added to the global stack, but still be handled for the current file
* | | Merge pull request #6889 from albert-github/feature/bug_xml_xsd_testsDimitri van Heesch2019-03-201-9/+66
|\ \ \ | | | | | | | | Add possibility of checking XML against XSD in doxygen tests
| * | | Add possibility of checking XML against XSD in doxygen testsalbert-github2019-03-181-9/+66
| | |/ | |/| | | | | | | Added option `--xmlxsd` to check generated XML files against XSD in the doxygen tests suite.
* | | Merge pull request #6893 from albert-github/feature/issue_6892Dimitri van Heesch2019-03-201-2/+2
|\ \ \ | |/ / |/| | issue #6892 xml not well-formed (invalid token) for c++
| * | issue #6892 xml not well-formed (invalid token) for c++albert-github2019-03-191-2/+2
|/ / | | | | | | the `declname` and `defname` should also be converted (compare as well the routine `generateXMLForMember`)
* | Merge pull request #6784 from albert-github/feature/issue_6781_2Dimitri van Heesch2019-03-172-27/+15
|\ \ | | | | | | issue #6781 Unable to use math in markdown table headers
| * | issue #6781 Unable to use math in markdown table headersalbert-github2019-01-192-27/+15
| | | | | | | | | | | | | | | | | | Due to the change of the place where the markdown processing is done the end of the line must be calculated a little bit differently. Note: translator.py gave an error due to a strange indentation (did surface now), so had to be corrected as well.
* | | Merge pull request #6649 from albert-github/feature/bug_616379Dimitri van Heesch2019-03-171-4/+13
|\ \ \ | | | | | | | | Bug 616379 - doxygen result by nested comment incorrectly
| * | | Bug 616379 - doxygen result by nested comment incorrectlyalbert-github2018-11-281-4/+13
| | | | | | | | | | | | | | | | Improvement on handling `///` comments in relation to `*/` during comment conversion.
* | | | Merge pull request #6873 from albert-github/feature/bug_ftn_cont_labelDimitri van Heesch2019-03-172-20/+59
|\ \ \ \ | | | | | | | | | | Continuation lines and labels
| * | | | Continuation lines and labelsalbert-github2019-03-072-20/+59
| | | | | | | | | | | | | | | | | | | | | | | | | Better handling of continuation lines when converting from fixed form Fortran to free form Fortran, especially handling the information in columns 733 and further (which is in fixed formatted Fortran always comment) An `end` statement can start not only on lines with spaces in front of it but also when a line has a label or the `end` can be after a `;`.
* | | | | Removed unneeded checkDimitri van Heesch2019-03-171-1/+1
| | | | |
* | | | | at sign (`@`) not handled correctly in preprocessor (more fixes)Dimitri van Heesch2019-03-171-34/+40
| | | | |
* | | | | Merge pull request #6876 from shawnanastasio/fix_aix_buildDimitri van Heesch2019-03-161-0/+2
|\ \ \ \ \ | | | | | | | | | | | | qglobal.h: Fix build on AIX
| * | | | | qglobal.h: Fix build on AIXShawn Anastasio2019-03-081-0/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AIX's inttypes.h already defines the type int64, check if it is already included before attempting to redefine it. Tested on AIX 7.2
* | | | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2019-03-169-22/+85
|\ \ \ \ \
| * \ \ \ \ Merge pull request #6883 from albert-github/feature/issue_6882Dimitri van Heesch2019-03-121-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | issue #6882 1.8.15 regression: caller graph created even though CALLER_GRAPH = NO
| | * | | | | issue #6882 1.8.15 regression: caller graph created even though CALLER_GRAPH ↵albert-github2019-03-121-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | = NO the enabling of the caller graph was set by the references relation (regression on issue #6562)
| * | | | | Merge pull request #6772 from albert-github/feature/issue_6764Dimitri van Heesch2019-03-101-1/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | issue #6764 Incorrect parsing of C enum comments defined using a macro
| | * | | | | issue #6764 Incorrect parsing of C enum comments defined using a macroalbert-github2019-01-151-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When in a `/*` comment skip till end of the comment so a `,` won't be seen as the argument separator.
| * | | | | | Merge pull request #6785 from albert-github/feature/issue_6775Dimitri van Heesch2019-03-101-0/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | issue #6775 LaTex package newunicodechar: "package won't work "
| | * | | | | | issue #6775 LaTex package newunicodechar: "package won't work "albert-github2019-01-201-0/+1
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Some older distributions with newunicode package 1.1 need this option `\usepackage[utf8]{inputenc}`. Option was already present in the main LaTeX output i.e. refman.tex
| * | | | | | Merge pull request #6857 from albert-github/feature/bug_645910Dimitri van Heesch2019-03-101-1/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Bug 645910 - Segfault on recursion while parsing "\subpage A" in "\page A"
| | * | | | | | Bug 645910 - Segfault on recursion while parsing "\subpage A" in "\page A"albert-github2019-02-251-1/+8
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | In version 1.7.3 (till 1.8.7) the problem of direct recursion (i.e. in a page is a subpage to itself) we got a segmentation fault, as of 1.8.8 the problem went into an endless loop. The direct recursion is now detected.
| * | | | | | Merge pull request #6853 from albert-github/feature/bug_superfluous_par_tagsDimitri van Heesch2019-03-101-15/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Remove superfluous paragraph tags
| | * | | | | | Remove superfluous paragraph tagsalbert-github2019-02-231-15/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some superfluous paragraph tags in HTML (`</p>`).
| * | | | | | | Merge pull request #6861 from albert-github/feature/bug_html_attributesDimitri van Heesch2019-03-101-2/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Multiple use of HTML attributes
| | * | | | | | | Multiple use of HTML attributesalbert-github2019-02-281-2/+40
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case an attribute is used multiple times the XHTML validator gives (here for the style attribute): parser error : Attribute style redefined Created routine to merge these types of attributes.
| * | | | | | | Merge pull request #6874 from albert-github/feature/bug_ftn_cnv_debugDimitri van Heesch2019-03-103-1/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Possibility to show converted fixed form
| | * | | | | | | Possibility to show converted fixed formalbert-github2019-03-073-1/+6
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Create an easy possibility to show the Fortran source as converted from fixed form to free form.
* | | | | | | | at sign (`@`) not handled correctly in preprocessorDimitri van Heesch2019-03-161-0/+15
|/ / / / / / /
* | | | | | | Merge branch 'master' of github.com:doxygen/doxygenDimitri van Heesch2019-03-103-4/+8
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge pull request #6868 from albert-github/feature/bug_secref_multicolDimitri van Heesch2019-03-093-4/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | secreflist command output shows in 1 column (HTML)
| | * | | | | | | secref command output shows in 1 column (HTML)albert-github2019-03-043-4/+8
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output from the `\secref` command shows in 1 column instead of 3. The `column-count` (also possibile without `-moz` or `-webkit`) should be with the `<ul>` tag instead of the `<div>` tag
* | | | | | | | Fixed a few compiler warnings on win32Dimitri van Heesch2019-03-105-9/+9
|/ / / / / / /
* | | | | | | Merge branch 'albert-github-feature/bug_lineno_split_examples'Dimitri van Heesch2019-03-0911-26/+143
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'feature/bug_lineno_split_examples' of ↵Dimitri van Heesch2019-03-0910-26/+142
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_lineno_split_examples
| * | | | | | Show line numbers in "split" examplesalbert-github2019-03-039-10/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the commands like `\skip`, `\skipline` it is possible to show parts of a file for further explanation / tutorials. They can be started with `\include` or `\dontinclude` but in case `\include` specifies that the line numbers have to be shown they are only shown in the full example and not in the split up example - show line numbers in split up example in case `lineno` is required - add `lineno` option to `\dontinclude` so here also line numbers can be shown.
* | | | | | | Fix for unmatched </p> when using \until as the first commandDimitri van Heesch2019-03-031-6/+4
| | | | | | |
* | | | | | | Merge branch 'albert-github-feature/bug_warn_nofile_incl'Dimitri van Heesch2019-03-032-1/+19
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Minor refactoringDimitri van Heesch2019-03-032-19/+14
| | | | | | |
| * | | | | | Merge branch 'feature/bug_warn_nofile_incl' of ↵Dimitri van Heesch2019-03-031-0/+23
| |\ \ \ \ \ \ |/ / / / / / / | | | | | | | | | | | | | | https://github.com/albert-github/doxygen into albert-github-feature/bug_warn_nofile_incl