diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-12 14:00:14 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2019-01-12 14:00:14 (GMT) |
| commit | 132e646386857a998641ddfca91f537f173e0d55 (patch) | |
| tree | 8c844e8cf81e8856de77cbd2afa12d73d4b092b3 /src | |
| parent | 7f40e488e27bcea4bb15045df05479dc5fbd9d6d (diff) | |
| parent | 14ef3d638c017256a8315ce9f20d576740dc1b98 (diff) | |
| download | Doxygen-132e646386857a998641ddfca91f537f173e0d55.zip Doxygen-132e646386857a998641ddfca91f537f173e0d55.tar.gz Doxygen-132e646386857a998641ddfca91f537f173e0d55.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/commentscan.l | 5 | ||||
| -rw-r--r-- | src/htmlgen.cpp | 2 | ||||
| -rw-r--r-- | src/tooltip.cpp | 1 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 7fab755..c656c9e 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1282,6 +1282,11 @@ RCSTAG "$"{ID}":"[^\n$]+"$" addOutput(insidePre || Doxygen::markdownSupport ? yytext : "–"); } <Comment>"-#"{B}+ { // numbered item + if (inContext!=OutputXRef) + { + briefEndsAtDot=FALSE; + setOutput(OutputDoc); + } addOutput(yytext); } <Comment>("."+)[a-z_A-Z0-9\)] { // . at start or in the middle of a word, or ellipsis diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index efd2108..b8fc5a2 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -769,7 +769,7 @@ void HtmlGenerator::init() t << endl << "$(document).ready(function() {\n" " $('.code,.codeRef').each(function() {\n" - " $(this).data('powertip',$('#'+$(this).attr('href').replace(/.*\\//,'').replace(/[^a-z_A-Z0-9]/g,'_')).html());\n" + " $(this).data('powertip',$('#a'+$(this).attr('href').replace(/.*\\//,'').replace(/[^a-z_A-Z0-9]/g,'_')).html());\n" " $(this).powerTip({ placement: 's', smartPlacement: true, mouseOnToPopup: true });\n" " });\n" "});\n"; diff --git a/src/tooltip.cpp b/src/tooltip.cpp index 3b128a9..91da583 100644 --- a/src/tooltip.cpp +++ b/src/tooltip.cpp @@ -84,6 +84,7 @@ void TooltipManager::addTooltip(Definition *d) { id+="_"+anc; } + id = "a" + id; if (p->tooltipInfo.find(id)==0) { p->tooltipInfo.insert(id,d); |