Attachment 38353 Details for Bug 29932 – Output of git diff -w (for reference only, no whitespace changes)

Output of git diff -w (for reference only, no whitespace changes)

lt-diff-w (text/plain), 12.37 KB, created by Rimas Kudelis on 2010-09-01 04:25:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rimas Kudelis

Created: 2010-09-01 04:25:38 UTC

Size: 12.37 KB

patch

obsolete

>diff --git a/symbols/lt b/symbols/lt
>index 5956ace..a832d50 100644
>--- a/symbols/lt
>+++ b/symbols/lt
>@@ -1,24 +1,26 @@
> // $XKeyboardConfig$
> 
>-// based on
>-// Lithuanian keyboard map by RiÄardas Äepas <rch@richard.eu.org>
>-// merged into one file by Nerijus BaliÅ«nas
>-// Added number and special characters writing in basic lt layout with RAlt by
>-// Mantas KriauÄiÅ«nas <mantas@akl.lt>, 2004
>+// Separate keymaps merged into one file by Nerijus BaliÅ«nas, 2002
> //
> // $XFree86: xc/programs/xkbcomp/symbols/lt,v 1.3 2002/12/14 22:26:11 dawes Exp $
> 
>-// If you want to have 2 layouts, use
>+// Lithuanian Numeric layout - Lithuanian letters on the numeric row
>+// based on Lithuanian keyboard map by RiÄardas Äepas <rch@richard.eu.org>
>+// 3rd and 4th levels added by Mantas KriauÄiÅ«nas <mantas@akl.lt>, 2004
>+// Minor modifications and cleanup by Rimas Kudelis <rq@akl.lt>, 2010
>+//
>+// If you want two layouts, use:
> // Option "XkbLayout" "lt,lt(us)"
>-
>-// Lithuanian Baltic layout - Lithuanian letters on the numeric row
> partial default alphanumeric_keys modifier_keys
> xkb_symbols "basic" {
> 
>     include "latin"
>+    include "eurosign(e)"
>+    include "level3(ralt_switch)"
> 
>     name[Group1]="Lithuania";
> 
>+    key <TLDE> {[               grave,   asciitilde,    acute                ]};
>     key <AE01>	{ [   aogonek,      Aogonek,        1,      exclam ]	};
>     key <AE02>	{ [    ccaron,       Ccaron,        2,          at ]	};
>     key <AE03>	{ [   eogonek,      Eogonek,        3,  numbersign ]	};
>@@ -29,22 +31,24 @@ xkb_symbols "basic" {
>     key <AE08>	{ [   umacron,      Umacron,        8,    asterisk ]	};
>     key <AE09>	{ [doublelowquotemark,  parenleft,  9,   parenleft ] };
>     key <AE10>	{ [leftdoublequotemark,parenright,  0,  parenright ] };
>+    key <AE11> {[               minus,   underscore,   endash                ]};
>     key <AE12>	{ [    zcaron,       Zcaron,    equal,        plus ]	};
> 
>     key <LSGT>	{ [    endash,   EuroSign   ]	};
>-
>-    include "level3(ralt_switch)"
> };
> 
>-// Similar to the above, but you should use Right Alt + numeric row
>+// Similar to the above, but uses 3rd and 4th levels in the numeric row
> // for Lithuanian letters
> partial alphanumeric_keys modifier_keys
> xkb_symbols "us" {
> 
>     include "latin"
>+    include "eurosign(e)"
>+    include "level3(ralt_switch)"
> 
>     name[Group1]="Lithuania - US keyboard with Lithuanian letters";
> 
>+    key <TLDE> {[    grave,    asciitilde,               acute               ]};
>     key <AE01>	{ [         1,     exclam,      aogonek,      Aogonek ]	};
>     key <AE02>	{ [         2,         at,       ccaron,       Ccaron ]	};
>     key <AE03>	{ [         3, numbersign,      eogonek,      Eogonek ]	};
>@@ -55,25 +59,28 @@ xkb_symbols "us" {
>     key <AE08>	{ [         8,   asterisk,      umacron,      Umacron ]	};
>     key <AE09>	{ [         9,  parenleft, doublelowquotemark,  parenleft ] };
>     key <AE10>	{ [         0, parenright, leftdoublequotemark,parenright ] };
>+    key <AE11> {[    minus,    underscore,              endash               ]};
>     key <AE12>	{ [     equal,       plus,       zcaron,       Zcaron ]	};
> 
>-    key <AD03>	{ [         e,          E,       endash,     EuroSign ]	};
>     key <LSGT>	{ [    endash,   EuroSign ]	};
>-
>-    include "level3(ralt_switch)"
> };
> 
>-// Lithuanian keyboard map by Gediminas Paulauskas <menesis@delfi.lt>
>-// Minor modification by RiÄardas Äepas according to http://sun3.mif.vu.lt/cs/TK4/lithkeyb.html
>-
>-// Describes Lithuanian keymap LST 1582:2000
>+// Lithuanian keymap LST 1582:2000
>+// The standard is described at http://ims.mii.lt/klav/
> // Extensions:  B01 L3 is "<" , B02 L3 is ">" and B03 L3 is endash to make this
> // layout usable with pc101 and pc104 keyboards.
>+//
>+// Made by Gediminas Paulauskas <menesis@delfi.lt>
>+// Minor modifications by RiÄardas Äepas and Rimas Kudelis
>  
> partial alphanumeric_keys modifier_keys
> xkb_symbols "std" {
> 
>     include "latin"
>+    include "eurosign(e)"
>+    include "nbsp(level3)"
>+    include "kpdl(comma)"
>+    include "level3(ralt_switch)"
> 
>     name[Group1]= "Lithuania - Standard";
> 
>@@ -90,46 +97,46 @@ xkb_symbols "std" {
>     key <AE10> {[	parenright,	0,		bracketright	]};
>     key <AE11> {[	question,	plus,		apostrophe	]};
>     key <AE12> {[	x,		X,		percent		]};
>+
>     key	<AD01> {[	aogonek,	Aogonek		]};
>     key	<AD02> {[	zcaron,		Zcaron		]};
>-    key	<AD03> {[	e,		E,		EuroSign	]};
>     key	<AD11> {[	iogonek,	Iogonek,	braceleft	]};
>     key	<AD12> {[	w,		W,		braceright	]};
>+
>     key	<AC04> {[	scaron,		Scaron		]};
>     key <AC10> {[	uogonek,	Uogonek		]};
>     key <AC11> {[	eabovedot,	Eabovedot,	quotedbl	]};
>+    key <BKSL> {[            q,           Q,                 bar ]};
>+
>+    key <LSGT> {[         less,     greater,              endash ]};
>     key	<AB01> {[	z,		Z,		less		]};
>     key	<AB02> {[	umacron,	Umacron,	greater		]};
>     key	<AB03> {[	c,		C,		endash		]};
>     key	<AB08> {[	ccaron,		Ccaron,		doublelowquotemark  ]};
>     key	<AB09> {[	f,		F,		leftdoublequotemark ]};
>-// this is actually right quote for Lithuanian
>     key	<AB10> {[	eogonek,	Eogonek,	backslash	]};
>-    key <BKSL> {[	q,		Q,		bar		]};
>-    key <SPCE> {[	space,		space,		nobreakspace,	nobreakspace	]};
>-
>-    key	<LSGT> {[	less,		greater,	endash		]};
>-
>-    include "kpdl(comma)"
>-
>-    include "level3(ralt_switch)"
> };
> 
>-// Lithuanian keyboard map by Piter PUNK <piterpk@terra.com.br> 
>-// Describes Lithuanian keymap LST 1205-92
>-//
>+// Lithuanian keymap LST 1205-92
>+// This standard was made deprecated by LST 1582:2000 above.
> // This keyboard is also know as IBM layout.
>-// We follow the map found at: http://www.kada.lt/litwin/Kbdlta.gif
>-// and info from Edis Tamoshauskas <linas_lietus@yahoo.com>
>+// We follow the map shown at: http://www.registrucentras.lt/litwin/kbdlta.gif
>+// and info from Edis TamoÅ¡auskas <linas_lietus@yahoo.com>
>+//
>+// Made by Piter PUNK <piterpk@terra.com.br>
>+// Minor modifications and cleanup by Rimas Kudelis, 2010
>  
> partial alphanumeric_keys modifier_keys
> xkb_symbols "ibm" {
> 
>     include "latin"
>+    include "eurosign(e)"
>+    include "nbsp(level3)"
>+    include "level3(ralt_switch)"
> 
>     name[Group1]= "Lithuania - IBM (LST 1205-92)";
> 
>-    key <TLDE> {[	grave,		asciitilde	]};
>+    key <TLDE> {[              grave,          asciitilde,          acute               ]};
>     key <AE01> {[	exclam,		1		]};
>     key <AE02> {[	quotedbl,	2,		at		]};
>     key <AE03> {[	slash,		3,		numbersign	]};
>@@ -140,24 +147,22 @@ xkb_symbols "ibm" {
>     key <AE08> {[	question,	8,		asterisk	]};
>     key <AE09> {[	parenleft,	9		]};
>     key <AE10> {[	parenright,	0		]};
>-    key <AE11> {[	underscore,	minus		]};
>+    key <AE11> {[         underscore,               minus,         endash               ]};
>     key <AE12> {[	plus,		equal		]};
>+
>     key <AD01> {[	aogonek,	Aogonek,	q,		Q		]};
>     key <AD02> {[	zcaron,		Zcaron,		w,		W		]};
>-    key <AD03> {[	e,		E,		EuroSign	]};
>     key <AD11> {[	iogonek,	Iogonek,	bracketleft,	braceleft	]};
>     key <AD12> {[ doublelowquotemark, leftdoublequotemark, bracketright, braceright	]};
>+
>     key <AC10> {[	uogonek,	Uogonek,	semicolon,	colon		]};
>     key <AC11> {[	eabovedot,	Eabovedot,	apostrophe,	quotedbl	]};
>+
>+    key <LSGT> {[               less,             greater,         endash               ]};
>     key <AB02> {[	umacron,	Umacron,	x,		X		]};
>     key <AB08> {[	ccaron,		Ccaron,		comma,		less		]};
>     key <AB09> {[	scaron,		Scaron,		period,		greater		]};
>     key <AB10> {[	eogonek,	Eogonek,	slash,		question	]};
>-    key <SPCE> {[	space,		space,		nobreakspace,	nobreakspace	]};
>-
>-    key <LSGT> {[	less,		greater,	endash		]};
>-
>-    include "level3(ralt_switch)"
> };
> 
> // LEKP and LEKPa layouts 1.0
>@@ -170,10 +175,17 @@ xkb_symbols "ibm" {
> // http://creativecommons.org/licenses/by-nc-sa/3.0/ or send
> // a letter to Creative Commons, 171 Second Street, Suite 300,
> // San Francisco, California, 94105, USA.
>+//
>+// Minor cleanup by Rimas Kudelis, 2010
> 
> partial alphanumeric_keys modifier_keys
> xkb_symbols "lekp" {
>+    
>+    include "capslock(backspace)"
>+    include "level3(ralt_switch)"
>+    
>     name[Group1]="Lithuania - LEKP";
>+    
>     key <TLDE>  { [     grave,   asciitilde, acute ] };
>     key <AE01>	{ [     slash,   numbersign,               bar ] };
>     key <AE02>	{ [ backslash,           at,           section ] };
>@@ -188,8 +200,6 @@ xkb_symbols "lekp" {
>     key <AE11>	{ [ parenright, leftdoublequotemark, copyright ] };
>     key <AE12>  { [      colon,           ampersand, trademark ] };
> 
>-    key <BKSL>  { [ apostrophe,          underscore ] };
>-
>     key <AD01>  { [          q,                  Q,   EuroSign ] };
>     key <AD02>  { [          g,                  G,          7 ] };
>     key <AD03>  { [          r,                  R,          8 ] };
>@@ -203,7 +213,6 @@ xkb_symbols "lekp" {
>     key <AD11>  { [   question,        bracketleft,   division ] };
>     key <AD12>  { [      equal,       bracketright ] };
> 
>-    key <CAPS>  { [  BackSpace ] };
>     key <AC01>  { [          a,                  A,          0 ] };
>     key <AC02>  { [          k,                  K,          4 ] };
>     key <AC03>  { [          s,                  S,          5 ] };
>@@ -215,7 +224,9 @@ xkb_symbols "lekp" {
>     key <AC09>  { [          i,                  I,       plus ] };
>     key <AC10>  { [          o,                  O,   asterisk ] };
>     key <AC11>  { [          y,                  Y,   multiply ] };
>+    key <BKSL> {[   apostrophe,          underscore                ]};
> 
>+    key <LSGT> {[    semicolon,            quotedbl,      sterling ]};
>     key <AB01>  { [          z,                  Z, asciicircum ] };
>     key <AB02>  { [          x,                  X,          1 ] };
>     key <AB03>  { [          c,                  C,          2 ] };
>@@ -226,15 +237,16 @@ xkb_symbols "lekp" {
>     key <AB08>  { [    umacron,            Umacron,       less ] };
>     key <AB09>  { [    aogonek,            Aogonek,    greater ] };
>     key <AB10>  { [          h,                  H ] };
>-
>-    key <LSGT>  { [  semicolon,           quotedbl,   sterling ] };
>-
>-    include "level3(ralt_switch)"
> };
> 
> partial alphanumeric_keys modifier_keys
> xkb_symbols "lekpa" {
>+
>+    include "capslock(backspace)"
>+    include "level3(ralt_switch)"
>+
>     name[Group1]="Lithuania - LEKPa";
>+
>     key <TLDE>  { [     grave,   asciitilde,             acute ] };
>     key <AE01>	{ [     slash,     quotedbl,               bar ] };
>     key <AE02>	{ [ backslash,           at,           section ] };
>@@ -249,8 +261,6 @@ xkb_symbols "lekpa" {
>     key <AE11>	{ [ parenright, leftdoublequotemark, copyright ] };
>     key <AE12>  { [      colon,   semicolon,         trademark ] };
> 
>-    key <BKSL>  { [ apostrophe,          underscore ] };
>-
>     key <AD01>  { [          q,                  Q,   EuroSign ] };
>     key <AD02>  { [          g,                  G,          7 ] };
>     key <AD03>  { [          r,                  R,          8 ] };
>@@ -264,7 +274,6 @@ xkb_symbols "lekpa" {
>     key <AD11>  { [   question,        bracketleft,   division ] };
>     key <AD12>  { [      equal,       bracketright ] };
> 
>-    key <CAPS>  { [  BackSpace ] };
>     key <AC01>  { [          a,                  A,          0 ] };
>     key <AC02>  { [          k,                  K,          4 ] };
>     key <AC03>  { [          s,                  S,          5 ] };
>@@ -276,6 +285,7 @@ xkb_symbols "lekpa" {
>     key <AC09>  { [          i,                  I,       plus ] };
>     key <AC10>  { [          o,                  O,   asterisk ] };
>     key <AC11>  { [          y,                  Y,   multiply ] };
>+    key <BKSL> {[   apostrophe,          underscore                ]};
> 
>     key <AB01>  { [          z,                  Z, asciicircum ] };
>     key <AB02>  { [          x,                  X,          1 ] };
>@@ -287,8 +297,5 @@ xkb_symbols "lekpa" {
>     key <AB08>  { [    umacron,            Umacron,       less ] };
>     key <AB09>  { [    aogonek,            Aogonek,    greater ] };
>     key <AB10>  { [          h,                  H ] };
>-
>-
>-    include "level3(ralt_switch)"
> };
> 
>diff --git a/symbols/nbsp b/symbols/nbsp
>index 2f273be..0c3d403 100644
>--- a/symbols/nbsp
>+++ b/symbols/nbsp
>@@ -32,7 +32,7 @@ xkb_symbols "level2" {
> // level3 & level3ns provide no-breaking spaces starting from level3
> // This is good for typographers but experience shows many users accidently
> // type no-breaking spaces on the CLI (resulting in errors)
>-// Used by fr(latin9)
>+// Used by fr(latin9) and lt(std)
> partial
> xkb_symbols "level3" {
>   key <SPCE> {

Actions: View

Attachments on bug 29932: 38353 | 38354

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.