symbols/is: remove an obsolete comment and some unneeded comments

The comment about "corrected" is out-of-date because most of the changes
that were made by Bjarni have been undone.  And the extensive historical
text is present in macintosh_vndr/is; no need to duplicate it here.

Also, move the TLDE key to its normal position, and drop the definition
of the SPCE key as it doesn't change anything over the default.

1 files changed, 9 insertions, 68 deletions

diff --git a/symbols/is b/symbols/is
index a1153305..08c3001a 100644
--- a/symbols/is
+++ b/symbols/is
@@ -1,10 +1,5 @@
 // Icelandic keyboard layout, by Hrafnkell Eiriksson - hkelle@rhi.hi.is
-//     fixes by Olafur Osvaldsson - oli@isnic.is
-//
-// "basic" corrected according to the Icelandic standard for keyboards,
-//     IST 125:1995 (some symbols substituted by a dead diacritic).
-//     Some positions are according to IST ISO/IEC 9995-3:1994
-//     Added nobreakspace
+// Fixes by Olafur Osvaldsson - oli@isnic.is - and Bjarni Ingi Gislason.
 
 default partial alphanumeric_keys
 xkb_symbols "basic" {
@@ -13,7 +8,7 @@ xkb_symbols "basic" {
 
     name[Group1]="Icelandic";
 
-//  <AE00> = <TLDE>
+    key <TLDE>	{ [dead_abovering, dead_diaeresis, notsign,    hyphen ] };
     key <AE02>	{ [         2,   quotedbl,  twosuperior,    oneeighth ]	};
     key <AE04>	{ [         4,     dollar,   onequarter,     currency ]	};
     key <AE11>	{ [odiaeresis, Odiaeresis,    backslash, questiondown ]	};
@@ -26,62 +21,19 @@ xkb_symbols "basic" {
     key <AC03>	{ [         d,          D,  U201e,       U201c ] };
     key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
     key <AC11>	{ [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
-    key <TLDE>	{ [dead_abovering,  dead_diaeresis,      notsign,      hyphen ]	};
-
-//  <AC12> = <BKSL>
     key <BKSL>	{ [      plus,   asterisk,   grave,   dead_breve ]	};
 
-//  <AB00> = <LSGT>, is in file "pc": pc105
     key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
 
-    key <SPCE>  { [     space,      space,  space, space ] };
-
     include "level3(ralt_switch)"
 };
 
+// Copied from macintosh_vndr/is.
 // Copyright (C) 2004, 2006 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
-//
-// = HISTORY
-// * 2004-09-28:
-//   Initial cleanroom writing of the keymap, I just booted Mac OS X, opened
-//   TextEdit.app and wrote down what the value produced by each key was when I
-//   pressed it, a for a, A for shift + a, å for lalt + a etc and made the
-//   keymap from that information
-//
-// * 2006-01-14:
-//   Revised the comments in the file
-//
-// * 2013-05-30:
-//   Renamed the old keyboard layout and created a new one that conforms with the later
-//   model Apple laptop and Aluminium USB/Bluetooth keyboards (A1243/A1255 and later)
-//   that are used with the more recent versions of OS X. Also replaced some Unicode
-//   codes with proper symbol names.
-//
-// = NOTES
-// * 20 characters in this keymap have no named character defined in
-//   include/keysymdef.h and as a result their Unicode code points in
-//   hexadecimal are listed here, these can be generated with the following
-//   perl command:
-//     $ perl -CA -e 'printf "U%x\n", ord shift' Æ
-//   and converted back like:
-//     $ perl -CO -le '$_=shift;s/[^a-f0-9]//ig;print chr hex' Uc6
-// * The Apple logo appears twice on this keymap like the Mac OS and Mac OS X
-//   keymaps. In the MacRoman encoding it has the code point 0xF0 (240) but it
-//   has no assigned code point in Unicode, the code point Apple uses for it is
-//   U+F8FF (63743) which is in the BMP's Private Use Area (U+E000–U+F8FF)
-// * This keymap has only been tested on a PowerBook6,5 (iBook G4) but it
-//   should work on other Apple laptop models which use the same keyboard
-//   layout. It will probably work on standard sized keyboards with little or
-//   no modification but it might not support them fully, please report if
-//   you're able to get it running with such a keyboard
-
-// Copied from macintosh_vndr/is
-
 xkb_symbols "mac_legacy" {
     name[Group1]= "Icelandic (Macintosh, legacy)";
 
-    //-- Row 5 (E) --//
-    key <TLDE> { [ sterling,   section,    UF8FF,        apostrophe ] };
+    key <TLDE> { [ sterling,   section,    UF8FF,        apostrophe ] }; // Apple logo
     key <AE01> { [ 1,          exclam,     exclamdown,   VoidSymbol ] };
     key <AE02> { [ 2,          quotedbl,   at,           VoidSymbol ] };
     key <AE03> { [ 3,          numbersign, U2122,        sterling   ] };
@@ -95,8 +47,6 @@ xkb_symbols "mac_legacy" {
     key <AE11> { [ odiaeresis, Odiaeresis, oslash,       Ooblique   ] };
     key <AE12> { [ minus,      underscore, endash,       emdash     ] };
 
-
-    //-- Row 4 (D) --//
     key <AD01> { [ q,          Q,        paragraph,       VoidSymbol ] };
     key <AD02> { [ w,          W,        U2211,           VoidSymbol ] };
     key <AD03> { [ e,          E,        dead_grave,      VoidSymbol ] };
@@ -110,8 +60,6 @@ xkb_symbols "mac_legacy" {
     key <AD11> { [ eth,        Eth,      U201e,           U201c      ] };
     key <AD12> { [ apostrophe, question, questiondown,    U00B7      ] };
 
-
-    //-- Row 3 (C) --//
     key <AC01> { [ a,          A,                aring,     Aring      ] };
     key <AC02> { [ s,          S,                ssharp,    abovedot   ] };
     key <AC03> { [ d,          D,                U2202,     U2DA       ] };
@@ -125,9 +73,7 @@ xkb_symbols "mac_legacy" {
     key <AC11> { [ dead_acute, dead_diaeresis,   U201A,     U2018      ] };
     key <BKSL> { [ plus,       asterisk,         U2022,     plusminus  ] };
 
-
-    //-- Row 2  (B) --//
-    key <LSGT> { [ less,   greater,   section,          UF8FF          ] };
+    key <LSGT> { [ less,   greater,   section,          UF8FF          ] }; // Apple logo
     key <AB01> { [ z,      Z,         U3A9,             VoidSymbol     ] };
     key <AB02> { [ x,      X,         asciitilde,       VoidSymbol     ] };
     key <AB03> { [ c,      C,         ccedilla,         Ccedilla       ] };
@@ -142,12 +88,13 @@ xkb_symbols "mac_legacy" {
     include "level3(ralt_switch)"
 };
 
+// Layout for newer Apple laptop and Aluminium keyboards (A1243/A1255 and later).
+// Copyright (C) 2013 Ævar Arnfjörð Bjarmason <avarab@gmail.com>
 partial alphanumeric_keys
 xkb_symbols "mac" {
     name[Group1]= "Icelandic (Macintosh)";
 
-    //-- Row 5 (E) --//
-    key <TLDE> { [ degree,     dead_diaeresis, oslash,       Ooblique    ] };
+    key <TLDE> { [ degree, dead_diaeresis, oslash,       Ooblique    ] };
     key <AE01> { [ 1,          exclam,     exclamdown,   VoidSymbol  ] };
     key <AE02> { [ 2,          quotedbl,   at,           VoidSymbol  ] };
     key <AE03> { [ 3,          numbersign, trademark,    sterling    ] };
@@ -161,8 +108,6 @@ xkb_symbols "mac" {
     key <AE11> { [ odiaeresis, Odiaeresis, backslash,    U2260       ] };
     key <AE12> { [ minus,      underscore, endash,       emdash      ] };
 
-
-    //-- Row 4 (D) --//
     key <AD01> { [ q,          Q,          U0040,              paragraph           ] };
     key <AD02> { [ w,          W,          U2211,              U00A7               ] };
     key <AD03> { [ e,          E,          U20AC,              U00BF               ] };
@@ -176,8 +121,6 @@ xkb_symbols "mac" {
     key <AD11> { [ eth,        Eth,        doublelowquotemark, leftdoublequotemark ] };
     key <AD12> { [ apostrophe, question,   asciitilde,         periodcentered      ] };
 
-
-    //-- Row 3 (C) --//
     key <AC01> { [ a,          A,          aring,             Aring               ] };
     key <AC02> { [ s,          S,          ssharp,            abovedot            ] };
     key <AC03> { [ d,          D,          partialderivative, U02DA               ] };
@@ -191,9 +134,7 @@ xkb_symbols "mac" {
     key <AC11> { [ dead_acute, dead_acute, asciicircum,       leftsinglequotemark ] };
     key <BKSL> { [ plus,       asterisk,   grave,             plusminus           ] };
 
-
-    //-- Row 2  (B) --//
-    key <LSGT> { [ less,   greater,   bar,                  UF8FF                ] };
+    key <LSGT> { [ less,   greater,        bar,                  UF8FF                ] }; // Apple logo
     key <AB01> { [ z,      Z,              Greek_OMEGA,          VoidSymbol           ] };
     key <AB02> { [ x,      X,              asciitilde,           VoidSymbol           ] };
     key <AB03> { [ c,      C,              ccedilla,             Ccedilla             ] };