summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-07-29 11:55:58 (GMT)
committerDimitri van Heesch <doxygen@gmail.com>2019-07-29 11:55:58 (GMT)
commitc0546c1bf81054438e032e43cb675e2e73fad299 (patch)
treeb2a324a69e6350adff3ce888e26c0d93f4e26f06 /src
parentc131d65638effead8aa92a93fe16e1e61ce7180c (diff)
parent1532b5ae1b607857b85d6f94944e570dd597a08b (diff)
downloadDoxygen-c0546c1bf81054438e032e43cb675e2e73fad299.zip
Doxygen-c0546c1bf81054438e032e43cb675e2e73fad299.tar.gz
Doxygen-c0546c1bf81054438e032e43cb675e2e73fad299.tar.bz2
Merge branch 'feature/issue_6950' of https://github.com/albert-github/doxygen into albert-github-feature/issue_6950
Diffstat (limited to 'src')
-rw-r--r--src/util.cpp12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp
index bf02d7e..9cf7b82 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -2032,10 +2032,16 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope,
int floatingIndex=0;
if (strLen==0) return;
// read a word from the text string
- while ((newIndex=regExp.match(txtStr,index,&matchLen))!=-1 &&
- (newIndex==0 || !(txtStr.at(newIndex-1)>='0' && txtStr.at(newIndex-1)<='9')) // avoid matching part of hex numbers
- )
+ newIndex=regExp.match(txtStr,index,&matchLen);
+ while ((newIndex=regExp.match(txtStr,index,&matchLen))!=-1)
{
+ if (!(newIndex == 0 || !(txtStr.at(newIndex-1)>='0' && txtStr.at(newIndex-1)<='9'))) // avoid matching part of hex numbers
+ {
+ out.writeString(txtStr.mid(skipIndex,newIndex+matchLen-skipIndex),keepSpaces);
+ floatingIndex+=newIndex-skipIndex+matchLen;
+ skipIndex=index=newIndex+matchLen;
+ continue;
+ }
// add non-word part to the result
floatingIndex+=newIndex-skipIndex+matchLen;
bool insideString=FALSE;