diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2018-12-20 20:03:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 20:03:47 (GMT) |
| commit | e8b9cfaaadf62c115cf253d417dd1bdee38e77db (patch) | |
| tree | 5d2780fe3fa1295570d362b8a8eea82aa6cf31da | |
| parent | 33a65ef755e0301401a15d012627d02c1facf2d9 (diff) | |
| parent | 15541e75816673fdc51d90820d6620e98b8fcd4b (diff) | |
| download | Doxygen-e8b9cfaaadf62c115cf253d417dd1bdee38e77db.zip Doxygen-e8b9cfaaadf62c115cf253d417dd1bdee38e77db.tar.gz Doxygen-e8b9cfaaadf62c115cf253d417dd1bdee38e77db.tar.bz2 | |
Merge pull request #6694 from albert-github/feature/issue_6692
issue #6692 XML TOC generation is not backwards-compatible with 1.8.14
| -rw-r--r-- | doc/commands.doc | 2 | ||||
| -rw-r--r-- | src/commentscan.l | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/commands.doc b/doc/commands.doc index c582955..e27cc00 100644 --- a/doc/commands.doc +++ b/doc/commands.doc @@ -2110,7 +2110,7 @@ Make sure you have first read \ref intro "the introduction". this range are considered to be 5. In case no `level` is specified `level` is set to 5 (show all) In case no `option`. is specified \c \\tableofcontents acts as if just the - `option` `HTML` was specified. In case of multiple \c \\tableofcontents + `option` `HTML` and `XML` was specified. In case of multiple \c \\tableofcontents commands in a page the `option`(s) will be used additional to the already specified `option`(s), but only the last `level` of an `option` is valid. diff --git a/src/commentscan.l b/src/commentscan.l index 3af682c..c5349cf 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -3005,7 +3005,9 @@ static bool handleToc(const QCString &, const QCStringList &optList) } if (current->localToc.nothingEnabled()) { - current->localToc.enableHtml(5); // for backward compatibility + // for backward compatibility + current->localToc.enableHtml(5); + current->localToc.enableXml(5); } } return FALSE; |