diff options
| author | Dimitri van Heesch <dimitri@stack.nl> | 2013-01-20 13:31:30 (GMT) |
|---|---|---|
| committer | Dimitri van Heesch <dimitri@stack.nl> | 2013-01-20 13:31:30 (GMT) |
| commit | dcd4714c4413348d02eb7224dafee5d06be43dfb (patch) | |
| tree | 3872f0367bbee22883a702d1d2f799c9a9c2e8ac /src/commentscan.l | |
| parent | 775ab3be95c02dd805aadc73ffbe3c18877c12a4 (diff) | |
| download | Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.zip Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.gz Doxygen-dcd4714c4413348d02eb7224dafee5d06be43dfb.tar.bz2 | |
Release-1.8.3.1
Diffstat (limited to 'src/commentscan.l')
| -rw-r--r-- | src/commentscan.l | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/commentscan.l b/src/commentscan.l index 68f6b5f..249fec8 100644 --- a/src/commentscan.l +++ b/src/commentscan.l @@ -1,6 +1,6 @@ /***************************************************************************** * - * Copyright (C) 1997-2012 by Dimitri van Heesch. + * Copyright (C) 1997-2013 by Dimitri van Heesch. * * Permission to use, copy, modify, and distribute this software and its * documentation under the terms of the GNU General Public License is hereby @@ -526,7 +526,7 @@ static void addXRefItem(const char *listName,const char *itemTitle, QListIterator<ListItemInfo> slii(*docEntry->sli); for (slii.toFirst();(lii=slii.current());++slii) { - if (strcmp(lii->type,listName)==0) + if (qstrcmp(lii->type,listName)==0) { //printf("found %s lii->type=%s\n",listName,lii->type); break; @@ -1074,7 +1074,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <Comment>{B}*{CMD}"~"[a-z_A-Z]* { // language switch command QCString langId = QString(yytext).stripWhiteSpace().data()+2; if (!langId.isEmpty() && - stricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)!=0) + qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)!=0) { // enable language specific section BEGIN(SkipLang); } @@ -1160,6 +1160,9 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <Comment>"--" { // ndash addOutput(insidePre || Doxygen::markdownSupport ? yytext : "–"); } +<Comment>"-#"{B}+ { // numbered item + addOutput(yytext); + } <Comment>("."+)[a-z_A-Z0-9\)] { // . at start or in the middle of a word, or ellipsis addOutput(yytext); } @@ -2057,7 +2060,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" <SkipLang>[\\@]"~"[a-zA-Z]* { /* language switch */ QCString langId = &yytext[2]; if (langId.isEmpty() || - stricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)==0) + qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)==0) { // enable language specific section BEGIN(Comment); } @@ -2408,6 +2411,11 @@ static bool handleSubpage(const QCString &s) warn(yyFileName,yyLineNr, "warning: found \\subpage command in a comment block that is not marked as a page!"); } + if (g_spaceBeforeCmd) + { + addOutput(' '); + g_spaceBeforeCmd=FALSE; + } addOutput("@"+s+" "); BEGIN(SubpageLabel); return FALSE; @@ -2849,7 +2857,7 @@ static int findExistingGroup(int &groupId,const MemberGroupInfo *info) { if (g_compoundName==mi->compoundName && // same file or scope !mi->header.isEmpty() && // not a nameless group - stricmp(mi->header,info->header)==0 // same header name + qstricmp(mi->header,info->header)==0 // same header name ) { //printf("Found it!\n"); |