Synchronised line endinge with release branch

1 files changed, 48 insertions, 48 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/fo b/xorg-server/xkeyboard-config/symbols/fo
index d3d378a69..b0b24ce75 100644
--- a/xorg-server/xkeyboard-config/symbols/fo
+++ b/xorg-server/xkeyboard-config/symbols/fo
@@ -1,48 +1,48 @@
-partial default alphanumeric_keys 

-xkb_symbols "basic" {

-

-    include "latin(type2)"

-

-    name[Group1]= "Faroese";

-

-    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};

-    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};

-    key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ] };

-

-    key <AE05>	{ [         5,    percent,     NoSymbol,         cent ] };

-    key <AE06>	{ [         6,  ampersand,          yen,     NoSymbol ] };

-    key <AE11>	{ [      plus,   question,    plusminus, questiondown ] };

-    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ] };

-

-    key <AB03>	{ [         c,          C,    copyright,     NoSymbol ] };

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

-

-    key <AC03>	{ [         d,          D,          eth,          ETH ] };

-    key	<AC10>	{ [        ae,	       AE	] };

-    key <AC11>	{ [    oslash,   Ooblique 	] };

-

-    key <AD08>	{ [         i,          I       ] };

-    key <AD11>	{ [     aring,      Aring, dead_diaeresis, dead_circumflex ] };

-    key <AD12>	{ [       eth,        ETH,   dead_tilde,   dead_caron ] };

-

-    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};

-

-    include "level3(ralt_switch)"

-};

-

-partial alphanumeric_keys 

-xkb_symbols "nodeadkeys" {

-

-    include "fo(basic)"

-

-    name[Group1]= "Faroese (eliminate dead keys)";

-

-    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};

-    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};

-    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};

-    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};

-    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};

-    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};

-    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};

-    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};

-};

+partial default alphanumeric_keys 
+xkb_symbols "basic" {
+
+    include "latin(type2)"
+
+    name[Group1]= "Faroese";
+
+    key <TLDE>	{ [   onehalf,   section, threequarters,    paragraph ]	};
+    key <LSGT>	{ [      less,    greater,    backslash,      notsign ]	};
+    key <SPCE>	{ [     space,      space, nobreakspace, nobreakspace ] };
+
+    key <AE05>	{ [         5,    percent,     NoSymbol,         cent ] };
+    key <AE06>	{ [         6,  ampersand,          yen,     NoSymbol ] };
+    key <AE11>	{ [      plus,   question,    plusminus, questiondown ] };
+    key <AE12>	{ [dead_acute, dead_grave,          bar,    brokenbar ] };
+
+    key <AB03>	{ [         c,          C,    copyright,     NoSymbol ] };
+    key <AB10>	{ [     minus, underscore,       hyphen,       macron ] };
+
+    key <AC03>	{ [         d,          D,          eth,          ETH ] };
+    key	<AC10>	{ [        ae,	       AE	] };
+    key <AC11>	{ [    oslash,   Ooblique 	] };
+
+    key <AD08>	{ [         i,          I       ] };
+    key <AD11>	{ [     aring,      Aring, dead_diaeresis, dead_circumflex ] };
+    key <AD12>	{ [       eth,        ETH,   dead_tilde,   dead_caron ] };
+
+    key <BKSL>	{ [apostrophe,   asterisk, dead_doubleacute, multiply ]	};
+
+    include "level3(ralt_switch)"
+};
+
+partial alphanumeric_keys 
+xkb_symbols "nodeadkeys" {
+
+    include "fo(basic)"
+
+    name[Group1]= "Faroese (eliminate dead keys)";
+
+    key <AE12>	{ [     acute,      grave,          bar,       ogonek ]	};
+    key <AD11>	{ [     aring,      Aring,    diaeresis,       degree ]	};
+    key <AD12>	{ [ diaeresis, asciicircum,  asciitilde,       macron ]	};
+    key <AC10>	{ [        ae,         AE,        acute,  doubleacute ]	};
+    key <AC11>	{ [    oslash,   Ooblique,  asciicircum,        caron ]	};
+    key <BKSL>	{ [apostrophe,   asterisk,  doubleacute,     multiply ]	};
+    key <AB08>	{ [     comma,  semicolon,      cedilla,       ogonek ]	};
+    key <AB09>	{ [    period,      colon, periodcentered,   abovedot ]	};
+};