Commit a4cf65de authored by kbinani's avatar kbinani
Browse files

Fix bug: language switch command "\~" failed to detect language id which contains '-' 

Support language switch for language ids, 'Japanese-en', 'Korean-en', 'Serbian-Cyrillic', and similer langauge ids.
parent 3b10b5b6

src/commentscan.l

+2 −2
Original line number Diff line number Diff line
@@ -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)

testing/065/indexpage.xml

0 → 100644
+10 −0
Original line number Diff line number Diff line 
<?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>

testing/065_tilde.dox

0 → 100644
+12 −0
Original line number Diff line number Diff line 
// 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.

*/