Fix 25603 - key value "MediaTrack(Next|Previous)" vs. code value "Media(Next|Previous)Track"
authorTravis Leithead
Fri, 09 May 2014 14:41:46 -0700
changeset 627 705e5c8af455
parent 626 db192f1f3c39
child 628 c59155281d03
Fix 25603 - key value "MediaTrack(Next|Previous)" vs. code value "Media(Next|Previous)Track"
* Media(Next/Previous) keys in the key spec now match what was in the code spec.
* Flipped all the code classnames to catch the new stylistic conventions from
DOM3Event main spec.
html/DOM3Events-code.html
html/DOM3Events-key.html
--- a/html/DOM3Events-code.html	Fri May 09 14:29:07 2014 -0700
+++ b/html/DOM3Events-code.html	Fri May 09 14:41:46 2014 -0700
@@ -35,7 +35,7 @@
 				companyURL: "http://www.microsoft.com",
 			},
 		],
-		publishDate:  "2014-04-26",
+		publishDate:  "2014-05-09",
 		edDraftURI: "https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3Events-code.html",
 		previousPublishDate: "2013-11-05",
 		previousMaturity: "WD",
@@ -161,8 +161,8 @@
 
 			<section id="keyboard-101">
 				<h1>Standard "101" Keyboard Layout</h1>
-				<p>The standard "101" keyboard (commonly referred to as the "US layout") is the only layout that uses the <code class="key-code">'Backslash'</code> code.
-				   All the other layouts omit this key and expand the <code class="key-code">'Enter'</code> key to occupy
+				<p>The standard "101" keyboard (commonly referred to as the "US layout") is the only layout that uses the <code class="code">'Backslash'</code> code.
+				   All the other layouts omit this key and expand the <code class="code">'Enter'</code> key to occupy
 				   two-rows.
 				</p>
 
@@ -182,9 +182,9 @@
 
 			<section id="keyboard-101alt">
 				<h1>Alternate "101" Keyboard Layout</h1>
-				<p>The alternate "101" keyboard removes the <code class="key-code">'Backslash'</code> key to create a
-				   large <code class="key-code">'Enter'</code> key and shrinks the <code class="key-code">'Backspace'</code>
-				   key to make room for the <code class="key-code">'IntlYen'</code> key (The <code class="key-code">'IntlYen'</code> name comes from the
+				<p>The alternate "101" keyboard removes the <code class="code">'Backslash'</code> key to create a
+				   large <code class="code">'Enter'</code> key and shrinks the <code class="code">'Backspace'</code>
+				   key to make room for the <code class="code">'IntlYen'</code> key (The <code class="code">'IntlYen'</code> name comes from the
 				   Japanese layout — in the Russian layout shown above this key maps to a <code class="glyph">'\'</code>.
 				</p>
 
@@ -202,9 +202,9 @@
 				<h1>Standard "102" Keyboard Layout</h1>
 				<p>The standard "102" keyboard is common throughout Europe and adds two keys that don't exist on the
 				   "101" layouts:
-				   The <code class="key-code">'IntlBackslash'</code> key next to the left shift key,
-				   and the <code class="key-code">'IntlHash'</code> key which is partially tucked under the
-				   <code class="key-code">'Enter'</code> key.
+				   The <code class="code">'IntlBackslash'</code> key next to the left shift key,
+				   and the <code class="code">'IntlHash'</code> key which is partially tucked under the
+				   <code class="code">'Enter'</code> key.
 				</p>
 
 				<figure id="figure-keyboard-102-uk">
@@ -222,8 +222,8 @@
 				<p>The Korean "103" keyboard is based on the alternate 101 layout and adds two additional keys
 				   (one on each side of the spacebar) to handle Korean-specific input modes.
 				   These keys are
-				   <code class="key-code">'Hanja'</code> (labelled <code class="keycap">한자</code> <span class="phonetic">hanja</span>) and
-				   <code class="key-code">'HangulMode'</code> (labelled <code class="keycap">한/영</code> <span class="phonetic">han/yeong</span>).
+				   <code class="code">'Hanja'</code> (labelled <code class="keycap">한자</code> <span class="phonetic">hanja</span>) and
+				   <code class="code">'HangulMode'</code> (labelled <code class="keycap">한/영</code> <span class="phonetic">han/yeong</span>).
 				</p>
 
 				<figure id="figure-keyboard-103-korean">
@@ -239,11 +239,11 @@
 			<section id="keyboard-104">
 				<h1>Brazilian "104" Keyboard Layout</h1>
 				<p>The "104" layout used in Brazil adds 4 new keys: the two non-US keys from the "102" layout
-				   (<code class="key-code">'IntlHash'</code> and <code class="key-code">'IntlBackslash'</code>)
-				   plus the <code class="key-code">'IntlRo'</code> key (next to the right shift
+				   (<code class="code">'IntlHash'</code> and <code class="code">'IntlBackslash'</code>)
+				   plus the <code class="code">'IntlRo'</code> key (next to the right shift
 				   key) and an extra key on the numeric keypad. This new keypad key is called 
-				   <code class="key-code">'KeypadComma'</code> because it represents the thousands separator. On the
-				   Brazilian key layout, this key has a keycap of <code class="keycap">.</code> and the <code class="key-code">'KeypadPeriod'</code>
+				   <code class="code">'KeypadComma'</code> because it represents the thousands separator. On the
+				   Brazilian key layout, this key has a keycap of <code class="keycap">.</code> and the <code class="code">'KeypadPeriod'</code>
 				   key has a keycap of <code class="keycap">,</code>.
 				</p>
 
@@ -261,13 +261,13 @@
 			<section id="keyboard-106">
 				<h1>Japanese "106" Keyboard Layout</h1>
 				<p>The Japanese "106" keyboard layout adds 3 new keys:
-				   <code class="key-code">'IntlYen'</code>, 
-				   <code class="key-code">'IntlHash'</code> and
-				   <code class="key-code">'IntlRo'</code>.
-				   It also shrinks the <code class="key-code">'Space'</code> key to make room for 3 input mode keys:
-				   <code class="key-code">'NonConvert'</code> (labelled <code class="keycap">無変換</code> <span class="phonetic">muhenkan</span>),
-				   <code class="key-code">'Convert'</code> (labelled <code class="keycap">変換</code> <span class="phonetic">henkan</span>),
-				   <code class="key-code">'KanaMode'</code> (labelled <code class="keycap">カタカナ/ひらがな/ローマ字</code> <span class="phonetic">katakana/hiragana/romaji</span>).
+				   <code class="code">'IntlYen'</code>, 
+				   <code class="code">'IntlHash'</code> and
+				   <code class="code">'IntlRo'</code>.
+				   It also shrinks the <code class="code">'Space'</code> key to make room for 3 input mode keys:
+				   <code class="code">'NonConvert'</code> (labelled <code class="keycap">無変換</code> <span class="phonetic">muhenkan</span>),
+				   <code class="code">'Convert'</code> (labelled <code class="keycap">変換</code> <span class="phonetic">henkan</span>),
+				   <code class="code">'KanaMode'</code> (labelled <code class="keycap">カタカナ/ひらがな/ローマ字</code> <span class="phonetic">katakana/hiragana/romaji</span>).
 				</p>
 
 				<figure id="figure-keyboard-106-japanese">
@@ -311,7 +311,7 @@
 				</figure>
 
 				<p>In this Apple laptop keyboard, the right control key has been removed to make room for half-height
-					arrow keys and a <code class="key-code">'Fn'</code> key is added on the left.
+					arrow keys and a <code class="code">'Fn'</code> key is added on the left.
 					</p>
 
 				<figure id="figure-keyboard-laptop">
@@ -434,113 +434,113 @@
 						<caption>List of code values for writing system keys in the Alphanumeric section.</caption>
 						<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 						<tbody>
-							<tr><td><code id="code-Backquote" class="key-code">'Backquote'</code></td>
+							<tr><td><code id="code-Backquote" class="code">'Backquote'</code></td>
 								<td>0x35</td><td><code class="keycap">`</code> and <code class="keycap">~</code> on a US keyboard. This is the <code class="keycap">半角/全角/漢字</code> (<span class="phonetic">hankaku/zenkaku/kanji</span>) key on Japanese keyboards</td></tr>
-							<tr><td><code id="code-Backslash" class="key-code">'Backslash'</code></td>
+							<tr><td><code id="code-Backslash" class="code">'Backslash'</code></td>
 								<td>0x31</td><td><code class="keycap">\</code> and <code class="keycap">|</code> on a US keyboard. Found only on standard 101-key layouts.</td></tr>
-							<tr><td><code id="code-Backspace" class="key-code">'Backspace'</code></td>
+							<tr><td><code id="code-Backspace" class="code">'Backspace'</code></td>
 								<td>0x2a</td><td>Labelled <code class="keycap">Delete</code> on Macintosh keyboards.</td></tr>
-							<tr><td><code id="code-BracketLeft" class="key-code">'BracketLeft'</code></td>
+							<tr><td><code id="code-BracketLeft" class="code">'BracketLeft'</code></td>
 								<td>0x2f</td><td><code class="keycap">[</code> and <code class="keycap">{</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-BracketRight" class="key-code">'BracketRight'</code></td>
+							<tr><td><code id="code-BracketRight" class="code">'BracketRight'</code></td>
 								<td>0x30</td><td><code class="keycap">]</code> and <code class="keycap">}</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Comma" class="key-code">'Comma'</code></td>
+							<tr><td><code id="code-Comma" class="code">'Comma'</code></td>
 								<td>0x36</td><td><code class="keycap">,</code> and <code class="keycap">&lt;</code> on a US keyboard.</td></tr>
 
-							<tr><td><code id="code-Digit-0" class="key-code">'Digit0'</code></td>
+							<tr><td><code id="code-Digit-0" class="code">'Digit0'</code></td>
 								<td>0x27</td><td><code class="keycap">0</code> and <code class="keycap">)</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-1" class="key-code">'Digit1'</code></td>
+							<tr><td><code id="code-Digit-1" class="code">'Digit1'</code></td>
 								<td>0x1e</td><td><code class="keycap">1</code> and <code class="keycap">!</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-2" class="key-code">'Digit2'</code></td>
+							<tr><td><code id="code-Digit-2" class="code">'Digit2'</code></td>
 								<td>0x1f</td><td><code class="keycap">2</code> and <code class="keycap">@</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-3" class="key-code">'Digit3'</code></td>
+							<tr><td><code id="code-Digit-3" class="code">'Digit3'</code></td>
 								<td>0x20</td><td><code class="keycap">3</code> and <code class="keycap">#</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-4" class="key-code">'Digit4'</code></td>
+							<tr><td><code id="code-Digit-4" class="code">'Digit4'</code></td>
 								<td>0x21</td><td><code class="keycap">4</code> and <code class="keycap">$</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-5" class="key-code">'Digit5'</code></td>
+							<tr><td><code id="code-Digit-5" class="code">'Digit5'</code></td>
 								<td>0x22</td><td><code class="keycap">5</code> and <code class="keycap">%</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-6" class="key-code">'Digit6'</code></td>
+							<tr><td><code id="code-Digit-6" class="code">'Digit6'</code></td>
 								<td>0x23</td><td><code class="keycap">6</code> and <code class="keycap">^</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-7" class="key-code">'Digit7'</code></td>
+							<tr><td><code id="code-Digit-7" class="code">'Digit7'</code></td>
 								<td>0x24</td><td><code class="keycap">7</code> and <code class="keycap">&</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-8" class="key-code">'Digit8'</code></td>
+							<tr><td><code id="code-Digit-8" class="code">'Digit8'</code></td>
 								<td>0x25</td><td><code class="keycap">8</code> and <code class="keycap">*</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Digit-9" class="key-code">'Digit9'</code></td>
+							<tr><td><code id="code-Digit-9" class="code">'Digit9'</code></td>
 								<td>0x26</td><td><code class="keycap">9</code> and <code class="keycap">(</code> on a US keyboard.</td></tr>
 
-							<tr><td><code id="code-Equal" class="key-code">'Equal'</code></td>
+							<tr><td><code id="code-Equal" class="code">'Equal'</code></td>
 								<td>0x2e</td><td><code class="keycap">=</code> and <code class="keycap">+</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-IntlBackslash" class="key-code">'IntlBackslash'</code></td>
-								<td>0x64</td><td>Located between the <code class="key-code">'ShiftLeft'</code> and <code class="key-code">'KeyZ'</code> keys. The <code class="keycap">\</code> and <code class="keycap">|</code> key on a UK keyboard.</td></tr>
-							<tr><td><code id="code-IntlHash" class="key-code">'IntlHash'</code></td>
-								<td>0x32</td><td>Located between the <code class="key-code">'Quote'</code> and <code class="key-code">'Enter'</code> keys on row E of the keyboard. The <code class="keycap">#</code> and <code class="keycap">~</code> key on a UK keyboard.</td></tr>
-							<tr><td><code id="code-IntlRo" class="key-code">'IntlRo'</code></td>
-								<td>0x87</td><td>Located between the <code class="key-code">'Slash'</code> and <code class="key-code">'ShiftRight'</code> keys. The <code class="keycap">\</code> and <code class="keycap">ろ</code> (<span class="phonetic">ro</span>) key on a Japanese keyboard.</td></tr>
-							<tr><td><code id="code-IntlYen" class="key-code">'IntlYen'</code></td>
-								<td>0x89</td><td>Located between the <code class="key-code">'Equal'</code> and <code class="key-code">'Backspace'</code> keys. The <code class="keycap">¥</code> (<span class="phonetic">yen</span>) key on a Japanese keyboard. The <code class="keycap">\</code> and <code class="keycap">/</code> key on a Russian keyboard.</td></tr>
+							<tr><td><code id="code-IntlBackslash" class="code">'IntlBackslash'</code></td>
+								<td>0x64</td><td>Located between the <code class="code">'ShiftLeft'</code> and <code class="code">'KeyZ'</code> keys. The <code class="keycap">\</code> and <code class="keycap">|</code> key on a UK keyboard.</td></tr>
+							<tr><td><code id="code-IntlHash" class="code">'IntlHash'</code></td>
+								<td>0x32</td><td>Located between the <code class="code">'Quote'</code> and <code class="code">'Enter'</code> keys on row E of the keyboard. The <code class="keycap">#</code> and <code class="keycap">~</code> key on a UK keyboard.</td></tr>
+							<tr><td><code id="code-IntlRo" class="code">'IntlRo'</code></td>
+								<td>0x87</td><td>Located between the <code class="code">'Slash'</code> and <code class="code">'ShiftRight'</code> keys. The <code class="keycap">\</code> and <code class="keycap">ろ</code> (<span class="phonetic">ro</span>) key on a Japanese keyboard.</td></tr>
+							<tr><td><code id="code-IntlYen" class="code">'IntlYen'</code></td>
+								<td>0x89</td><td>Located between the <code class="code">'Equal'</code> and <code class="code">'Backspace'</code> keys. The <code class="keycap">¥</code> (<span class="phonetic">yen</span>) key on a Japanese keyboard. The <code class="keycap">\</code> and <code class="keycap">/</code> key on a Russian keyboard.</td></tr>
 
-							<tr><td><code id="code-KeyA" class="key-code">'KeyA'</code></td>
+							<tr><td><code id="code-KeyA" class="code">'KeyA'</code></td>
 								<td>0x04</td><td><code class="keycap">a</code> on a US keyboard. Labelled <code class="keycap">q</code> on an AZERTY (e.g., French) keyboard.</td></tr>
-							<tr><td><code id="code-KeyB" class="key-code">'KeyB'</code></td>
+							<tr><td><code id="code-KeyB" class="code">'KeyB'</code></td>
 								<td>0x05</td><td><code class="keycap">b</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyC" class="key-code">'KeyC'</code></td>
+							<tr><td><code id="code-KeyC" class="code">'KeyC'</code></td>
 								<td>0x06</td><td><code class="keycap">c</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyD" class="key-code">'KeyD'</code></td>
+							<tr><td><code id="code-KeyD" class="code">'KeyD'</code></td>
 								<td>0x07</td><td><code class="keycap">d</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyE" class="key-code">'KeyE'</code></td>
+							<tr><td><code id="code-KeyE" class="code">'KeyE'</code></td>
 								<td>0x08</td><td><code class="keycap">e</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyF" class="key-code">'KeyF'</code></td>
+							<tr><td><code id="code-KeyF" class="code">'KeyF'</code></td>
 								<td>0x09</td><td><code class="keycap">f</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyG" class="key-code">'KeyG'</code></td>
+							<tr><td><code id="code-KeyG" class="code">'KeyG'</code></td>
 								<td>0x0a</td><td><code class="keycap">g</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyH" class="key-code">'KeyH'</code></td>
+							<tr><td><code id="code-KeyH" class="code">'KeyH'</code></td>
 								<td>0x0b</td><td><code class="keycap">h</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyI" class="key-code">'KeyI'</code></td>
+							<tr><td><code id="code-KeyI" class="code">'KeyI'</code></td>
 								<td>0x0c</td><td><code class="keycap">i</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyJ" class="key-code">'KeyJ'</code></td>
+							<tr><td><code id="code-KeyJ" class="code">'KeyJ'</code></td>
 								<td>0x0d</td><td><code class="keycap">j</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyK" class="key-code">'KeyK'</code></td>
+							<tr><td><code id="code-KeyK" class="code">'KeyK'</code></td>
 								<td>0x0e</td><td><code class="keycap">k</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyL" class="key-code">'KeyL'</code></td>
+							<tr><td><code id="code-KeyL" class="code">'KeyL'</code></td>
 								<td>0x0f</td><td><code class="keycap">l</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyM" class="key-code">'KeyM'</code></td>
+							<tr><td><code id="code-KeyM" class="code">'KeyM'</code></td>
 								<td>0x10</td><td><code class="keycap">m</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyN" class="key-code">'KeyN'</code></td>
+							<tr><td><code id="code-KeyN" class="code">'KeyN'</code></td>
 								<td>0x11</td><td><code class="keycap">n</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyO" class="key-code">'KeyO'</code></td>
+							<tr><td><code id="code-KeyO" class="code">'KeyO'</code></td>
 								<td>0x12</td><td><code class="keycap">o</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyP" class="key-code">'KeyP'</code></td>
+							<tr><td><code id="code-KeyP" class="code">'KeyP'</code></td>
 								<td>0x13</td><td><code class="keycap">p</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyQ" class="key-code">'KeyQ'</code></td>
+							<tr><td><code id="code-KeyQ" class="code">'KeyQ'</code></td>
 								<td>0x14</td><td><code class="keycap">q</code> on a US keyboard. Labelled <code class="keycap">a</code> on an AZERTY (e.g., French) keyboard.</td></tr>
-							<tr><td><code id="code-KeyR" class="key-code">'KeyR'</code></td>
+							<tr><td><code id="code-KeyR" class="code">'KeyR'</code></td>
 								<td>0x15</td><td><code class="keycap">r</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyS" class="key-code">'KeyS'</code></td>
+							<tr><td><code id="code-KeyS" class="code">'KeyS'</code></td>
 								<td>0x16</td><td><code class="keycap">s</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyT" class="key-code">'KeyT'</code></td>
+							<tr><td><code id="code-KeyT" class="code">'KeyT'</code></td>
 								<td>0x17</td><td><code class="keycap">t</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyU" class="key-code">'KeyU'</code></td>
+							<tr><td><code id="code-KeyU" class="code">'KeyU'</code></td>
 								<td>0x18</td><td><code class="keycap">u</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyV" class="key-code">'KeyV'</code></td>
+							<tr><td><code id="code-KeyV" class="code">'KeyV'</code></td>
 								<td>0x19</td><td><code class="keycap">v</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyW" class="key-code">'KeyW'</code></td>
+							<tr><td><code id="code-KeyW" class="code">'KeyW'</code></td>
 								<td>0x1a</td><td><code class="keycap">w</code> on a US keyboard. Labelled <code class="keycap">z</code> on an AZERTY (e.g., French) keyboard.</td></tr>
-							<tr><td><code id="code-KeyX" class="key-code">'KeyX'</code></td>
+							<tr><td><code id="code-KeyX" class="code">'KeyX'</code></td>
 								<td>0x1b</td><td><code class="keycap">x</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-KeyY" class="key-code">'KeyY'</code></td>
+							<tr><td><code id="code-KeyY" class="code">'KeyY'</code></td>
 								<td>0x1c</td><td><code class="keycap">y</code> on a US keyboard. Labelled <code class="keycap">z</code> on a QWERTZ (e.g., German) keyboard.</td></tr>
-							<tr><td><code id="code-KeyZ" class="key-code">'KeyZ'</code></td>
+							<tr><td><code id="code-KeyZ" class="code">'KeyZ'</code></td>
 								<td>0x1d</td><td><code class="keycap">z</code> on a US keyboard. Labelled <code class="keycap">w</code> on an AZERTY (e.g., French) keyboard, and <code class="keycap">y</code> on a QWERTZ (e.g., German) keyboard.</td></tr>
 
-							<tr><td><code id="code-Minus" class="key-code">'Minus'</code></td>
+							<tr><td><code id="code-Minus" class="code">'Minus'</code></td>
 								<td>0x2d</td><td><code class="keycap">-</code> and <code class="keycap">_</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Period" class="key-code">'Period'</code></td>
+							<tr><td><code id="code-Period" class="code">'Period'</code></td>
 								<td>0x37</td><td><code class="keycap">.</code> and <code class="keycap">&gt;</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Quote" class="key-code">'Quote'</code></td>
+							<tr><td><code id="code-Quote" class="code">'Quote'</code></td>
 								<td>0x34</td><td><code class="keycap">'</code> and <code class="keycap">"</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Semicolon" class="key-code">'Semicolon'</code></td>
+							<tr><td><code id="code-Semicolon" class="code">'Semicolon'</code></td>
 								<td>0x33</td><td><code class="keycap">;</code> and <code class="keycap">:</code> on a US keyboard.</td></tr>
-							<tr><td><code id="code-Slash" class="key-code">'Slash'</code></td>
+							<tr><td><code id="code-Slash" class="code">'Slash'</code></td>
 								<td>0x38</td><td><code class="keycap">/</code> and <code class="keycap">?</code> on a US keyboard.</td></tr>
 						</tbody>
 					</table>
@@ -564,31 +564,31 @@
 						<caption>List of code values for functional keys in the Alphanumeric section.</caption>
 						<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 						<tbody>
-							<tr><td><code id="code-AltLeft" class="key-code">'AltLeft'</code></td>
+							<tr><td><code id="code-AltLeft" class="code">'AltLeft'</code></td>
 								<td>0xe2</td><td>Labelled <code class="keycap">Alt</code> or <code class="keycap">Option</code>.</td></tr>
-							<tr><td><code id="code-AltRight" class="key-code">'AltRight'</code></td>
+							<tr><td><code id="code-AltRight" class="code">'AltRight'</code></td>
 								<td>0xe6</td><td>Labelled <code class="keycap">Alt</code> or <code class="keycap">Option</code>. This is the <code class="keycap">AltGr</code> key on many keyboard layouts.</td></tr>
-							<tr><td><code id="code-CapsLock" class="key-code">'CapsLock'</code></td>
+							<tr><td><code id="code-CapsLock" class="code">'CapsLock'</code></td>
 								<td>0x39</td><td></td></tr>
-							<tr><td><code id="code-ContextMenu" class="key-code">'ContextMenu'</code></td>
+							<tr><td><code id="code-ContextMenu" class="code">'ContextMenu'</code></td>
 								<td>0x65</td><td>The application context menu key, which is typically found between the right OS key and the right Control key.</td></tr>
-							<tr><td><code id="code-ControlLeft" class="key-code">'ControlLeft'</code></td>
+							<tr><td><code id="code-ControlLeft" class="code">'ControlLeft'</code></td>
 								<td>0xe0</td><td></td></tr>
-							<tr><td><code id="code-ControlRight" class="key-code">'ControlRight'</code></td>
+							<tr><td><code id="code-ControlRight" class="code">'ControlRight'</code></td>
 								<td>0xe4</td><td></td></tr>
-							<tr><td><code id="code-Enter" class="key-code">'Enter'</code></td>
+							<tr><td><code id="code-Enter" class="code">'Enter'</code></td>
 								<td>0x28</td><td>Labelled <code class="keycap">Enter</code> and <code class="keycap">Return</code> on Macintosh keyboards.</td></tr>
-							<tr><td><code id="code-OSLeft" class="key-code">'OSLeft'</code></td>
+							<tr><td><code id="code-OSLeft" class="code">'OSLeft'</code></td>
 								<td>0xe3</td><td>The Windows, <code class="keycap">⌘</code>, <code class="keycap">Command</code> or other OS symbol key.</td></tr>
-							<tr><td><code id="code-OSRight" class="key-code">'OSRight'</code></td>
+							<tr><td><code id="code-OSRight" class="code">'OSRight'</code></td>
 								<td>0xe7</td><td>The Windows, <code class="keycap">⌘</code>, <code class="keycap">Command</code> or other OS symbol key.</td></tr>
-							<tr><td><code id="code-ShiftLeft" class="key-code">'ShiftLeft'</code></td>
+							<tr><td><code id="code-ShiftLeft" class="code">'ShiftLeft'</code></td>
 								<td>0xe1</td><td></td></tr>
-							<tr><td><code id="code-ShiftRight" class="key-code">'ShiftRight'</code></td>
+							<tr><td><code id="code-ShiftRight" class="code">'ShiftRight'</code></td>
 								<td>0xe5</td><td></td></tr>
-							<tr><td><code id="code-Space" class="key-code">'Space'</code></td>
+							<tr><td><code id="code-Space" class="code">'Space'</code></td>
 								<td>0x2c</td><td>The <code class="keycap">&nbsp;</code> key.</td></tr>
-							<tr><td><code id="code-Tab" class="key-code">'Tab'</code></td>
+							<tr><td><code id="code-Tab" class="code">'Tab'</code></td>
 								<td>0x2b</td><td></td></tr>
 						</tbody>
 					</table>
@@ -607,33 +607,33 @@
 						<caption>List of code values for functional keys found on Japanese and Korean keyboards.</caption>
 						<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 						<tbody>
-							<tr><td><code id="code-Convert" class="key-code">'Convert'</code></td>
+							<tr><td><code id="code-Convert" class="code">'Convert'</code></td>
 								<td>0x8a</td><td>Japanese: <code class="keycap">変換</code> (<span class="phonetic">henkan</span>)</td></tr>
-							<tr><td><code id="code-KanaMode" class="key-code">'KanaMode'</code></td>
+							<tr><td><code id="code-KanaMode" class="code">'KanaMode'</code></td>
 								<td>0x88</td><td>Japanese: <code class="keycap">カタカナ/ひらがな/ローマ字</code> (<span class="phonetic">katakana/hiragana/romaji</span>)</td></tr>
-							<tr><td><code id="code-Lang1" class="key-code">'Lang1'</code></td>
+							<tr><td><code id="code-Lang1" class="code">'Lang1'</code></td>
 								<td>0x90</td>
 								<td>Korean: <code class="keycap">한/영</code> (<span class="phonetic">han/yeong</span>)<br/>
 									Japanese (Mac keyboard): <code class="keycap">かな</code> (<span class="phonetic">kana</span>)
 									</td></tr>
-							<tr><td><code id="code-Lang2" class="key-code">'Lang2'</code></td>
+							<tr><td><code id="code-Lang2" class="code">'Lang2'</code></td>
 								<td>0x91</td>
 								<td>Korean: <code class="keycap">한자</code> (<span class="phonetic">hanja</span>)<br/>
 									Japanese (Mac keyboard): <code class="keycap">英数</code> (<span class="phonetic">eisu</span>)
 									</td></tr>
-							<tr><td><code id="code-Lang3" class="key-code">'Lang3'</code></td>
+							<tr><td><code id="code-Lang3" class="code">'Lang3'</code></td>
 								<td>0x92</td>
 								<td>Japanese (word-processing keyboard): Katakana
 									</td></tr>
-							<tr><td><code id="code-Lang4" class="key-code">'Lang4'</code></td>
+							<tr><td><code id="code-Lang4" class="code">'Lang4'</code></td>
 								<td>0x93</td>
 								<td>Japanese (word-processing keyboard): Hiragana
 									</td></tr>
-							<tr><td><code id="code-Lang5" class="key-code">'Lang5'</code></td>
+							<tr><td><code id="code-Lang5" class="code">'Lang5'</code></td>
 								<td>0x94</td>
 								<td>Japanese (word-processing keyboard): Zenkaku/Hankaku
 									</td></tr>
-							<tr><td><code id="code-NonConvert" class="key-code">'NonConvert'</code></td>
+							<tr><td><code id="code-NonConvert" class="code">'NonConvert'</code></td>
 								<td>0x8b</td><td>Japanese: <code class="keycap">無変換</code> (<span class="phonetic">muhenkan</span>)</td></tr>
 						</tbody>
 					</table>
@@ -657,23 +657,23 @@
 					<caption>List of code values for keys in the ControlPad section.</caption>
 					<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-Delete" class="key-code">'Delete'</code></td>
+						<tr><td><code id="code-Delete" class="code">'Delete'</code></td>
 							<td>0x4c</td><td></td></tr>
-						<tr><td><code id="code-End" class="key-code">'End'</code></td>
+						<tr><td><code id="code-End" class="code">'End'</code></td>
 							<td>0x4d</td><td></td></tr>
-						<tr><td><code id="code-Help" class="key-code">'Help'</code></td>
+						<tr><td><code id="code-Help" class="code">'Help'</code></td>
 							<td>0x75</td><td>Not present on standard PC keyboards.</td></tr>
-						<tr><td><code id="code-Home" class="key-code">'Home'</code></td>
+						<tr><td><code id="code-Home" class="code">'Home'</code></td>
 							<td>0x4a</td><td></td></tr>
-						<tr><td><code id="code-Insert" class="key-code">'Insert'</code></td>
+						<tr><td><code id="code-Insert" class="code">'Insert'</code></td>
 							<td>0x49</td><td>Not present on Apple keyboards.</td></tr>
-						<tr><td><code id="code-PageUp" class="key-code">'PageDown'</code></td>
+						<tr><td><code id="code-PageUp" class="code">'PageDown'</code></td>
 							<td>0x4e</td><td></td></tr>
-						<tr><td><code id="code-PageDown" class="key-code">'PageUp'</code></td>
+						<tr><td><code id="code-PageDown" class="code">'PageUp'</code></td>
 							<td>0x4b</td><td></td></tr>
 					</tbody>
 				</table>
-				<p>Note: The <code>code</code> for the <code class="key-code">'Fn'</code> key (found on
+				<p>Note: The <code>code</code> for the <code class="code">'Fn'</code> key (found on
 				   some Apple keyboards) is defined below in the Function Section.
 				</p>
 			</section>
@@ -692,13 +692,13 @@
 					<caption>List of code values for keys in the ArrowPad section.</caption>
 					<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-ArrowDown" class="key-code">'ArrowDown'</code></td>
+						<tr><td><code id="code-ArrowDown" class="code">'ArrowDown'</code></td>
 							<td>0x51</td><td></td></tr>
-						<tr><td><code id="code-ArrowLeft" class="key-code">'ArrowLeft'</code></td>
+						<tr><td><code id="code-ArrowLeft" class="code">'ArrowLeft'</code></td>
 							<td>0x50</td><td></td></tr>
-						<tr><td><code id="code-ArrowRight" class="key-code">'ArrowRight'</code></td>
+						<tr><td><code id="code-ArrowRight" class="code">'ArrowRight'</code></td>
 							<td>0x4f</td><td></td></tr>
-						<tr><td><code id="code-ArrowUp" class="key-code">'ArrowUp'</code></td>
+						<tr><td><code id="code-ArrowUp" class="code">'ArrowUp'</code></td>
 							<td>0x52</td><td></td></tr>
 					</tbody>
 				</table>
@@ -723,63 +723,63 @@
 					<caption>List of code values for keys in the Numpad section.</caption>
 					<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-NumLock" class="key-code">'NumLock'</code></td>
+						<tr><td><code id="code-NumLock" class="code">'NumLock'</code></td>
 							<td>0x53</td><td></td></tr>
-						<tr><td><code id="code-Numpad0" class="key-code">'Numpad0'</code></td>
+						<tr><td><code id="code-Numpad0" class="code">'Numpad0'</code></td>
 							<td>0x62</td><td><code class="keycap">0</code> and <code class="keycap">Insert</code></td></tr>
-						<tr><td><code id="code-Numpad1" class="key-code">'Numpad1'</code></td>
+						<tr><td><code id="code-Numpad1" class="code">'Numpad1'</code></td>
 							<td>0x59</td><td><code class="keycap">1</code> and <code class="keycap">End</code></td></tr>
-						<tr><td><code id="code-Numpad2" class="key-code">'Numpad2'</code></td>
+						<tr><td><code id="code-Numpad2" class="code">'Numpad2'</code></td>
 							<td>0x5a</td><td><code class="keycap">2</code> and <code class="keycap">ArrowDown</code></td></tr>
-						<tr><td><code id="code-Numpad3" class="key-code">'Numpad3'</code></td>
+						<tr><td><code id="code-Numpad3" class="code">'Numpad3'</code></td>
 							<td>0x5b</td><td><code class="keycap">3</code> and <code class="keycap">PageDown</code></td></tr>
-						<tr><td><code id="code-Numpad4" class="key-code">'Numpad4'</code></td>
+						<tr><td><code id="code-Numpad4" class="code">'Numpad4'</code></td>
 							<td>0x5c</td><td><code class="keycap">4</code> and <code class="keycap">ArrowLeft</code></td></tr>
-						<tr><td><code id="code-Numpad5" class="key-code">'Numpad5'</code></td>
+						<tr><td><code id="code-Numpad5" class="code">'Numpad5'</code></td>
 							<td>0x5d</td><td><code class="keycap">5</code></td></tr>
-						<tr><td><code id="code-Numpad6" class="key-code">'Numpad6'</code></td>
+						<tr><td><code id="code-Numpad6" class="code">'Numpad6'</code></td>
 							<td>0x5e</td><td><code class="keycap">6</code> and <code class="keycap">ArrowRight</code></td></tr>
-						<tr><td><code id="code-Numpad7" class="key-code">'Numpad7'</code></td>
+						<tr><td><code id="code-Numpad7" class="code">'Numpad7'</code></td>
 							<td>0x5f</td><td><code class="keycap">7</code> and <code class="keycap">Home</code></td></tr>
-						<tr><td><code id="code-Numpad8" class="key-code">'Numpad8'</code></td>
+						<tr><td><code id="code-Numpad8" class="code">'Numpad8'</code></td>
 							<td>0x60</td><td><code class="keycap">8</code> and <code class="keycap">ArrowUp</code></td></tr>
-						<tr><td><code id="code-Numpad9" class="key-code">'Numpad9'</code></td>
+						<tr><td><code id="code-Numpad9" class="code">'Numpad9'</code></td>
 							<td>0x61</td><td><code class="keycap">9</code> and <code class="keycap">PageUp</code></td></tr>
-						<tr><td><code id="code-NumpadAdd" class="key-code">'NumpadAdd'</code></td>
+						<tr><td><code id="code-NumpadAdd" class="code">'NumpadAdd'</code></td>
 							<td>0x57</td><td><code class="keycap">+</code></td></tr>
-						<tr><td><code id="code-NumpadBackspace" class="key-code">'NumpadBackspace'</code></td>
+						<tr><td><code id="code-NumpadBackspace" class="code">'NumpadBackspace'</code></td>
 							<td>0xbb</td><td>Found on the Microsoft Natural Keyboard.</td></tr>
-						<tr><td><code id="code-NumpadClear" class="key-code">'NumpadClear'</code></td>
+						<tr><td><code id="code-NumpadClear" class="code">'NumpadClear'</code></td>
 							<td>0xd8</td><td></td></tr>
-						<tr><td><code id="code-NumpadClearEntry" class="key-code">'NumpadClearEntry'</code></td>
+						<tr><td><code id="code-NumpadClearEntry" class="code">'NumpadClearEntry'</code></td>
 							<td>0xd9</td><td></td></tr>
-						<tr><td><code id="code-NumpadComma" class="key-code">'NumpadComma'</code></td>
+						<tr><td><code id="code-NumpadComma" class="code">'NumpadComma'</code></td>
 							<td>0x85</td><td><code class="keycap">,</code> (thousands separator). For locales where the thousands separator is a <code class="glyph">'.'</code> (e.g., Brazil), this key may generate a <code class="glyph">'.'</code>.</td></tr>
-						<tr><td><code id="code-NumpadDecimal" class="key-code">'NumpadDecimal'</code></td>
+						<tr><td><code id="code-NumpadDecimal" class="code">'NumpadDecimal'</code></td>
 							<td>0x63</td><td><code class="keycap">.</code> (decimal separator) and <code class="keycap">Delete</code>. For locales where the decimal separator is <code class="glyph">','</code> (e.g., Brazil), this key may generate a <code class="glyph">','</code>.</td></tr>
-						<tr><td><code id="code-NumpadDivide" class="key-code">'NumpadDivide'</code></td>
+						<tr><td><code id="code-NumpadDivide" class="code">'NumpadDivide'</code></td>
 							<td>0x54</td><td><code class="keycap">/</code></td></tr>
-						<tr><td><code id="code-NumpadEnter" class="key-code">'NumpadEnter'</code></td>
+						<tr><td><code id="code-NumpadEnter" class="code">'NumpadEnter'</code></td>
 							<td>0x58</td><td></td></tr>
-						<tr><td><code id="code-NumpadEqual" class="key-code">'NumpadEqual'</code></td>
+						<tr><td><code id="code-NumpadEqual" class="code">'NumpadEqual'</code></td>
 							<td>0x67</td><td><code class="keycap">=</code></td></tr>
-						<tr><td><code id="code-NumpadMemoryAdd" class="key-code">'NumpadMemoryAdd'</code></td>
+						<tr><td><code id="code-NumpadMemoryAdd" class="code">'NumpadMemoryAdd'</code></td>
 							<td>0xd3</td><td></td></tr>
-						<tr><td><code id="code-NumpadMemoryClear" class="key-code">'NumpadMemoryClear'</code></td>
+						<tr><td><code id="code-NumpadMemoryClear" class="code">'NumpadMemoryClear'</code></td>
 							<td>0xd2</td><td></td></tr>
-						<tr><td><code id="code-NumpadMemoryRecall" class="key-code">'NumpadMemoryRecall'</code></td>
+						<tr><td><code id="code-NumpadMemoryRecall" class="code">'NumpadMemoryRecall'</code></td>
 							<td>0xd1</td><td></td></tr>
-						<tr><td><code id="code-NumpadMemoryStore" class="key-code">'NumpadMemoryStore'</code></td>
+						<tr><td><code id="code-NumpadMemoryStore" class="code">'NumpadMemoryStore'</code></td>
 							<td>0xd0</td><td></td></tr>
-						<tr><td><code id="code-NumpadMemorySubtract" class="key-code">'NumpadMemorySubtract'</code></td>
+						<tr><td><code id="code-NumpadMemorySubtract" class="code">'NumpadMemorySubtract'</code></td>
 							<td>0xd4</td><td></td></tr>
-						<tr><td><code id="code-NumpadMultiply" class="key-code">'NumpadMultiply'</code></td>
+						<tr><td><code id="code-NumpadMultiply" class="code">'NumpadMultiply'</code></td>
 							<td>0x55</td><td><code class="keycap">*</code></td></tr>
-						<tr><td><code id="code-NumpadParenLeft" class="key-code">'NumpadParenLeft'</code></td>
+						<tr><td><code id="code-NumpadParenLeft" class="code">'NumpadParenLeft'</code></td>
 							<td>0xb6</td><td><code class="keycap">(</code> Found on the Microsoft Natural Keyboard.</td></tr>
-						<tr><td><code id="code-NumpadParenRight" class="key-code">'NumpadParenRight'</code></td>
+						<tr><td><code id="code-NumpadParenRight" class="code">'NumpadParenRight'</code></td>
 							<td>0xb7</td><td><code class="keycap">)</code> Found on the Microsoft Natural Keyboard.</td></tr>
-						<tr><td><code id="code-NumpadSubtract" class="key-code">'NumpadSubtract'</code></td>
+						<tr><td><code id="code-NumpadSubtract" class="code">'NumpadSubtract'</code></td>
 							<td>0x56</td><td><code class="keycap">-</code></td></tr>
 					</tbody>
 				</table>
@@ -791,13 +791,13 @@
 			<section id="key-function-section">
 				<h1>Function Section</h1>
 				<p>The Function section runs along the top of the keyboard and contains the function keys and
-				   a few additional special keys (for example, <code class="key-code">'Escape'</code> and
-				   <code class="key-code">'PrintScreen'</code>).
+				   a few additional special keys (for example, <code class="code">'Escape'</code> and
+				   <code class="code">'PrintScreen'</code>).
 				</p>
 				<p>On some keyboards (especially those found on laptops or other portable computers), the function keys
-				   (<code class="key-code">'F1'</code> ... <code class="key-code">'F12'</code>)
+				   (<code class="code">'F1'</code> ... <code class="code">'F12'</code>)
 				   are defined to have other primary functions (like controlling display brightness or
-				   audio volume) and require that a separate <code class="key-code">'Fn'</code> key
+				   audio volume) and require that a separate <code class="code">'Fn'</code> key
 				   be pressed to make them act as function keys.
 				   Unfortunately, the primary functions assigned to these keys varies widely from one manufacturer to the next.
 				   Because of this, the <code>code</code> is always set to the function key name.
@@ -806,49 +806,49 @@
 					<caption>List of code values for keys in the Function section.</caption>
 					<thead><tr><th>Code Value</th><th>USB Usage ID<br/>Page 0x07<br/>(Informative)</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-Escape" class="key-code">'Escape'</code></td>
+						<tr><td><code id="code-Escape" class="code">'Escape'</code></td>
 							<td>0x29</td><td></td></tr>
-						<tr><td><code id="code-F1" class="key-code">'F1'</code></td>
+						<tr><td><code id="code-F1" class="code">'F1'</code></td>
 							<td>0x3a</td><td></td></tr>
-						<tr><td><code id="code-F2" class="key-code">'F2'</code></td>
+						<tr><td><code id="code-F2" class="code">'F2'</code></td>
 							<td>0x3b</td><td></td></tr>
-						<tr><td><code id="code-F3" class="key-code">'F3'</code></td>
+						<tr><td><code id="code-F3" class="code">'F3'</code></td>
 							<td>0x3c</td><td></td></tr>
-						<tr><td><code id="code-F4" class="key-code">'F4'</code></td>
+						<tr><td><code id="code-F4" class="code">'F4'</code></td>
 							<td>0x3d</td><td></td></tr>
-						<tr><td><code id="code-F5" class="key-code">'F5'</code></td>
+						<tr><td><code id="code-F5" class="code">'F5'</code></td>
 							<td>0x3e</td><td></td></tr>
-						<tr><td><code id="code-F6" class="key-code">'F6'</code></td>
+						<tr><td><code id="code-F6" class="code">'F6'</code></td>
 							<td>0x3f</td><td></td></tr>
-						<tr><td><code id="code-F7" class="key-code">'F7'</code></td>
+						<tr><td><code id="code-F7" class="code">'F7'</code></td>
 							<td>0x40</td><td></td></tr>
-						<tr><td><code id="code-F8" class="key-code">'F8'</code></td>
+						<tr><td><code id="code-F8" class="code">'F8'</code></td>
 							<td>0x41</td><td></td></tr>
-						<tr><td><code id="code-F9" class="key-code">'F9'</code></td>
+						<tr><td><code id="code-F9" class="code">'F9'</code></td>
 							<td>0x42</td><td></td></tr>
-						<tr><td><code id="code-F10" class="key-code">'F10'</code></td>
+						<tr><td><code id="code-F10" class="code">'F10'</code></td>
 							<td>0x43</td><td></td></tr>
-						<tr><td><code id="code-F11" class="key-code">'F11'</code></td>
+						<tr><td><code id="code-F11" class="code">'F11'</code></td>
 							<td>0x44</td><td></td></tr>
-						<tr><td><code id="code-F12" class="key-code">'F12'</code></td>
+						<tr><td><code id="code-F12" class="code">'F12'</code></td>
 							<td>0x45</td><td></td></tr>
-						<tr><td><code id="code-Fn" class="key-code">'Fn'</code></td>
+						<tr><td><code id="code-Fn" class="code">'Fn'</code></td>
 							<td></td><td>This is typically a hardware key that does not generate a separate code. Most keyboards do not place this key in the Function section, but it is included here to keep with related keys.</td></tr>
-						<tr><td><code id="code-FLock" class="key-code">'FLock'</code></td>
+						<tr><td><code id="code-FLock" class="code">'FLock'</code></td>
 							<td></td><td>Found on the Microsoft Natural Keyboard.</td></tr>
-						<tr><td><code id="code-PrintScreen" class="key-code">'PrintScreen'</code></td>
+						<tr><td><code id="code-PrintScreen" class="code">'PrintScreen'</code></td>
 							<td>0x46</td><td><code class="keycap">PrintScreen</code> and <code class="keycap">SysReq</code></td></tr>
-						<tr><td><code id="code-ScrollLock" class="key-code">'ScrollLock'</code></td>
+						<tr><td><code id="code-ScrollLock" class="code">'ScrollLock'</code></td>
 							<td>0x47</td><td></td></tr>
-						<tr><td><code id="code-Pause" class="key-code">'Pause'</code></td>
+						<tr><td><code id="code-Pause" class="code">'Pause'</code></td>
 							<td>0x48</td><td><code class="keycap">Pause</code> and <code class="keycap">Break</code></td></tr>
 					</tbody>
 				</table>
 				<p>For keyboards that provide more than 12 function keys, the <code>code</code> value follows the pattern
-				   shown above with 'F' followed by the function key number - <code class="key-code">'F13'</code>, <code class="key-code">'F14'</code>,
-				   <code class="key-code">'F15'</code>, and so on.
+				   shown above with 'F' followed by the function key number - <code class="code">'F13'</code>, <code class="code">'F14'</code>,
+				   <code class="code">'F15'</code>, and so on.
 				</p>
-				<p>Note: Apple keyboards may have <code class="key-code">'Eject'</code> or <code class="key-code">'Power'</code>
+				<p>Note: Apple keyboards may have <code class="code">'Eject'</code> or <code class="code">'Power'</code>
 				   keys in the Function section. The <code>code</code> values
 				   for these keys are defined in the Media Keys section.
 				</p>
@@ -865,9 +865,9 @@
 				</p>
 				<p>On laptop keyboards, these keys are often merged with the Function keys, with the "media" interpretation
 				   being the primary function of the key and the "function key" interpretation requiring the
-				   <code class="key-code">'Fn'</code> key to be pressed at the same time. In this configuration the
-				   <code>code</code> should be set to match the function key (<code class="key-code">'F1'</code> ...
-				   <code class="key-code">'F12'</code>). When the keys are merged in this fashion, the <code>code</code>
+				   <code class="code">'Fn'</code> key to be pressed at the same time. In this configuration the
+				   <code>code</code> should be set to match the function key (<code class="code">'F1'</code> ...
+				   <code class="code">'F12'</code>). When the keys are merged in this fashion, the <code>code</code>
 				   values are taken from the function key value since the "media" value is not consistent across
 				   keyboards.
 				</p>
@@ -875,49 +875,49 @@
 					<caption>List of code values for media keys.</caption>
 					<thead><tr><th>Code Value</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-BrowserBack" class="key-code">'BrowserBack'</code></td>
-							<td>Some laptops place this key to the left of the <code class="key-code">'ArrowUp'</code> key.</td></tr>
-						<tr><td><code id="code-BrowserFavorites" class="key-code">'BrowserFavorites'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-BrowserForward" class="key-code">'BrowserForward'</code></td>
-							<td>Some laptops place this key to the right of the <code class="key-code">'ArrowUp'</code> key.</td></tr>
-						<tr><td><code id="code-BrowserHome" class="key-code">'BrowserHome'</code></td>
+						<tr><td><code id="code-BrowserBack" class="code">'BrowserBack'</code></td>
+							<td>Some laptops place this key to the left of the <code class="code">'ArrowUp'</code> key.</td></tr>
+						<tr><td><code id="code-BrowserFavorites" class="code">'BrowserFavorites'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-BrowserRefresh" class="key-code">'BrowserRefresh'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-BrowserSearch" class="key-code">'BrowserSearch'</code></td>
+						<tr><td><code id="code-BrowserForward" class="code">'BrowserForward'</code></td>
+							<td>Some laptops place this key to the right of the <code class="code">'ArrowUp'</code> key.</td></tr>
+						<tr><td><code id="code-BrowserHome" class="code">'BrowserHome'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-BrowserStop" class="key-code">'BrowserStop'</code></td>
+						<tr><td><code id="code-BrowserRefresh" class="code">'BrowserRefresh'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-Eject" class="key-code">'Eject'</code></td>
+						<tr><td><code id="code-BrowserSearch" class="code">'BrowserSearch'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-BrowserStop" class="code">'BrowserStop'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-Eject" class="code">'Eject'</code></td>
 							<td>This key is placed in the Function section on some Apple keyboards.</td></tr>
-						<tr><td><code id="code-LaunchApp1" class="key-code">'LaunchApp1'</code></td>
+						<tr><td><code id="code-LaunchApp1" class="code">'LaunchApp1'</code></td>
 							<td>Sometimes labelled <code class="keycap">My Computer</code> on the keyboard</td></tr>
-						<tr><td><code id="code-LaunchApp2" class="key-code">'LaunchApp2'</code></td>
+						<tr><td><code id="code-LaunchApp2" class="code">'LaunchApp2'</code></td>
 							<td>Sometimes labelled <code class="keycap">Calculator</code> on the keyboard</td></tr>
-						<tr><td><code id="code-LaunchMail" class="key-code">'LaunchMail'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-MediaNextTrack" class="key-code">'MediaNextTrack'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-MediaPlayPause" class="key-code">'MediaPlayPause'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-MediaPreviousTrack" class="key-code">'MediaPreviousTrack'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-MediaSelect" class="key-code">'MediaSelect'</code></td>
+						<tr><td><code id="code-LaunchMail" class="code">'LaunchMail'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-MediaStop" class="key-code">'MediaStop'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-Power" class="key-code">'Power'</code></td>
-							<td>This key is placed in the Function section on some Apple keyboards, replacing the <code class="key-code">'Eject'</code> key.</td></tr>
-						<tr><td><code id="code-Sleep" class="key-code">'Sleep'</code></td>
+						<tr><td><code id="code-MediaNextTrack" class="code">'MediaNextTrack'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-VolumeDown" class="key-code">'VolumeDown'</code></td>
+						<tr><td><code id="code-MediaPlayPause" class="code">'MediaPlayPause'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-VolumeMute" class="key-code">'VolumeMute'</code></td>
+						<tr><td><code id="code-MediaPreviousTrack" class="code">'MediaPreviousTrack'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-VolumeUp" class="key-code">'VolumeUp'</code></td>
+						<tr><td><code id="code-MediaSelect" class="code">'MediaSelect'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-WakeUp" class="key-code">'WakeUp'</code></td>
+						<tr><td><code id="code-MediaStop" class="code">'MediaStop'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-Power" class="code">'Power'</code></td>
+							<td>This key is placed in the Function section on some Apple keyboards, replacing the <code class="code">'Eject'</code> key.</td></tr>
+						<tr><td><code id="code-Sleep" class="code">'Sleep'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-VolumeDown" class="code">'VolumeDown'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-VolumeMute" class="code">'VolumeMute'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-VolumeUp" class="code">'VolumeUp'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-WakeUp" class="code">'WakeUp'</code></td>
 							<td></td></tr>
 					</tbody>
 				</table>
@@ -934,19 +934,19 @@
 					<caption>List of code values for legacy keys.</caption>
 					<thead><tr><th>Code Value</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-Abort" class="key-code">'Abort'</code></td>
-							<td></td></tr>
-						<tr><td><code id="code-Hyper" class="key-code">'Hyper'</code></td>
+						<tr><td><code id="code-Abort" class="code">'Abort'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-Meta" class="key-code">'Meta'</code></td>
-							<td>Do not use <code class="key-code">'Meta'</code> as a key <code>code</code>. The key labelled <code class="keycap">Meta</code> should be encoded as <code class="key-code">'OSLeft'</code>.</td></tr>
-						<tr><td><code id="code-Resume" class="key-code">'Resume'</code></td>
+						<tr><td><code id="code-Hyper" class="code">'Hyper'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-Super" class="key-code">'Super'</code></td>
+						<tr><td><code id="code-Meta" class="code">'Meta'</code></td>
+							<td>Do not use <code class="code">'Meta'</code> as a key <code>code</code>. The key labelled <code class="keycap">Meta</code> should be encoded as <code class="code">'OSLeft'</code>.</td></tr>
+						<tr><td><code id="code-Resume" class="code">'Resume'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-Suspend" class="key-code">'Suspend'</code></td>
+						<tr><td><code id="code-Super" class="code">'Super'</code></td>
 							<td></td></tr>
-						<tr><td><code id="code-Turbo" class="key-code">'Turbo'</code></td>
+						<tr><td><code id="code-Suspend" class="code">'Suspend'</code></td>
+							<td></td></tr>
+						<tr><td><code id="code-Turbo" class="code">'Turbo'</code></td>
 							<td></td></tr>
 					</tbody>
 				</table>
@@ -958,9 +958,9 @@
 					<caption>List of code values for keys found on international keyboards.</caption>
 					<thead><tr><th>Code Value</th><th>Notes (Informative)</th></tr></thead>
 					<tbody>
-						<tr><td><code id="code-Hiragana" class="key-code">'Hiragana'</code></td>
+						<tr><td><code id="code-Hiragana" class="code">'Hiragana'</code></td>
 							<td>Use for dedicated <code class="keycap">ひらがな</code> key found on some Japanese word processing keyboards.</td></tr>
-						<tr><td><code id="code-Katakana" class="key-code">'Katakana'</code></td>
+						<tr><td><code id="code-Katakana" class="code">'Katakana'</code></td>
 							<td>Use for dedicated <code class="keycap">カタカナ</code> key found on some Japanese word processing keyboards.</td></tr>
 					</tbody>
 				</table>
--- a/html/DOM3Events-key.html	Fri May 09 14:29:07 2014 -0700
+++ b/html/DOM3Events-key.html	Fri May 09 14:41:46 2014 -0700
@@ -35,7 +35,7 @@
 				companyURL: "http://www.microsoft.com",
 			},
 		],
-		publishDate:  "2014-05-05",
+		publishDate:  "2014-05-09",
 		edDraftURI: "https://dvcs.w3.org/hg/dom3events/raw-file/tip/html/DOM3Events-key.html",
 		previousPublishDate: "2013-11-05",
 		previousMaturity: "WD",
@@ -402,8 +402,8 @@
 				<key name="MediaPlayPause">Toggle media between play and pause states.</key>
 				<key name="MediaSelect">Select media.</key>
 				<key name="MediaStop">Stop media playing, pausing, forwarding, rewinding, or recording, if not already stopped.</key>
-				<key name="MediaTrackNext">Seek to next media or program track.</key>
-				<key name="MediaTrackPrevious">Seek to previous media or program track.</key>
+				<key name="MediaNextTrack">Seek to next media or program track.</key>
+				<key name="MediaPreviousTrack">Seek to previous media or program track.</key>
 				<key name="New">Open a new document or message.</key>
 				<key name="Open">Open an existing document or message.</key>
 				<key name="Print">Print the current document or message.</key>
@@ -555,8 +555,8 @@
 				<key name="Home" noid>The Home key, used with keyboard entry, to go to start of content. (VK_GO_TO_START)</key>
 				<key name="MediaPlayPause" noid>Toggle media between play and pause states. (VK_PLAY_PAUSE)</key>
 				<key name="MediaStop" noid>Stop media playing, pausing, forwarding, rewinding, or recording, if not already stopped. (VK_STOP)</key>
-				<key name="MediaTrackNext" noid>Seek to next media or program track. (VK_TRACK_NEXT)</key>
-				<key name="MediaTrackPrevious" noid>Seek to previous media or program track. (VK_TRACK_PREV)</key>
+				<key name="MediaNextTrack" noid>Seek to next media or program track. (VK_TRACK_NEXT)</key>
+				<key name="MediaPreviousTrack" noid>Seek to previous media or program track. (VK_TRACK_PREV)</key>
 				<key name="Power" noid>Toggle power state. (VK_POWER)</key>
 				<key name="Unidentified" noid>This key value is used when an implementations is unable to identify another key value, due to either hardware, platform, or software constraints. (VK_UNDEFINED)</key>
 				<key name="VolumeDown" noid>Decrease audio volume. (VK_VOLUME_DOWN)</key>