diff --git a/src/util.cpp b/src/util.cpp index 5927d484659..5faec6f2c2a 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -889,7 +889,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, size_t strLen = txtStr.length(); if (strLen==0) return; - static const reg::Ex regExp(R"((::)?\a[\w~!\\.:$]*)"); + static const reg::Ex regExp(R"((::)?\a[\w~!\\.:$"]*)"); reg::Iterator it(txtStr,regExp); reg::Iterator end; @@ -919,6 +919,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, for (size_t i=index;iname()!=self->name())) // name check is needed for overloaded members, where getDefs just returns one { - /* in case of Fortran scop and the variable is a non Fortran variable: don't link, + /* in case of Fortran scope and the variable is a non Fortran variable: don't link, * see also getLink in fortrancode.l */ if (!(scope && (scope->getLanguage() == SrcLangExt_Fortran) && md->isVariable() && (md->getLanguage() != SrcLangExt_Fortran))) @@ -1081,6 +1082,7 @@ void linkifyText(const TextGeneratorIntf &out, const Definition *scope, // set next start point in the string //printf("index=%d/%d\n",index,txtStr.length()); skipIndex=index=newIndex+matchLen; + if (insideString) index++; } // add last part of the string to the result. //ol.docify(txtStr.right(txtStr.length()-skipIndex));