Cleanup for descriptions

diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
index 205f5c1196c3a9890a9c9e173ac229b8e050036a..fcccd1b733eefcbf7acedc6bda5f538db0df1188 100644 (file)
--- a/rules/base.extras.xml.in
+++ b/rules/base.extras.xml.in
@@ -7,57 +7,50 @@
       <configItem>
         <name>apl</name>
         <_shortDescription>apl</_shortDescription>
-        <_description>APL Keyboard Symbols</_description>
+        <_description>APL keyboard symbols</_description>
         <languageList><iso639Id>eng</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
             <name>dyalog</name>
-            <shortDescription>dyalog</shortDescription>
-            <description>dyalog</description>
+            <shortDescription>dlg</shortDescription>
+            <description>APL keyboard symbols (Dyalog)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>sax</name>
             <shortDescription>sax</shortDescription>
-            <description>sax</description>
+            <description>APL keyboard symbols (sax)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>unified</name>
-            <shortDescription>unified</shortDescription>
-            <description>unified</description>
+            <shortDescription>ufd</shortDescription>
+            <description>APL keyboard symbols (unified)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>apl2</name>
             <shortDescription>apl2</shortDescription>
-            <description>apl2</description>
+            <description>APL keyboard symbols (IBM APL2)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>aplplusII</name>
-            <shortDescription>aplplusII</shortDescription>
-            <description>aplplusII</description>
+            <shortDescription>aplII</shortDescription>
+            <description>APL keyboard symbols (Manugistics APL*PLUS II)</description>
           </configItem>
         </variant>
         <variant>
           <configItem>
             <name>aplx</name>
             <shortDescription>aplx</shortDescription>
-            <description>aplx</description>
-          </configItem>
-        </variant>
-        <variant>
-          <configItem>
-            <name>dyalog_base</name>
-            <shortDescription>dyalog_base</shortDescription>
-            <description>dyalog without box or op-codes</description>
+            <description>APL keyboard symbols (APLX unified)</description>
           </configItem>
         </variant>
       </variantList>
@@ -362,14 +355,14 @@
       <configItem>
         <name>il</name>
         <_shortDescription>he</_shortDescription>
-        <_description>Hebrew (Biblical SIL)</_description>
+        <_description>Hebrew</_description>
         <languageList><iso639Id>heb</iso639Id></languageList>
       </configItem>
       <variantList>
         <variant>
           <configItem>
-            <name>SIL Phonetic</name>
-            <_description>Biblical SIL phonetic</_description>
+            <name>biblicalSIL</name>
+            <_description>Hebrew (Biblical, SIL phonetic)</_description>
             <languageList><iso639Id>heb</iso639Id></languageList>
           </configItem>
         </variant>

diff --git a/rules/base.xml.in b/rules/base.xml.in
index 44b22873c7648f291ae6a79b165cef46ba07e8f8..5f061816641041ff4383d439ec71dd2a665cff9a 100644 (file)
--- a/rules/base.xml.in
+++ b/rules/base.xml.in
@@ -1296,7 +1296,7 @@
         <variant>
           <configItem>
             <name>dvorak-intl</name>
-            <_description>English (Dvorak international with dead keys)</_description>
+            <_description>English (Dvorak, international with dead keys)</_description>
           </configItem>
         </variant>
         <variant>
@@ -1378,6 +1378,12 @@
             <_description>English (Workman)</_description>
           </configItem>
         </variant>
+        <variant>
+          <configItem>
+            <name>workman-intl</name>
+            <_description>English (Workman, international with dead keys)</_description>
+           </configItem>
+         </variant>
       </variantList>
     </layout>
     <layout>
@@ -4235,7 +4241,7 @@
         <name>rs</name>
         <!-- Keyboard indicator for Serbian layouts -->
         <_shortDescription>sr</_shortDescription>
-        <_description>Serbian (Cyrillic)</_description>
+        <_description>Serbian</_description>
         <languageList>
           <iso639Id>srp</iso639Id>
         </languageList>
@@ -5511,7 +5517,7 @@
           <configItem>
             <name>gag</name>
             <_shortDescription>gag</_shortDescription>
-            <_description>Gagauz</_description>
+            <_description>Moldavian (Gagauz)</_description>
             <languageList><iso639Id>gag</iso639Id></languageList>
           </configItem>
         </variant>

diff --git a/symbols/apl b/symbols/apl
index 6fa993e36a4b4db90ea4a002fb7a01a19b95d219..ebc4115e61adbce76f9f89ebd56edd1dbec36937 100644 (file)
--- a/symbols/apl
+++ b/symbols/apl
@@ -41,6 +41,8 @@
 default partial alphanumeric_keys
 xkb_symbols "basic" {
        include "apl(dyalog_base)"      // forward reference good APL keyboard without Dyalogs extras
+
+       name[Group1]= "APL keyboard symbols";
 };
 
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -62,7 +64,6 @@ xkb_symbols "basic" {
 
 partial hidden alphanumeric_keys
 xkb_symbols "common" {
-       name[Group1]= "APL";
 
        key <AB01> { [  U2282           ] }; // Z: ⊂ -- Subset Of
        key <AB02> { [  U2283           ] }; // X: ⊃ -- Superset Of
@@ -127,7 +128,7 @@ xkb_symbols "common" {
 
 partial alphanumeric_keys
 xkb_symbols "unified" {
-       name[Group1]= "APL Keyboard Symbols: Unified Layout";
+       name[Group1]= "APL keyboard symbols (unified)";
 
        include "apl(common)"
 
@@ -160,7 +161,7 @@ xkb_symbols "unified" {
 
 partial alphanumeric_keys
 xkb_symbols "sax" {
-       name[Group1]= "APL Keyboard Symbols";
+       name[Group1]= "APL keyboard symbols (sax)";
 
        include "apl(unified)"
 
@@ -222,7 +223,7 @@ xkb_symbols "sax" {
 
 partial alphanumeric_keys
 xkb_symbols "apl2" {
-       name[Group1]= "APL Keyboard Symbols: IBM APL2";
+       name[Group1]= "APL keyboard symbols (IBM APL2)";
 
        include "apl(common)"
 
@@ -282,10 +283,10 @@ xkb_symbols "apl2" {
 
 partial alphanumeric_keys
 xkb_symbols "aplplusII" {
-       name[Group1]= "APL Keyboard Symbols: Manugistics APL*PLUS II";
        // AFS - short for APL Functional Symbol
 
        include "apl(apl2)"
+       name[Group1]= "APL keyboard symbols (Manugistics APL*PLUS II)";
 
        key <AC10> { [  bracketleft,    parenleft,      U234E   ] }; // ;: ⍎ -- [See B key in SAX layout]
        key <AC11> { [  bracketright,   parenright,     U2355   ] }; // ': ⍕ -- [See N key in SAX layout] 
@@ -319,10 +320,10 @@ xkb_symbols "aplplusII" {
 
 partial alphanumeric_keys
 xkb_symbols "aplx" {
-       name[Group1]= "APL Keyboard Symbols: APLX Unified APL Layout";
-
        include "apl(unified)"
 
+       name[Group1]= "APL keyboard symbols (APLX unified)";
+
        key <AB08> { [  U235D,          U236A   ] }; // ,: ⍝ ⍪ -- APL Functional Symbol Up Shoe Jot / APL Functional Symbol Comma Bar
        key <AB09> { [  U2340,          U2364   ] }; // .: ⍀ ⍤ -- APL Functional Symbol Backslash Bar / APL Functional Symbol Jot Diaeresis
        key <AB10> { [  U233F                   ] }; // /: ⌿ -- APL Functional Symbol Slash Bar
@@ -361,9 +362,8 @@ xkb_symbols "aplx" {
 // the alphabet and similar. If this keyboard is placed as the 2nd layout then it can
 // be reached with a latching shift to increase group by one.
 
-partial alphanumeric_keys
+partial hidden alphanumeric_keys
 xkb_symbols "dyalog_base" {
-       name[Group1]="APL";
 
 
 // ┌─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┬─────┲━━━━━━━━━┓
@@ -433,9 +433,8 @@ xkb_symbols "dyalog_base" {
        key <TLDE> { [ U22c4                    ] };    // diamond
 };
 
-partial keypad_keys
+partial hidden keypad_keys
 xkb_symbols "dyalog_box" {
-       name[Group1]="Dyalog box";
 
 // ┌───┬───┬───┬───┐
 // │   │   │   │   │
@@ -463,8 +462,8 @@ xkb_symbols "dyalog_box" {
 
 }; 
 
+partial hidden
 xkb_symbols "dyalog_codes" {
-       name[Group1]="Dyalog Codes";
 
 //     Layout of private use area for this. In the style of the Unicode book
 //
@@ -601,6 +600,6 @@ xkb_symbols "dyalog" {
        include "apl(dyalog_base)"
        include "apl(dyalog_box)"
        include "apl(dyalog_codes)"
-       name[Group1] = "Dyalog APL complete";
+       name[Group1] = "APL keyboard symbols (Dyalog)";
 };
 

diff --git a/symbols/il b/symbols/il
index 6617d2dfc7fdf6dd5ccadaabbac12bf13e1296f0..78425339bd632648e4366954b3070398878ea5e5 100644 (file)
--- a/symbols/il
+++ b/symbols/il
@@ -258,6 +258,8 @@ xkb_symbols "biblical" {
        key <SPCE> { [ space, space, thinspace, nobreakspace ] };
 };
 
+// EXTRAS
+
 // Biblical hebrew (SIL) US Standard layout version 1.5
 // This map is based closely on v 1.5 of the standard. The only deviation being the replacement of the composite characters sin and shin 
 // by their more recent Unicodev6 counterparts
@@ -267,7 +269,7 @@ xkb_symbols "biblical" {
 // This linux port created and maintained by Dennis Meulensteen, dennis@meulensteen.nl
 partial alphanumeric_keys 
 xkb_symbols "biblicalSIL" {
-       name[Group1]= "Israel - Biblical Hebrew SIL Phonetic";
+       name[Group1]= "Hebrew (Biblical, SIL phonetic)";
        key.type = "FOUR_LEVEL_SEMIALPHABETIC";
 
        key <TLDE> { [ U20AC,           U20AA,          U0024 ] };                      //Euro,                 Shekel,                 Dollar          -

diff --git a/symbols/rs b/symbols/rs
index 71541bcbc17b19f0f578db57ef4980b7d7392fd6..1b88d0131614367dc4de38ebc89f710cd0a5d89d 100644 (file)
--- a/symbols/rs
+++ b/symbols/rs
@@ -42,7 +42,7 @@ partial alphanumeric_keys
 xkb_symbols "yz" {
   // Cyrillic_zhe and Cyrillic_ze swapped.
 
-  name[Group1]= "Serbian (Z and ZHE swapped)";
+  name[Group1]= "Serbian (Cyrillic, Z and ZHE swapped)";
 
   include "rs(basic)"
 
@@ -280,7 +280,7 @@ xkb_symbols "latinunicodeyz" {
 xkb_symbols "alternatequotes" {
   // Another acceptable »pair of quotes« for Serbian 
 
-  name[Group1]= "Serbian (with guillemets)";
+  name[Group1]= "Serbian (Cyrillic with guillemets)";
 
   include "rs(basic)"
 

diff --git a/symbols/us b/symbols/us
index 4b4c701c7a71ba96409cb8c498bfbeeef6e56d9f..84bf15e76c0c89a6a605841d3d9a380bd8ba8fd8 100644 (file)
--- a/symbols/us
+++ b/symbols/us
@@ -259,7 +259,7 @@ xkb_symbols "dvorak" {
 partial alphanumeric_keys
 xkb_symbols "dvorak-intl" {
 
-    name[Group1]= "English (Dvorak international with dead keys)";
+    name[Group1]= "English (Dvorak, international with dead keys)";
 
     include "us(dvorak)"