summaryrefslogtreecommitdiffstats
path: root/src/pre.l
diff options
context:
space:
mode:
authordimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2005-04-10 18:36:52 (GMT)
committerdimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7>2005-04-10 18:36:52 (GMT)
commit76e39987363c93fdd3f2d99ffdb9f87743d6af7c (patch)
treea604824ba5bbf13dd607ebd57c1a426a0d225d58 /src/pre.l
parentc8be4837b6a2a96cc3e57aa941645b9dc017e8b2 (diff)
downloadDoxygen-76e39987363c93fdd3f2d99ffdb9f87743d6af7c.zip
Doxygen-76e39987363c93fdd3f2d99ffdb9f87743d6af7c.tar.gz
Doxygen-76e39987363c93fdd3f2d99ffdb9f87743d6af7c.tar.bz2
Release-1.4.2-20050410
Diffstat (limited to 'src/pre.l')
-rw-r--r--src/pre.l8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pre.l b/src/pre.l
index cb23bb8..8ce3d76 100644
--- a/src/pre.l
+++ b/src/pre.l
@@ -195,7 +195,7 @@ static FILE *checkAndOpenFile(const QCString &absName)
QCString filterName = getFileFilter(absName);
if (!filterName.isEmpty())
{
- QCString cmd = filterName+" \""+absName+"\"";
+ QCString cmd = "\"" + filterName+"\" \""+absName+"\"";
f=popen(cmd,"r");
if (!f) err("Error: could not execute filter %s\n",cmd.data());
}
@@ -1779,7 +1779,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
}
<SkipCComment>[\\@]("verbatim"|"latexonly"|"htmlonly"|"xmlonly"|"rtfonly"|"manonly"|"dot"|"code"){BN}+ {
outputArray(yytext,yyleng);
- g_blockName=&yytext[1];
+ g_blockName=QCString(&yytext[1]).stripWhiteSpace();
BEGIN(SkipVerbatim);
}
<SkipVerbatim>[\\@]("endverbatim"|"endlatexonly"|"endhtmlonly"|"endxmlonly"|"endrtfonly"|"endmanonly"|"enddot"|"endcode") { /* end of verbatim block */
@@ -1789,7 +1789,7 @@ CHARLIT (("'"\\[0-7]{1,3}"'")|("'"\\."'")|("'"[^'\\\n]{1,4}"'"))
BEGIN(SkipCComment);
}
}
-<SkipCComment,SkipVerbatim>[^*\x06\n\/]+ {
+<SkipCComment,SkipVerbatim>[^*\\@\x06\n\/]+ {
outputArray(yytext,yyleng);
}
<SkipCComment,SkipVerbatim>\n {
@@ -2235,7 +2235,7 @@ void preprocessFile(const char *fileName,BufStr &output)
}
else
{
- QCString cmd = inputFilter+" \""+fileName+"\"";
+ QCString cmd = "\"" + inputFilter+"\" \""+fileName+"\"";
preYYin = popen(cmd,"r");
if (!preYYin)
{