Synchronised line endinge with release branch

1 files changed, 73 insertions, 73 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/hr b/xorg-server/xkeyboard-config/symbols/hr
index 874ba0e32..8275259c4 100644
--- a/xorg-server/xkeyboard-config/symbols/hr
+++ b/xorg-server/xkeyboard-config/symbols/hr
@@ -1,73 +1,73 @@
-default partial alphanumeric_keys

-xkb_symbols "basic" {

-

-    name[Group1]="Croatian";

-

-    include "rs(latin)"

-

-    // Redefine these keys to match XFree86 Croatian layout

-    key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };

-    key <AE03> { [         3, numbersign,  asciicircum, dead_circumflex ] };

-    key <AE05> { [         5,    percent,       degree, dead_abovering ] };

-    key <AE07> { [         7,      slash,        grave,   dead_grave ] };

-    key <AB10> { [     minus, underscore, dead_belowdot, dead_abovedot ] };

-};

-

-partial alphanumeric_keys 

-xkb_symbols "us" {

-

-    name[Group1]= "Croatian (US keyboard with Croatian letters)";

-

-    include "us"

-

-    key <AD01> { [    any,    any,	backslash	        ] };

-    key <AD02> { [    any,    any,	bar      	        ] };

-    key <AD03> { [    any,    any, 	EuroSign 	        ] };

-    key <AD06> { [    any,    any,	z,		Z       ] };

-    key <AD11> { [    any,    any, 	scaron,		Scaron  ] };

-    key <AD12> { [    any,    any, 	dstroke, 	Dstroke ] };

-    key <AC04> { [    any,    any,	bracketleft             ] };

-    key <AC05> { [    any,    any,	bracketright            ] };

-    key <AC08> { [    any,    any, 	lstroke                 ] };

-    key <AC09> { [    any,    any,	Lstroke                 ] };

-    key <AC10> { [    any,    any,	ccaron,		Ccaron  ] };

-    key <AC11> { [    any,    any, 	cacute,		Cacute  ] };

-    key <LSGT> { [    any,    any, 	bar			] };

-    key <AB01> { [    any,    any,	y,		Y       ] };

-    key <AB04> { [    any,    any,	at                      ] };

-    key <AB05> { [    any,    any,	braceleft               ] };

-    key <AB06> { [    any,    any,	braceright              ] };

-    key <AB07> { [    any,    any,	section                 ] };

-    key <AB08> { [    any,    any, 	semicolon               ] };

-    key <AB09> { [    any,    any, 	colon			] };

-    key <AB10> { [    any,    any, 	minus,    underscore  	] };

-    key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };

-

-    include "level3(ralt_switch)"

-

-};

-

-

-partial alphanumeric_keys 

-xkb_symbols "alternatequotes" {

-

-    name[Group1]= "Croatian (use guillemets for quotes)";

-

-    include "rs(latinalternatequotes)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "unicode" {

-

-    name[Group1]= "Croatian (use Croatian digraphs)";

-

-    include "rs(latinunicode)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "unicodeus" {

-

-    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";

-

-    include "rs(latinunicodeyz)"

-};

+default partial alphanumeric_keys
+xkb_symbols "basic" {
+
+    name[Group1]="Croatian";
+
+    include "rs(latin)"
+
+    // Redefine these keys to match XFree86 Croatian layout
+    key <AE01> { [         1,     exclam,   asciitilde,   dead_tilde ] };
+    key <AE03> { [         3, numbersign,  asciicircum, dead_circumflex ] };
+    key <AE05> { [         5,    percent,       degree, dead_abovering ] };
+    key <AE07> { [         7,      slash,        grave,   dead_grave ] };
+    key <AB10> { [     minus, underscore, dead_belowdot, dead_abovedot ] };
+};
+
+partial alphanumeric_keys 
+xkb_symbols "us" {
+
+    name[Group1]= "Croatian (US keyboard with Croatian letters)";
+
+    include "us"
+
+    key <AD01> { [    any,    any,	backslash	        ] };
+    key <AD02> { [    any,    any,	bar      	        ] };
+    key <AD03> { [    any,    any, 	EuroSign 	        ] };
+    key <AD06> { [    any,    any,	z,		Z       ] };
+    key <AD11> { [    any,    any, 	scaron,		Scaron  ] };
+    key <AD12> { [    any,    any, 	dstroke, 	Dstroke ] };
+    key <AC04> { [    any,    any,	bracketleft             ] };
+    key <AC05> { [    any,    any,	bracketright            ] };
+    key <AC08> { [    any,    any, 	lstroke                 ] };
+    key <AC09> { [    any,    any,	Lstroke                 ] };
+    key <AC10> { [    any,    any,	ccaron,		Ccaron  ] };
+    key <AC11> { [    any,    any, 	cacute,		Cacute  ] };
+    key <LSGT> { [    any,    any, 	bar			] };
+    key <AB01> { [    any,    any,	y,		Y       ] };
+    key <AB04> { [    any,    any,	at                      ] };
+    key <AB05> { [    any,    any,	braceleft               ] };
+    key <AB06> { [    any,    any,	braceright              ] };
+    key <AB07> { [    any,    any,	section                 ] };
+    key <AB08> { [    any,    any, 	semicolon               ] };
+    key <AB09> { [    any,    any, 	colon			] };
+    key <AB10> { [    any,    any, 	minus,    underscore  	] };
+    key <BKSL> { [    any,    any,	zcaron,	    Zcaron      ] };
+
+    include "level3(ralt_switch)"
+
+};
+
+
+partial alphanumeric_keys 
+xkb_symbols "alternatequotes" {
+
+    name[Group1]= "Croatian (use guillemets for quotes)";
+
+    include "rs(latinalternatequotes)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicode" {
+
+    name[Group1]= "Croatian (use Croatian digraphs)";
+
+    include "rs(latinunicode)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "unicodeus" {
+
+    name[Group1]= "Croatian (US keyboard with Croatian digraphs)";
+
+    include "rs(latinunicodeyz)"
+};