Commit 540f0b66 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Merge pull request #254 from kbinani/language_switch_command

Fix bug: language switch command skipped when langauge id contains "-" letter
parents 33cdac23 a4cf65de
...@@ -1120,7 +1120,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" ...@@ -1120,7 +1120,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
<Comment>{B}*("\\\\"|"@@")"f"[$\[{] { // escaped formula command <Comment>{B}*("\\\\"|"@@")"f"[$\[{] { // escaped formula command
addOutput(yytext); 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; QCString langId = QString(yytext).stripWhiteSpace().data()+2;
if (!langId.isEmpty() && if (!langId.isEmpty() &&
qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)!=0) qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)!=0)
...@@ -2160,7 +2160,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$" ...@@ -2160,7 +2160,7 @@ RCSTAG "$"{ID}":"[^\n$]+"$"
/* ----- handle language specific sections ------- */ /* ----- handle language specific sections ------- */
<SkipLang>[\\@]"~"[a-zA-Z]* { /* language switch */ <SkipLang>[\\@]"~"[a-zA-Z-]* { /* language switch */
QCString langId = &yytext[2]; QCString langId = &yytext[2];
if (langId.isEmpty() || if (langId.isEmpty() ||
qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)==0) qstricmp(Config_getEnum("OUTPUT_LANGUAGE"),langId)==0)
......
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<doxygen xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="compound.xsd" version="">
<compounddef id="indexpage" kind="page">
<compoundname>index</compoundname>
<title>My Project</title>
<detaileddescription>
<para>これは日本語(en)です. Output for all languages. </para>
</detaileddescription>
</compounddef>
</doxygen>
// objective: test \~ command with non default OUTPUT_LANGUAGE which contains '-' letter
// check: indexpage.xml
// config: OUTPUT_LANGUAGE = Japanese-en
/**
\mainpage
\~english This is English.
\~dutch Dit is Nederlands.
\~japanese これは日本語です.
\~japanese-en これは日本語(en)です.
\~german Dies ist Deutsch.
\~ Output for all languages.
*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment