From 2fc4719ba4f122ce5604d693442fa041114526ac Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat, 28 May 2011 09:43:04 -0700
Subject: [PATCH] spec: Markup VoidSymbol and NoSymbol with <keysym> instead of
 <emphasis>

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 specs/keysyms.xml |  8 ++++----
 specs/sect1-9.xml | 23 ++++++++++++-----------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/specs/keysyms.xml b/specs/keysyms.xml
index 0b457ae..58e3f2a 100644
--- a/specs/keysyms.xml
+++ b/specs/keysyms.xml
@@ -40,9 +40,9 @@ There are six categories of KEYSYM values.
 <title>Special KEYSYMs</title>
 <para>
 There are two special values:
-<emphasis role='bold'>NoSymbol</emphasis>
+<keysym>NoSymbol</keysym>
 and
-<emphasis role='bold'>VoidSymbol</emphasis>.
+<keysym>VoidSymbol</keysym>.
 They are used to indicate the absence of symbols (see
 <link linkend="keyboards">Section 5, Keyboards</link>).
 </para>
@@ -72,7 +72,7 @@ They are used to indicate the absence of symbols (see
       <entry>0</entry>
       <entry>0</entry>
       <entry>#x00000000</entry>
-      <entry><emphasis role='bold'>NoSymbol</emphasis></entry>
+      <entry><keysym>NoSymbol</keysym></entry>
     </row>
     <row rowsep="0">
       <entry>0</entry>
@@ -80,7 +80,7 @@ They are used to indicate the absence of symbols (see
       <entry>255</entry>
       <entry>255</entry>
       <entry>#x00FFFFFF</entry>
-      <entry><emphasis role='bold'>VoidSymbol</emphasis></entry>
+      <entry><keysym>VoidSymbol</keysym></entry>
     </row>
   </tbody>
   </tgroup>
diff --git a/specs/sect1-9.xml b/specs/sect1-9.xml
index 91e3cac..6f6ec20 100644
--- a/specs/sect1-9.xml
+++ b/specs/sect1-9.xml
@@ -853,24 +853,25 @@ as vendor-specific.
 A list of KEYSYMs is associated with each KEYCODE.
 The list is intended to convey the set of symbols on the corresponding key.
 If the list (ignoring trailing
-<emphasis role='bold'>NoSymbol</emphasis>
+<keysym>NoSymbol</keysym>
 entries) is a single KEYSYM "<emphasis remap='I'>K</emphasis>",
 then the list is treated as if it were
-the list "<emphasis remap='I'>K</emphasis> NoSymbol
-<emphasis remap='I'>K</emphasis> NoSymbol".
-If the list (ignoring trailing NoSymbol entries) is a pair of KEYSYMs
+the list "<emphasis remap='I'>K</emphasis> <keysym>NoSymbol</keysym>
+<emphasis remap='I'>K</emphasis> <keysym>NoSymbol</keysym>".
+If the list (ignoring trailing <keysym>NoSymbol</keysym> entries)
+is a pair of KEYSYMs
 "<emphasis remap='I'>K1 K2</emphasis>", then the list is treated as
 if it were the list
 "<emphasis remap='I'>K1 K2 K1 K2</emphasis>".
 If the list (ignoring trailing
-<emphasis role='bold'>NoSymbol</emphasis>
+<keysym>NoSymbol</keysym>
 entries) is
 a triple of KEYSYMs "<emphasis remap='I'>K1 K2 K3</emphasis>",
 then the list is treated as if it were the list "
-<emphasis remap='I'>K1 K2 K3</emphasis> NoSymbol".
+<emphasis remap='I'>K1 K2 K3</emphasis> <keysym>NoSymbol</keysym>".
 When an explicit "void" element is desired in the list,
 the value
-<emphasis role='bold'>VoidSymbol</emphasis>
+<keysym>VoidSymbol</keysym>
 can be used.
 </para>
 <para>
@@ -880,7 +881,7 @@ Group 1 contains the first and second KEYSYMs, Group 2 contains the third and
 fourth KEYSYMs.
 Within each group,
 if the second element of the group is
-<emphasis role='bold'>NoSymbol</emphasis>,
+<keysym>NoSymbol</keysym>,
 then the group should be treated as if the second element were the
 same as the first element, except when the first element is an alphabetic
 KEYSYM "<emphasis remap='I'>K</emphasis>" for which both lowercase
@@ -11394,10 +11395,10 @@ in keysyms.
 The keysyms-per-keycode can be chosen arbitrarily by the client
 to be large enough to hold all desired symbols.
 A special KEYSYM value of
-<emphasis role='bold'>NoSymbol</emphasis>
+<keysym>NoSymbol</keysym>
 should be used to fill in unused elements for individual keycodes.
 It is legal for
-<emphasis role='bold'>NoSymbol</emphasis>
+<keysym>NoSymbol</keysym>
 to appear in nontrailing positions of the effective list for a keycode.
 </para>
 <para>
@@ -11494,7 +11495,7 @@ in keysyms.
 The keysyms-per-keycode value is chosen arbitrarily by the server
 to be large enough to report all requested symbols.
 A special KEYSYM value of
-<emphasis role='bold'>NoSymbol</emphasis>
+<keysym>NoSymbol</keysym>
 is used to fill in unused elements for individual keycodes.
 <!-- .sp -->
 </para>