Permalink
Browse files

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

…C-comments in markdown didn't work properly
  • Loading branch information...
Dimitri van Heesch
Dimitri van Heesch committed Jan 8, 2014
1 parent 6808088 commit b4b40f4c7ea57655d1264e8f72c754526e3a9209
Showing with 3 additions and 10 deletions.
  1. +2 −2 src/commentcnv.l
  2. +1 −8 src/markdown.cpp
View
@@ -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
View
@@ -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();

0 comments on commit b4b40f4

Please sign in to comment.