simplify \iflanguageoption

reutenauer · May 26, 2024 · 4029a9c · 4029a9c
1 parent 74af565
commit 4029a9c
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 54 deletions.
diff --git a/tex/gloss-arabic.ldf b/tex/gloss-arabic.ldf
@@ -143,7 +143,7 @@
 % Register default options
 \InitializeGlossOptions{arabic}{locale=default,calendar=gregorian,numerals=mashriq,hijricorrection=0,abjadjimnotail=false}
 % Register alias options
-\SetLanguageAliasValues{arabic}{calendar}{islamic}{hijri}
+\SetLanguageAliasValues{arabic}{calendar}{islamic,hijri}
 
 \def\arabicgregmonth@default#1{\ifcase#1%
   % Egypt, Sudan, Yemen and Golf states

diff --git a/tex/gloss-belarusian.ldf b/tex/gloss-belarusian.ldf
@@ -79,7 +79,7 @@
 % Register default options
 \InitializeGlossOptions{belarusian}{babelshorthands=false,numerals=arabic,spelling=modern}
 % Register alias options
-\SetLanguageAliasValues{belarusian}{spelling}{classic}{tarask}
+\SetLanguageAliasValues{belarusian}{spelling}{classic,tarask}
 
 \ifsystem@babelshorthands
   \SetGlossOptions{belarusian}{babelshorthands=true}

diff --git a/tex/gloss-chinese.ldf b/tex/gloss-chinese.ldf
@@ -74,8 +74,8 @@
 \InitializeGlossOptions{chinese}{variant=cn,numerals=arabic}
 %\InitializeGlossOptions{chinese}{variant=tw,numerals=arabic}
 % Register alias options
-\SetLanguageAliasValues{chinese}{variant}{cn}{simplified}
-\SetLanguageAliasValues{chinese}{variant}{tw}{traditional}
+\SetLanguageAliasValues{chinese}{variant}{cn,simplified}
+\SetLanguageAliasValues{chinese}{variant}{tw,traditional}
 
 
 \def\chinese@capsformat{%

diff --git a/tex/gloss-english.ldf b/tex/gloss-english.ldf
@@ -137,8 +137,8 @@
 % Register default options
 \InitializeGlossOptions{english}{variant=us,ordinalmonthday=false}
 % Register alias options
-\SetLanguageAliasValues{english}{variant}{us}{american}
-\SetLanguageAliasValues{english}{variant}{uk}{british}
+\SetLanguageAliasValues{english}{variant}{us,american}
+\SetLanguageAliasValues{english}{variant}{uk,british}
 
 \ifxetex
    % Check if \l@english is defined. If not, try to set it to some variety

diff --git a/tex/gloss-french.ldf b/tex/gloss-french.ldf
@@ -146,7 +146,7 @@
                                       itemlabels=\textemdash,itemlabeli=\textemdash,itemlabelii=\textemdash,
                                       itemlabeliii=\textemdash,itemlabeliv=\textemdash}
 % Register alias options
-\SetLanguageAliasValues{french}{variant}{canadian}{acadian}
+\SetLanguageAliasValues{french}{variant}{canadian,acadian}
 
 
 \def\french@fontsetup{%

diff --git a/tex/gloss-german.ldf b/tex/gloss-german.ldf
@@ -193,9 +193,9 @@
 % Register default options
 \InitializeGlossOptions{german}{variant=german,spelling=new,script=latin,babelshorthands=false}
 % Register alias options
-\SetLanguageAliasValues{german}{spelling}{new}{1996}
-\SetLanguageAliasValues{german}{spelling}{old}{1901}
-\SetLanguageAliasValues{german}{script}{blackletter}{fraktur}
+\SetLanguageAliasValues{german}{spelling}{new,1996}
+\SetLanguageAliasValues{german}{spelling}{old,1901}
+\SetLanguageAliasValues{german}{script}{blackletter,fraktur}
 
 \ifsystem@babelshorthands
   \SetGlossOptions{german}{babelshorthands=true}

diff --git a/tex/gloss-greek.ldf b/tex/gloss-greek.ldf
@@ -154,8 +154,8 @@
 % Register default options
 \InitializeGlossOptions{greek}{variant=monotonic,numerals=greek}
 % Register alias options
-\SetLanguageAliasValues{greek}{variant}{monotonic}{mono}
-\SetLanguageAliasValues{greek}{variant}{polytonic}{poly}
+\SetLanguageAliasValues{greek}{variant}{monotonic,mono}
+\SetLanguageAliasValues{greek}{variant}{polytonic,poly}
 
 \def\monogreekcaptions{%
    \def\refname{Αναφορές}%

diff --git a/tex/polyglossia.sty b/tex/polyglossia.sty
@@ -1928,17 +1928,16 @@
 \cs_generate_variant:Nn \keys_precompile:nnN { nec }
 
 % Record synonymous keyvals such as variant=us and variant=american
-% Syntax: \SetLanguageAliasValues{<lang>}{<key>}{<val>}{<alias vals, comma-separated>}
-\NewDocumentCommand \SetLanguageAliasValues { m m m m }
+% Syntax: \SetLanguageAliasValues{<lang>}{<key>}{<alias vals, comma-separated>}
+\int_new:N \l_xpg_alias_keyvals_int
+\int_set:Nn \l_xpg_alias_keyvals_int { 2 }
+\NewDocumentCommand \SetLanguageAliasValues { m m m }
 {
-   \prop_if_exist:cF { xpg@alias@keyvals@#1@#3 }
-      { \prop_new:c {xpg@alias@keyvals@#1@#3} }
-   \prop_put:cnn { xpg@alias@keyvals@#1@#3 }
-      {#2}{#4}
-   \prop_if_exist:cF { xpg@alias@keyvals@#1@#4 }
-      { \prop_new:c {xpg@alias@keyvals@#1@#4} }
-   \prop_put:cnn { xpg@alias@keyvals@#1@#4 }
-      {#2}{#3}
+  \clist_map_inline:nn { #3 }
+    {
+      \int_const:cn { c_xpg_alias_keyvals_#1_#2_##1_int } { \l_xpg_alias_keyvals_int }
+    }
+  \int_incr:N \l_xpg_alias_keyvals_int
 }
 
 \cs_new:Npn \xpg__keyval_parser:nnN #1 #2 #3 % #1 = key-vals, #2 = language, #3 = prop
@@ -1963,38 +1962,16 @@
   }
 
 \prg_set_conditional:Npnn \__xpg_check_option_value:NNN #1#2#3 { p , T , F , TF }
-{
-  \prop_get:NnNTF \l_xpg_curropt_prop { #1 / #2 } \l_tmpa_tl
-     {
-       \str_if_eq:eeTF{\l_tmpa_tl}{#3}
-          {\prg_return_true:}
-          {
-            \cs_if_exist:cTF {xpg@alias@keyvals@#1@#3} 
-            {
-            \prop_get:cnNTF {xpg@alias@keyvals@#1@#3} {#2} \l_tmpb_tl
-               {
-                \clist_set:Ne{\l_tmpa_clist}{\l_tmpb_tl}
-                \bool_if_exist:NF \l__xpg_val_found_bool
-                       { \bool_new:N \l__xpg_val_found_bool }
-                \bool_set_false:N \l__xpg_val_found_bool
-                \clist_map_inline:Nn \l_tmpa_clist {
-                   \str_if_eq:eeT{##1}{\l_tmpa_tl}
-                      { \bool_set_true:N \l__xpg_val_found_bool }
-                }
-                \bool_if:nTF \l__xpg_val_found_bool
-                       { \prg_return_true: }
-                       { \prg_return_false: }
-              }
-              {
-                \prg_return_false:
-              }
-            } { \prg_return_false: }
-         }
-     }
-     {
-       \prg_return_false:
-     }
-}
+  {
+    \int_compare:nNnTF
+      {
+        \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_#3_int } { 0 }
+      } = 
+      {
+        \cs_if_exist_use:cF { c_xpg_alias_keyvals_#1_#2_\prop_item:Nn \l_xpg_curropt_prop { #1 / #2 }_int } { 1 }
+      }
+      { \prg_return_true: } { \prg_return_false: }
+  }
 
 \prg_set_conditional:Npnn \xpg_if_main_language:n #1 { T, F, TF }
 {