diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-07 11:10:00 (GMT) |
---|---|---|
committer | Dimitri van Heesch <dimitri@stack.nl> | 2018-07-07 11:10:00 (GMT) |
commit | 495ee68d20423136472864302abd5609c392ba63 (patch) | |
tree | 9cb510ba5c0dcd792d333d2fb7a66dcab17e5855 /src | |
parent | 992204b8a0d8cd509d8da9f17366054a2b7ffa37 (diff) | |
parent | 1de4faf17a4b5de11839220d95e08264303924c5 (diff) | |
download | Doxygen-495ee68d20423136472864302abd5609c392ba63.zip Doxygen-495ee68d20423136472864302abd5609c392ba63.tar.gz Doxygen-495ee68d20423136472864302abd5609c392ba63.tar.bz2 |
Merge branch 'feature/bug_tooltip_apostrophe' of https://github.com/albert-github/doxygen into albert-github-feature/bug_tooltip_apostrophe
Diffstat (limited to 'src')
-rw-r--r-- | src/htmlgen.cpp | 23 | ||||
-rw-r--r-- | src/htmlgen.h | 1 |
2 files changed, 23 insertions, 1 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 740b2f5..8feb8b0 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -514,6 +514,27 @@ void HtmlCodeGenerator::docify(const char *str) } } +void HtmlCodeGenerator::docify_tt(const char *str) +{ + m_t << getHtmlDirEmbedingChar(getTextDirByConfig(str)); + + if (str && m_streamSet) + { + const char *p=str; + char c; + while (*p) + { + c=*p++; + switch(c) + { + case '<': m_t << "<"; break; + case '>': m_t << ">"; break; + default: m_t << c; + } + } + } +} + void HtmlCodeGenerator::writeLineNumber(const char *ref,const char *filename, const char *anchor,int l) { @@ -606,7 +627,7 @@ void HtmlCodeGenerator::writeTooltip(const char *id, const DocLinkInfo &docInfo, if (desc) { m_t << "<div class=\"ttdoc\">"; - docify(desc); // desc is already HTML escaped; but there are still < and > signs + docify_tt(desc); // desc is already HTML escaped; but there are still < and > signs m_t << "</div>"; } if (!defInfo.file.isEmpty()) diff --git a/src/htmlgen.h b/src/htmlgen.h index 2d8d6e0..b80d7d4 100644 --- a/src/htmlgen.h +++ b/src/htmlgen.h @@ -61,6 +61,7 @@ class HtmlCodeGenerator : public CodeOutputInterface const char *anchor,const char *name, const char *tooltip); void docify(const char *str); + void docify_tt(const char *str); bool m_streamSet; FTextStream m_t; int m_col; |