diff options
| author | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-28 16:03:24 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <doxygen@gmail.com> | 2020-11-28 16:03:24 (GMT) |
| commit | c11530d7bfa321707ae7b8b8495b58862a5e0c56 (patch) | |
| tree | 0a55a2b9f49293a7748a304379267b90143c5431 /src | |
| parent | a95ab819972148fef8287353e13089fd8cacebb8 (diff) | |
| parent | 00f14e3f1666d0cb74810a725d2cf0e71799ccdc (diff) | |
| download | Doxygen-c11530d7bfa321707ae7b8b8495b58862a5e0c56.zip Doxygen-c11530d7bfa321707ae7b8b8495b58862a5e0c56.tar.gz Doxygen-c11530d7bfa321707ae7b8b8495b58862a5e0c56.tar.bz2 | |
Merge branch 'master' of github.com:doxygen/doxygen
Diffstat (limited to 'src')
| -rw-r--r-- | src/commentscan.l | 6 | ||||
| -rw-r--r-- | src/doxygen.cpp | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index ccf71f6..10efef1 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -887,7 +887,11 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <HtmlComment>"--"[!]?">"{B}* { BEGIN( Comment ); } <HtmlComment>{DOCNL} { - if (*yytext=='\n') yyextra->lineNr++; + if (*yytext=='\n') + { + addOutput(yyscanner,*yytext); + yyextra->lineNr++; + } } <HtmlComment>[^\\\n\-]+ { // ignore unimportant characters } diff --git a/src/doxygen.cpp b/src/doxygen.cpp index 6c8c67a..2468306 100644 --- a/src/doxygen.cpp +++ b/src/doxygen.cpp @@ -9837,6 +9837,7 @@ static void escapeAliases() newValue+=value.mid(p,in-p); // expand \n's except if \n is part of a built-in command. if (value.mid(in,5)!="\\note" && + value.mid(in,5)!="\\noop" && value.mid(in,5)!="\\name" && value.mid(in,10)!="\\namespace" && value.mid(in,14)!="\\nosubgrouping" |