keys: structure keyboard as html table

Unordered list originally to avoid table for layout purposes,
but keys are clearly to be arranged in a grid.
Mostly moot with CSS, but improves rendering in text browsers.

diff --git a/Shiar_Sheet/Keyboard.pm b/Shiar_Sheet/Keyboard.pm
index 6819236812e00c2e4126d17383766d59481b151c..adaa3ddab066b8ec67358d7d4bea4a2f47dab02b 100644 (file)
--- a/Shiar_Sheet/Keyboard.pm
+++ b/Shiar_Sheet/Keyboard.pm
@@ -113,7 +113,7 @@ sub print_key {
        );
        $flags .= ' chr'.ord(substr $key, -1) if $key ne '^0';
 
-       print qq{\t\t<li class="$flags"$onclick>$keytxt};
+       print qq{\t\t<td class="$flags"$onclick>$keytxt};
        print "\n";
 }
 
@@ -126,12 +126,12 @@ sub print_rows {
        my $defrows = shift || [2, 1, 0];
        my @modes = sort keys %{ $self->{def} };
 
-       print '<ul id="rows">'."\n\n";
+       print '<table id="rows" class="keys">'."\n\n";
 
        for (my $row = -1; $row <= $#{ $keyrows{$self->{map}} }; $row++) {
                my $keyrow = $row < 0 ? [["\e"]] : $keyrows{$self->{map}}->[$row];
 
-               printf qq{<li class="row row%d"><ul>\n}, $row+1;
+               printf qq{<tbody class="row row%d">\n}, $row+1;
                for my $basemode (@modes) {
                        my @moderows = split /\s+/,
                                $row < 0 ? "0" :
@@ -147,30 +147,30 @@ sub print_rows {
                        for my $case (@caserows) {
                                my $keycase = $keyrow->[$case] or next;
                                  @$keycase or next;
+                               my @caseclass;
+                               push @caseclass, 'mode', 'mode'.escapeclass($basemode) if $basemode ne '';
+                               push @caseclass, 'lead' if defined $modekeys->{lead};  # leading command key shown
+                               push @caseclass, $casedesc[$case] if defined $casedesc[$case];
 
-                               printf "\t<li%s>", $basemode ne '' && sprintf(
-                                       ' class="%s"', 'mode mode' . escapeclass($basemode)
+                               printf "\t<tr%s>", @caseclass > 0 && sprintf(
+                                       ' class="%s"', join ' ', @caseclass
                                );
-                               printf('<h3>%s<small>: %s</small></h3>', # XXX insert &nbsp; here to fix msie<=6
+                               printf('<th>%s<small>: %s</small></th>', # XXX insert &nbsp; here to fix msie<=6
                                                $self->{mode}->{$mode} || "mode $basemode",
                                                "$rowdesc[$row] row $casedesc[$case]"
                                ) unless $row < 0;
                                print "\n";
-                               my $caseclass = 'keys';
-                                  $caseclass .= ' lead' if defined $modekeys->{lead};  # leading command key shown
-                                  $caseclass .= " $casedesc[$case]" if defined $casedesc[$case];
-                               print qq{\t\t<ul class="$caseclass">\n};
                                $self->print_key($mode, $_, $modekeys->{$_}) for @$keycase;
-                               print qq{\t\t</ul>\n};
+                               print qq{\t\t</tr>\n};
                        } # case
 
                } # submode
 
                } # basemode
-               print qq{\t</ul>\n};
+               print qq{\t</tbody>\n};
        } # row
 
-       print "</ul>\n";
+       print "</table>\n";
 }
 
 sub print_legend {

diff --git a/base.css b/base.css
index 37a5716f37fe44da368f6740a6e8ebe13caf6a6c..453cb5e636e8caad9042b83db1609cc8d57adfa8 100644 (file)
--- a/base.css
+++ b/base.css
@@ -98,92 +98,97 @@ dl > dd {
 
 /* "keyboard" (list of keys) */
 
-ul#rows {margin-top: -5ex} /* top (esc) row fits besides header */
-li.row2 {margin-left: 7em} /* row offsets relative to ~6em key width */
-li.row3 {margin-left: 8em}
-li.row4 {margin-left: 10em} /* should actually align to next key on row0 */
+#rows {margin-top: -5ex} /* top (esc) row fits besides header */
+.row2 {margin-left: 7em} /* row offsets relative to ~6em key width */
+.row3 {margin-left: 8em}
+.row4 {margin-left: 10em} /* should actually align to next key on row0 */
        /* ...however rows>=1 are shifted a bit, to make space */
 
-li.row {
-       clear: both; /* start new row block (keyboard row) */
-       padding-top: 1ex;
-}
-li.row > ul > li {
+table.keys tr {
        clear: both; /* start new row (screen row) */
-} /* css2 selectors ignored by msie<=6 */
-li.row ul ul {
+       display: block;
+}
+table.keys tbody {
+       /* start new row block (keyboard row) */
        clear: both;
-} /* css1 alternative as well (doesn't match in gecko for some reason) */
+       padding-top: 1ex;
+       display: block;
+}
 
+table.keys th,
 h3      {display: none} /* semantic details (non-css/js) */
-li.mode {display: none} /* initially hidden (only show interactively (js)) */
+.keys .mode {display: none} /* initially hidden (only show interactively (js)) */
 
-#rows {
+table.keys {
+       display: block;
        width: 82.5em; /*       12 * (2px + 1px + 6.2em + 1px + 2px) + 8em*/
-       padding-right: 72px;
+//     padding-right: 72px;
+       border-spacing: 0;
+       border-collapse: collapse;
 }
-#rows > li {
+table.keys > * {
        margin-right: -72px;
 }
 
 /* individual keys */
 
 dl.legend dt,
-ul.keys li {
+.keys td {
        float: left;
        width: 6.2em;
        line-height: 2.25ex; /* a little terser (seems to be gecko's default anyway) */
        height: 4.5ex; /* 2 lines */
        overflow: hidden;
        margin: 0 2px -1px;
+       padding: 0;
        text-align: center;
        border: 1px solid #000;
        border-radius: 4px;
        -moz-border-radius: 4px;
 }
-ul.keys li b {
+.keys td b {
        float: left;
        font-size: 200%;
        line-height: 2.5ex; /* inherits otherwise */
        padding-left: 2px;
 }
-.row0 ul.keys li { /* omni-present esc */
+.keys .row0 td { /* omni-present esc */
        width: 8.5em;
 }
 
 /* fine tuning of special occurrences */
 
-ul.keys li b[title] { /* mnemonic hover */
+.keys td b[title] { /* mnemonic hover */
        cursor: help;
 }
-ul.keys li[onclick]:hover { /* link */
+.keys td[onclick]:hover { /* link */
        cursor: pointer;
 }
-ul.keys li a { /* key link */
+.keys td a { /* key link */
        color: inherit;
        text-decoration: none;
        display: block;
        height: 100%;
 }
 
-ul.keys.meta li b,
-ul.keys.ctrl li b,
-ul.keys.lead li b { /* char with ctrl or leading key */
+.keys .meta td b,
+.keys .ctrl td b,
+.keys .lead td b { /* char with ctrl or leading key */
        font-size: 100%; /* space is too limited for 2+ double-sized chars */
        line-height: 5ex; /* keep double height though */
 }
-ul.keys.meta li b small,
-ul.keys.ctrl li b small { /* meta key indicator */
+.keys .meta td b small,
+.keys .ctrl td b small { /* meta key indicator */
        font-size: 70%;
        font-weight: normal; /* nice and subtle */
 }
 
 /* tables */
 
-table {
+table.map {
        border-collapse: collapse;
 }
-th, td {
+table.map th, table.map td {
        border-color: #778;
        border: 1px solid #888;
        background: #DDD;
@@ -484,25 +489,25 @@ table.dimap {
 .no {
        background: #EEE; /* unassigned */
 }
-ul.keys li.ni {
+.keys td.ni {
        border: 0;
        padding: 1px; /* same size as borderlessless keys */
 }
 
 dl.legend dt.more,
-ul.keys li.more b {
+.keys td.more b {
        text-shadow: #F20 0 0 0.1em;
 }
 dl.legend dt.more:hover,
-ul.keys li.more:hover b {
+.keys td.more:hover b {
        text-shadow: #F20 0 0 0.5em, #FC0 0 0 0.2em;
 }
 dl.legend dt.ext,
-ul.keys li.ext {
+.keys td.ext {
        border-style: dashed;
 }
 dl.legend dt.new,
-ul.keys li.new {
+.keys td.new {
        opacity: .6;
 }
 

diff --git a/keys.js b/keys.js
index 650cb151f9bec2ef0766de40612080ff6fb07de5..b625db79b17a08e533f517a01ad8b2c0e310711b 100644 (file)
--- a/keys.js
+++ b/keys.js
@@ -1,22 +1,14 @@
 function setmode(classname) {
        // set style for each #rows>li>ul>li to display:none unless it matches classname
-       var showclass = classname ? ' '+classname+'(?!\\w)' : '^$';
-       var parentskip = /^keys/;
-       var row = document.getElementById('rows').firstChild;
-       do {
-               if (row.tagName == 'LI' && row.firstChild.tagName == 'UL'
-               && !row.firstChild.className.match(parentskip)) {
-                       var el = row.firstChild.firstChild;
-                       if (el) do {
-                               if (el.tagName == 'LI') {
-                                       el.style.display = el.className.match(showclass) ? 'block' : 'none';
-                               }
-                       } while (el = el.nextSibling);
-               }
-       } while (row = row.nextSibling);
+       var showclass = classname ? '^mode '+classname+'(?!\\w)' : '^(?!mode)';
+       var rows = document.getElementById('rows').getElementsByTagName('TR');
+       for (var i = 0; i < rows.length; i++) {
+               var el = rows[i];
+               el.style.display = el.className.match(showclass) ? 'block' : 'none';
+       }
 
-       // update H2 to reflect the first part of a currently active (but hidden) H3
-       var h3s = document.getElementsByTagName('H3');
+       // update H2 to reflect the first part of a currently active (but hidden) row header
+       var h3s = document.getElementsByTagName('TH');
        for (var i = 0; i < h3s.length; i++) {
                if (h3s[i].parentNode.style.display != 'block') continue;
                document.getElementsByTagName('H2')[0].innerHTML = h3s[i].firstChild.data;
@@ -38,10 +30,10 @@ document.onkeypress = function(e) {
                if (!keychar) continue; // not enterable
                keychar = keychar[1];
                if (keychar != input) continue; // different key
-               var keymod = key.parentNode.className;
+               var row = key.parentNode;
+               var keymod = row.className;
                if ((keymod.search(/\bctrl\b/) != -1) != e.ctrlKey) continue; // modifier mismatch
                if ((keymod.search(/\bmeta\b/) != -1) != e.altKey) continue;
-               var row = key.parentNode.parentNode;
                var shown = row.style.display != 'none';
                if (!shown) continue; // foreign mode
                if (keyfocus) keyfocus.style.outline = '';