diff options
author | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-27 20:41:30 (GMT) |
---|---|---|
committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-27 20:42:43 (GMT) |
commit | a292601d5d06cf5993247f2f7a6bc7306997da23 (patch) | |
tree | c79712972c87d360b0c19c526cc9db1498ee34ba /src/fortrancode.l | |
parent | 6de91dc5e32e6d97a557fe6910a6cbf1d453ad9c (diff) | |
download | Doxygen-a292601d5d06cf5993247f2f7a6bc7306997da23.zip Doxygen-a292601d5d06cf5993247f2f7a6bc7306997da23.tar.gz Doxygen-a292601d5d06cf5993247f2f7a6bc7306997da23.tar.bz2 |
Issue #8206: Incorrect XHTML results
Changes:
- Change TooltipManager back into a singleton
- Give the OutputList object a unique output id
- Increment the id at each startFile() atomically
- Pass the id to the HTML code generator
- Store tooltips per output id.
- Keep track of tooltips that are already written for a given id
- for output formats other than HTML the output id is 0 and tooltips are
not collected and written
Diffstat (limited to 'src/fortrancode.l')
-rw-r--r-- | src/fortrancode.l | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/fortrancode.l b/src/fortrancode.l index 0de7b84..a3795e4 100644 --- a/src/fortrancode.l +++ b/src/fortrancode.l @@ -172,7 +172,6 @@ struct fortrancodeYY_state int inTypeDecl = 0; bool endComment = false; - TooltipManager tooltipManager; }; #if USE_STATE2STRING @@ -1017,7 +1016,7 @@ static void writeMultiLineCodeLink(yyscan_t yyscanner,CodeOutputInterface &ol, { struct yyguts_t *yyg = (struct yyguts_t*)yyscanner; static bool sourceTooltips = Config_getBool(SOURCE_TOOLTIPS); - yyextra->tooltipManager.addTooltip(d); + TooltipManager::instance().addTooltip(ol,d); QCString ref = d->getReference(); QCString file = d->getOutputFileBase(); QCString anchor = d->anchor(); @@ -1521,7 +1520,7 @@ void FortranCodeParser::parseCode(CodeOutputInterface & codeOutIntf, yyextra->hasContLine = NULL; // write the tooltips - yyextra->tooltipManager.writeTooltips(codeOutIntf); + TooltipManager::instance().writeTooltips(codeOutIntf); printlex(yy_flex_debug, FALSE, __FILE__, fileDef ? fileDef->fileName().data(): NULL); } |