Commit b4b40f4c authored by Dimitri van Heesch's avatar Dimitri van Heesch
Browse files

Bug 683115 - Command ignored when using umlauts in markdown and also... 

Bug 683115 - Command ignored when using umlauts in markdown and also C-comments in markdown didn't work properly
parent 68080883

src/commentcnv.l

+2 −2
Original line number Diff line number Diff line
@@ -615,9 +615,9 @@ void replaceComment(int offset); 
				     }

				     else

				     {

				       copyToOutput(yytext,(int)yyleng);

                                       if (g_nestingCount<=0)

                                       {

				         copyToOutput(yytext,(int)yyleng);

				         BEGIN(Scan);

                                       }

                                       else
@@ -977,7 +977,7 @@ void convertCppComments(BufStr *inBuf,BufStr *outBuf,const char *fileName) 
    warn(g_fileName,ctx->lineNr,"Conditional section%sdoes not have "

	"a corresponding \\endcond command within this file.",sectionInfo.data());

  }

  if (g_nestingCount>0 || YY_START==CComment)

  if (g_nestingCount>0 || (YY_START==CComment && g_lang!=SrcLangExt_Markdown))

  {

    warn(g_fileName,g_lineNr,"Reached end of file while still inside a (nested) comment. "

        "Nesting level %d",g_nestingCount+1); // add one for "normal" expected end of comment

src/markdown.cpp

+1 −8
Original line number Diff line number Diff line
@@ -2279,14 +2279,7 @@ void MarkdownFileParser::parseInput(const char *fileName, 
  current->fileName = fileName;

  current->docFile  = fileName;

  current->docLine  = 1;

  int len = qstrlen(fileBuf);

  BufStr input(len);

  BufStr output(len);

  input.addArray(fileBuf,qstrlen(fileBuf));

  input.addChar('\0');

  convertCppComments(&input,&output,fileName);

  output.addChar('\0');

  QCString docs = output.data();

  QCString docs = fileBuf;

  QCString id;

  QCString title=extractPageTitle(docs,id).stripWhiteSpace();

  QCString titleFn = QFileInfo(fileName).baseName().utf8();