issue #10700 Include command in class documentation (part 2)

Author: doxygen

src/commentcnv.l

@@ -1022,6 +1022,27 @@ SLASHopt [/]*
 <CComment,CNComment,ReadLine>[\\@][\\@][~a-z_A-Z][a-z_A-Z0-9]*[ \t]* { // escaped command
 				     copyToOutput(yyscanner,yytext,yyleng);
   				   }
+
+<CComment,ReadLine,IncludeFile>[ \t][ \t][ \t][ \t][\\@]("include{"{B}*"doc"{B}*"}"|"includedoc") { // Markdown code section
+                                     if (Config_getBool(MARKDOWN_SUPPORT))
+                                     {
+				       copyToOutput(yyscanner,yytext,yyleng);
+                                     }
+                                     else
+                                     {
+                                       REJECT;
+                                     }
+                                   }
+<CComment,ReadLine,IncludeFile>[ \t][ \t][ \t][ \t][\\@]("snippet{"{B}*"doc"{B}*"}"|"snippetdoc") { // Markdown code section
+                                     if (Config_getBool(MARKDOWN_SUPPORT))
+                                     {
+				       copyToOutput(yyscanner,yytext,yyleng);
+                                     }
+                                     else
+                                     {
+                                       REJECT;
+                                     }
+                                   }
 <CComment,ReadLine,IncludeFile>[\\@]("include{"{B}*"doc"{B}*"}"|"includedoc") {
                                      yyextra->includeCtx = YY_START;
                                      yyextra->firstIncludeLine = true;

src/commentscan.l

@@ -4337,7 +4337,7 @@ static inline void setOutput(yyscan_t yyscanner,OutputContext ctx)
             {
               yyextra->current->brief = yyextra->current->brief.left(yyextra->current->brief.length()-cnt);
               // set warning line correct
-              yyextra->current->brief += "\\iline " + QCString().setNum(cnt + static_cast<int>(std::stoul(match[1].str()))) + " \\ilinebr ";
+              yyextra->current->brief += " \\iline " + QCString().setNum(cnt + static_cast<int>(std::stoul(match[1].str()))) + " \\ilinebr ";
             }
             foundMatch = true;
           }
@@ -4427,14 +4427,14 @@ static inline void addOutput(yyscan_t yyscanner,char c)
 static void addIline(yyscan_t yyscanner,int lineNr)
 {
   char cmd[20];
-  qsnprintf(cmd,20,"\\iline %d ",lineNr);
+  qsnprintf(cmd,20," \\iline %d ",lineNr);
   addOutput(yyscanner, cmd);
 }
 
 static void addIlineBreak(yyscan_t yyscanner,int lineNr)
 {
   char cmd[30];
-  qsnprintf(cmd,30,"\\iline %d \\ilinebr ",lineNr);
+  qsnprintf(cmd,30," \\iline %d \\ilinebr ",lineNr);
   addOutput(yyscanner, cmd);
 }
 

vhdlparser/vhdl_adj.py

@@ -15,7 +15,7 @@
 import sys
 import re
 
-message_re = re.compile('message\s*\+=\s*("[^"]*")')
+message_re = re.compile(r'message\s*\+=\s*("[^"]*")')
 
 def main():
     inputFile = open(sys.argv[1], 'r')