From 96d6df5da9cddedf4931bf8e17f96e242467c661 Mon Sep 17 00:00:00 2001 From: marha Date: Wed, 27 Apr 2011 06:58:32 +0000 Subject: xserver libX11 libxtrans mesa pixman xkeyboard-config git update 27 Apr 2011 --- .../xkeyboard-config/rules/base.extras.xml.in | 20 ++--- xorg-server/xkeyboard-config/symbols/apl | 2 +- xorg-server/xkeyboard-config/symbols/et | 2 +- xorg-server/xkeyboard-config/symbols/lv | 2 +- xorg-server/xkeyboard-config/symbols/us | 4 +- .../xkeyboard-config/tests/genLists4Comparizon.sh | 94 ++++++++++++---------- 6 files changed, 66 insertions(+), 58 deletions(-) (limited to 'xorg-server/xkeyboard-config') diff --git a/xorg-server/xkeyboard-config/rules/base.extras.xml.in b/xorg-server/xkeyboard-config/rules/base.extras.xml.in index 19f8fade7..4faff93c3 100644 --- a/xorg-server/xkeyboard-config/rules/base.extras.xml.in +++ b/xorg-server/xkeyboard-config/rules/base.extras.xml.in @@ -7,7 +7,7 @@ apl <_shortDescription>APL - <_description>APL + <_description>APL Keyboard Symbols eng @@ -40,7 +40,7 @@ ir <_shortDescription>Iran - <_description>Iran + <_description>Persian per @@ -88,13 +88,13 @@ ykeydvorak - <_description>Latvian (US Dvorak, Y-letter variant) + <_description>Latvian (US Dvorak, Y variant) minuskeydvorak - <_description>Latvian (US Dvorak, minus-letter variant) + <_description>Latvian (US Dvorak, minus variant) @@ -106,13 +106,13 @@ ykeydvorakprogr - <_description>Latvian (programmer US Dvorak, Y-letter variant) + <_description>Latvian (programmer US Dvorak, Y variant) minuskeydvorakprogr - <_description>Latvian (programmer US Dvorak - minus-letter variant) + <_description>Latvian (programmer US Dvorak, minus variant) @@ -132,15 +132,15 @@ us - <_shortDescription>USA - <_description>USA + <_shortDescription>en + <_description>English (US) eng intl-unicode - <_description>English (US, international (AltGr Unicode combining) + <_description>English (US, international AltGr Unicode combining) @@ -185,7 +185,7 @@ rs <_shortDescription>Srb - <_description>Serbia + <_description>Serbian srp diff --git a/xorg-server/xkeyboard-config/symbols/apl b/xorg-server/xkeyboard-config/symbols/apl index 4421cc398..0ebc26843 100644 --- a/xorg-server/xkeyboard-config/symbols/apl +++ b/xorg-server/xkeyboard-config/symbols/apl @@ -122,7 +122,7 @@ xkb_symbols "unified" { default partial alphanumeric_keys modifier_keys xkb_symbols "sax" { - name[Group1]= "APL Keyboard Symbols: Sharp APL for Unix"; + name[Group1]= "APL Keyboard Symbols"; include "apl(unified)" diff --git a/xorg-server/xkeyboard-config/symbols/et b/xorg-server/xkeyboard-config/symbols/et index dccf9ca06..22ba892aa 100644 --- a/xorg-server/xkeyboard-config/symbols/et +++ b/xorg-server/xkeyboard-config/symbols/et @@ -14,7 +14,7 @@ xkb_symbols "basic" { partial alphanumeric_keys xkb_symbols "olpc" { - name[Group1]="Ethiopia"; + name[Group1]="Amharic"; key { [ 0x01001369, 0x01001372 ] }; // 1 key { [ 0x0100136a, 0x01001373 ] }; // 2 diff --git a/xorg-server/xkeyboard-config/symbols/lv b/xorg-server/xkeyboard-config/symbols/lv index 97e4220fc..77a9458b0 100644 --- a/xorg-server/xkeyboard-config/symbols/lv +++ b/xorg-server/xkeyboard-config/symbols/lv @@ -452,7 +452,7 @@ xkb_symbols "ykeydvorakprogr" { include "lv(dvorakprogr)" - name[Group1]= "Latvian (programmer US-Dvorak, Y variant)"; + name[Group1]= "Latvian (programmer US Dvorak, Y variant)"; key {[ISO_Level3_Latch, ISO_Level3_Latch, y, Y]}; key {[space, space, y, Y]}; diff --git a/xorg-server/xkeyboard-config/symbols/us b/xorg-server/xkeyboard-config/symbols/us index 19ddae869..1d8bdd0dd 100644 --- a/xorg-server/xkeyboard-config/symbols/us +++ b/xorg-server/xkeyboard-config/symbols/us @@ -992,7 +992,7 @@ partial alphanumeric_keys xkb_symbols "olpc" { include "us(basic)" - name[Group1]= "USA"; + name[Group1]= "English (US)"; // OLPC international US English keyboard layout. // It's a little different from the usual international layout. @@ -1146,7 +1146,7 @@ xkb_symbols "hbs" { partial alphanumeric_keys xkb_symbols "htcdream" { include "inet(htcdream)" - name[Group1]= "English (USA)"; + name[Group1]= "English (US)"; //second row key { [ q, Q, Tab, Tab ] }; diff --git a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh index ccaaba7e0..90981a939 100644 --- a/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh +++ b/xorg-server/xkeyboard-config/tests/genLists4Comparizon.sh @@ -1,43 +1,51 @@ -#!/bin/sh - -# -# This script compares the group names which "have to be", according to the descriptions in base.xml - -# and actually existing in the symbol files. Some differences are ok (like extra double quotes or -# extra escaping character) - but all the rest should be in sync. -# - -ROOT="`dirname $0`/.." -F1=reg2ll.lst -F2=gn2ll.lst - -xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.xml | sort | uniq > $F1 - -for i in $ROOT/symbols/*; do - if [ -f $i ]; then - id="`basename $i`" - export id - gawk 'BEGIN{ - FS = "\""; - id = ENVIRON["id"]; - isDefault = 0; -} -/.*default.*/{ - isDefault = 1; -} -/xkb_symbols/{ - variant = $2; -}/^[[:space:]]*name\[Group1\][[:space:]]*=/{ - if (isDefault == 1) - { - printf "%s:\"%s\"\n",id,$2; - isDefault=0; - } else - { - name=$2; - printf "%s(%s):\"%s\"\n", id, variant, name; - } -}' $i - fi -done | sort | uniq > $F2 - -diff $F1 $F2 +#!/bin/sh + +# +# This script compares the group names which "have to be", according to the descriptions in base.xml - +# and actually existing in the symbol files. Some differences are ok (like extra double quotes or +# extra escaping character) - but all the rest should be in sync. +# + +ROOT="`dirname $0`/.." +F1=reg2ll.lst +F2=gn2ll.lst +F1b=${F1}base +F1e=${F1}extras + +xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.xml > $F1b +xsltproc $ROOT/xslt/reg2ll.xsl $ROOT/rules/base.extras.xml > $F1e +cat $F1b $F1e | sort | uniq > $F1 +rm -f $F1e $F1e + +for i in $ROOT/symbols/*; do + if [ -f $i ]; then + id="`basename $i`" + export id + gawk 'BEGIN{ + FS = "\""; + id = ENVIRON["id"]; + isDefault = 0; +} +/.*default.*/{ + isDefault = 1; +} +/xkb_symbols/{ + variant = $2; +}/^[[:space:]]*name\[Group1\][[:space:]]*=/{ + if (isDefault == 1) + { + printf "%s:\"%s\"\n",id,$2; + isDefault=0; + } else + { + name=$2; + if (variant == "olpc" || variant == "htcdream") + printf "%s:\"%s\"\n", id, name; + else + printf "%s(%s):\"%s\"\n", id, variant, name; + } +}' $i + fi +done | sort | uniq > $F2 + +diff $F1 $F2 -- cgit v1.2.3