@@ -140,13 +140,6 @@ QString convertDoxyCmdToHtml(const QString &s)
140140 result.replace (SA (" \\ #undef" ),SA (" #undef" ));
141141 result.replace (SA (" \\ # " ),SA (" # " ));
142142
143- // -# -> <br>-
144- result.replace (SA (" -#" ),SA (" <br>-" ));
145- result.replace (SA (" - " ),SA (" <br>-" ));
146-
147- // \sa -> <br>See also:
148- result.replace (SA (" \\ sa " ),SA (" <br>See also: " ));
149-
150143 // \par -> <br>
151144 result.replace (SA (" \\ par " ),SA (" <br>" ));
152145
@@ -180,7 +173,7 @@ QString convertDoxyCmdToHtml(const QString &s)
180173
181174 // http/https URLs -> links
182175 // Only match URL-safe characters, exclude trailing punctuation
183- regexp.setPattern (SA (" (https?://[a-zA-Z0-9_\\ -./~%#+?=&]*[a-zA-Z0-9_\\ -/~%#+?=&])" ));
176+ regexp.setPattern (SA (" (https?://[a-zA-Z0-9_\\ -./~%#+?=&@ ]*[a-zA-Z0-9_\\ -/~%#+?=&])" ));
184177 QRegularExpressionMatchIterator urlIt = regexp.globalMatch (result);
185178 QStringList urlReplacements;
186179 while (urlIt.hasNext ())
@@ -207,6 +200,13 @@ QString convertDoxyCmdToHtml(const QString &s)
207200 result.replace (SA (" <br>" ), SA (" <br/>" ));
208201 result.replace (SA (" <br/>" ), SA (" <br/>" ));
209202
203+ // -# -> <br>-
204+ result.replace (SA (" -#" ),SA (" <br>-" ));
205+ result.replace (SA (" - " ),SA (" <br>-" ));
206+
207+ // \sa -> <br>See also:
208+ result.replace (SA (" \\ sa " ),SA (" <br>See also: " ));
209+
210210 return result;
211211}
212212
0 commit comments