summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2014-12-04 20:11:05 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2014-12-04 20:11:05 (GMT)
commit540f0b66972c03fd53c97174e1680230b8dd4026 (patch)
tree8e7c4a64fe02e84f12a72bd840dbb9b2d91b2614 /src
parent33cdac235fa71cf3ee60127810cac9e5d79f9f4b (diff)
parenta4cf65dea1371721f07c63c2bb5f9e5085b2618a (diff)
downloadDoxygen-540f0b66972c03fd53c97174e1680230b8dd4026.zip
Doxygen-540f0b66972c03fd53c97174e1680230b8dd4026.tar.gz
Doxygen-540f0b66972c03fd53c97174e1680230b8dd4026.tar.bz2
Merge pull request #254 from kbinani/language_switch_command
Fix bug: language switch command skipped when langauge id contains "-" letter
Diffstat (limited to 'src')
-rw-r--r--src/commentscan.l4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/commentscan.l b/src/commentscan.l
index 3bfd563..702a616 100644
--- a/src/commentscan.l
+++ b/src/commentscan.l
@@ -1120,7 +1120,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
<Comment>{B}*("\\\\"|"@@")"f"[$\[{] { // escaped formula command
addOutput(yytext);
}
-<Comment>{B}*{CMD}"~"[a-z_A-Z]* { // language switch command
+<Comment>{B}*{CMD}"~"[a-z_A-Z-]* { // language switch command
QCString langId = QString(yytext).stripWhiteSpace().data()+2;
if (!langId.isEmpty() &&
qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)!=0)
@@ -2160,7 +2160,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
/* ----- handle language specific sections ------- */
-<SkipLang>[\\@]"~"[a-zA-Z]* { /* language switch */
+<SkipLang>[\\@]"~"[a-zA-Z-]* { /* language switch */
QCString langId = &yytext[2];
if (langId.isEmpty() ||
qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)==0)