specs/libX11: Make whitespace around <function> tags more uniform

Simplifies regular expressions for further mass substitutions.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>

19 files changed, 1293 insertions, 1293 deletions

diff --git a/specs/libX11/AppC.xml b/specs/libX11/AppC.xml
index 35f9bac5..bc45b159 100644
--- a/specs/libX11/AppC.xml
+++ b/specs/libX11/AppC.xml
@@ -47,7 +47,7 @@ and
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XQueryExtension</function></funcdef>
+  <funcdef>Bool <function>XQueryExtension</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *name</parameter></paramdef>
   <paramdef>int<parameter> *major_opcode_return</parameter></paramdef>
@@ -132,7 +132,7 @@ are all considered different names.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> **XListExtensions</function></funcdef>
+  <funcdef>char **<function>XListExtensions</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *nextensions_return</parameter></paramdef>
 </funcprototype>
@@ -165,7 +165,7 @@ Returns the number of extensions listed.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XListExtensions   </function>
+<function>XListExtensions</function>
 function returns a list of all extensions supported by the server.
 If the data returned by the server is in the Latin Portable Character Encoding,
 then the returned strings are in the Host Portable Character Encoding.
@@ -174,7 +174,7 @@ Otherwise, the result is implementation-dependent.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeExtensionList</function></funcdef>
+  <funcdef><function>XFreeExtensionList</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -216,7 +216,7 @@ called stubs.
 In extensions, stubs first should check to see if they have initialized 
 themselves on a connection.
 If they have not, they then should call 
-<function>XInitExtension </function>
+<function>XInitExtension</function>
 to attempt to initialize themselves on the connection.
 </para>
 <para>
@@ -231,7 +231,7 @@ called when these events occur.
 The
 <function>XExtCodes</function>
 structure returns the information from 
-<function>XInitExtension </function>
+<function>XInitExtension</function>
 and is defined in
 &lt;X11/Xlib.h&gt; :
 </para>
@@ -257,7 +257,7 @@ typedef struct _XExtCodes {	/* public to extension, cannot be changed */
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XExtCodes<function> *XInitExtension</function></funcdef>
+  <funcdef>XExtCodes *<function>XInitExtension</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *name</parameter></paramdef>
 </funcprototype>
@@ -312,7 +312,7 @@ are all considered different names.
 <para>
 <!-- .LP -->
 The extension number in the 
-<function>XExtCodes </function>
+<function>XExtCodes</function>
 structure is
 needed in the other calls that follow.  
 This extension number is unique only to a single connection.
@@ -323,7 +323,7 @@ This extension number is unique only to a single connection.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XExtCodes<function> *XAddExtension</function></funcdef>
+  <funcdef>XExtCodes *<function>XAddExtension</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -371,7 +371,7 @@ extension.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XESetCloseDisplay</function></funcdef>
+  <funcdef>int <function>XESetCloseDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -417,14 +417,14 @@ Specifies the procedure to call when the display is closed.
 The
 <function>XESetCloseDisplay</function>
 function defines a procedure to be called whenever
-<function>XCloseDisplay </function>
+<function>XCloseDisplay</function>
 is called.  
 It returns any previously defined procedure, usually NULL.
 </para>
 <para>
 <!-- .LP -->
 When 
-<function>XCloseDisplay </function>
+<function>XCloseDisplay</function>
 is called, 
 your procedure is called 
 with these arguments:
@@ -439,7 +439,7 @@ with these arguments:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetCreateGC</function></funcdef>
+  <funcdef>int *<function>XESetCreateGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -507,7 +507,7 @@ your procedure is called with these arguments:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetCopyGC</function></funcdef>
+  <funcdef>int *<function>XESetCopyGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -568,7 +568,7 @@ your procedure is called with these arguments:
 </literallayout>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> *XESetFreeGC</function></funcdef>
+  <funcdef>int *<function>XESetFreeGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -640,7 +640,7 @@ your procedure is called with these arguments:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetCreateFont</function></funcdef>
+  <funcdef>int *<function>XESetCreateFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -686,7 +686,7 @@ Specifies the procedure to call when a font is created.
 The
 <function>XESetCreateFont</function>
 function defines a procedure to be called whenever
-<function>XLoadQueryFont </function>
+<function>XLoadQueryFont</function>
 and
 <function>XQueryFont</function>
 are called.  
@@ -695,7 +695,7 @@ It returns any previously defined procedure, usually NULL.
 <para>
 <!-- .LP -->
 When 
-<function>XLoadQueryFont </function>
+<function>XLoadQueryFont</function>
 or
 <function>XQueryFont</function>
 is called, 
@@ -721,7 +721,7 @@ your procedure is called with these arguments:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetFreeFont</function></funcdef>
+  <funcdef>int *<function>XESetFreeFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -767,14 +767,14 @@ Specifies the procedure to call when a font is freed.
 The
 <function>XESetFreeFont</function>
 function defines a procedure to be called whenever
-<function>XFreeFont </function>
+<function>XFreeFont</function>
 is called.  
 It returns any previously defined procedure, usually NULL.
 </para>
 <para>
 <!-- .LP -->
 When 
-<function>XFreeFont </function>
+<function>XFreeFont</function>
 is called, your procedure is called with these arguments:
 </para>
 <para>
@@ -824,7 +824,7 @@ from the protocol to put in this component, initialize it to zero.
 <!-- .NT -->
 There is an implementation limit such that your host event
 structure size cannot be bigger than the size of the
-<function>XEvent </function>
+<function>XEvent</function>
 union of structures.
 There also is no way to guarantee that more than 24 elements or 96 characters
 in the structure will be fully portable between machines.
@@ -833,7 +833,7 @@ in the structure will be fully portable between machines.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetWireToEvent</function></funcdef>
+  <funcdef>int *<function>XESetWireToEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> event_number</parameter></paramdef>
   <paramdef>Status<parameter> (*proc)()</parameter></paramdef>
@@ -916,16 +916,16 @@ Your procedure must return status to indicate if the conversion succeeded.
 The re argument is a pointer to where the host format event should be stored,
 and the event argument is the 32-byte wire event structure.
 In the 
-<function>XEvent </function>
+<function>XEvent</function>
 structure you are creating, 
 you must fill in the five required members of the event structure.
 You should fill in the type member with the type specified for the 
-<function>xEvent </function>
+<function>xEvent</function>
 structure.
 You should copy all other members from the 
-<function>xEvent </function>
+<function>xEvent</function>
 structure (wire format) to the
-<function>XEvent </function>
+<function>XEvent</function>
 structure (host format).
 Your conversion procedure should return 
 <function>True</function>
@@ -945,7 +945,7 @@ with the event and use the return value.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long<function> _XSetLastRequestRead</function></funcdef>
+  <funcdef>unsigned long<function>_XSetLastRequestRead</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>xGenericReply<parameter> *rep</parameter></paramdef>
 </funcprototype>
@@ -989,7 +989,7 @@ serial number in the event.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> *XESetEventToWire</function></funcdef>
+  <funcdef>Status *<function>XESetEventToWire</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> event_number</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -1074,16 +1074,16 @@ The re argument is a pointer to the host format event,
 and the event argument is a pointer to where the 32-byte wire event 
 structure should be stored.
 You should fill in the type with the type from the 
-<function>XEvent </function>
+<function>XEvent</function>
 structure.
 All other members then should be copied from the host format to the 
-<function>xEvent </function>
+<function>xEvent</function>
 structure.
 <indexterm significance="preferred"><primary>XESetWireToError</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> *XESetWireToError</function></funcdef>
+  <funcdef>Bool *<function>XESetWireToError</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> error_number</parameter></paramdef>
   <paramdef>Bool<parameter> (*proc)()</parameter></paramdef>
@@ -1180,7 +1180,7 @@ otherwise, it should return
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetError</function></funcdef>
+  <funcdef>int *<function>XESetError</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> (*proc)()</parameter></paramdef>
@@ -1255,7 +1255,7 @@ int (*<emphasis remap='I'>proc</emphasis>)(<emphasis remap='I'>display</emphasis
 The err argument is a pointer to the 32-byte wire format error.
 The codes argument is a pointer to the extension codes structure.
 The ret_code argument is the return code you may want 
-<function>_XReply </function>
+<function>_XReply</function>
 returned to.
 </para>
 <para>
@@ -1266,13 +1266,13 @@ the client's error handler is called.
 (For further information, see section 11.8.2.)
 If your procedure returns nonzero, 
 the error is suppressed, and 
-<function>_XReply </function>
+<function>_XReply</function>
 returns the value of ret_code.
 <indexterm significance="preferred"><primary>XESetErrorString</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XESetErrorString</function></funcdef>
+  <funcdef>char *<function>XESetErrorString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>char<parameter> *(*proc)()</parameter></paramdef>
@@ -1316,7 +1316,7 @@ Specifies the procedure to call to obtain an error string.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetErrorText </function>
+<function>XGetErrorText</function>
 function returns a string to the user for an error.
 <function>XESetErrorString</function>
 allows you to define a procedure to be called that
@@ -1348,7 +1348,7 @@ error message into buffer.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> *XESSetPrintErrorValues</function></funcdef>
+  <funcdef>void *<function>XESSetPrintErrorValues</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>void<parameter> (*proc)()</parameter></paramdef>
@@ -1432,7 +1432,7 @@ on a <acronym>POSIX</acronym>-compliant system, fp should be cast to type FILE*.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetFlushGC</function></funcdef>
+  <funcdef>int *<function>XESetFlushGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> *(*proc)()</parameter></paramdef>
@@ -1484,7 +1484,7 @@ function, but is called when a GC cache needs to be updated in the server.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XESetCopyGC</function></funcdef>
+  <funcdef>int *<function>XESetCopyGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> extension</parameter></paramdef>
   <paramdef>int<parameter> *(*proc)()</parameter></paramdef>
@@ -1624,7 +1624,7 @@ union {	Display *display;
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XExtData<function> **XEHeadOfExtensionList</function></funcdef>
+  <funcdef>XExtData **<function>XEHeadOfExtensionList</function></funcdef>
   <paramdef>XEDataObject<parameter> object</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1662,7 +1662,7 @@ of types contained in
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAddToExtensionList</function></funcdef>
+  <funcdef><function>XAddToExtensionList</function></funcdef>
   <paramdef>XExtData<parameter> **structure</parameter></paramdef>
   <paramdef>XExtData<parameter> *ext_data</parameter></paramdef>
 </funcprototype>
@@ -1702,7 +1702,7 @@ before calling this function.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XExtData<function> *XFindOnExtensionList</function></funcdef>
+  <funcdef>XExtData *<function>XFindOnExtensionList</function></funcdef>
   <paramdef>struct_XExtData<parameter> **structure</parameter></paramdef>
   <paramdef>int<parameter> number</parameter></paramdef>
 </funcprototype>
@@ -1746,14 +1746,14 @@ There is no way to find additional structures.
 <para>
 <!-- .LP -->
 The 
-<function>XAllocID </function>
+<function>XAllocID</function>
 macro, which allocates and returns a resource ID, is defined in 
 &lt;X11/Xlib.h&gt;.
 <indexterm significance="preferred"><primary>XAllocID</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAllocID</function></funcdef>
+  <funcdef><function>XAllocID</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1788,7 +1788,7 @@ macro allocates and returns an array of resource ID.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAllocIDs</function></funcdef>
+  <funcdef><function>XAllocIDs</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> *ids_return</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -1856,7 +1856,7 @@ in its GC.
 The 
 <function>FlushGC</function>
 macro checks the dirty bits in the library's GC structure and calls
-<function>_XFlushGCCache </function>
+<function>_XFlushGCCache</function>
 if any elements have changed.
 The
 <function>FlushGC</function>
@@ -1865,7 +1865,7 @@ macro is defined as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> FlushGC</function></funcdef>
+  <funcdef><function>FlushGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
 </funcprototype>
@@ -1904,18 +1904,18 @@ using it, so if you only stored the value in the cache without
 forcing a protocol request, the resource might be destroyed before being
 set into the GC.
 You can use the
-<function>_XFlushGCCache </function>
+<function>_XFlushGCCache</function>
 procedure 
 to force the cache to be flushed.
 The
-<function>_XFlushGCCache </function>
+<function>_XFlushGCCache</function>
 procedure
 is defined as follows:
 <indexterm significance="preferred"><primary>_XFlushGCCache</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> _XFlushGCCache</function></funcdef>
+  <funcdef><function>_XFlushGCCache</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
 </funcprototype>
@@ -1967,7 +1967,7 @@ to just extend the previous graphics request by extending the length
 field of the request and appending the data to the buffer.  
 This can improve performance by five times or more in naive programs.  
 For example, here is the source for the 
-<function>XDrawPoint </function>
+<function>XDrawPoint</function>
 stub.
 (Writing extension stubs is discussed in the next section.)
 </para>
@@ -2034,7 +2034,7 @@ there is a symbol defined in
 of EPERBATCH on the number of requests batched.
 Most of the performance benefit occurs in the first few merged requests.
 Note that 
-<function>FlushGC </function>
+<function>FlushGC</function>
 is called <emphasis remap='I'>before</emphasis> picking up the value of last_req,
 because it may modify this field.
 <!-- .SH -->
@@ -2110,7 +2110,7 @@ The length field in a request must equal the minimum length required to contain
 the request. 
 If the specified length is smaller or larger than the required length, 
 the server should generate a 
-<function>BadLength </function>
+<function>BadLength</function>
 error.
 Unused bytes in a request are not required to be zero.  
 Extensions should be designed in such a way that long protocol requests
@@ -2223,7 +2223,7 @@ but all requests are padded to be multiples of four bytes long.
 <!-- .LP -->
 A few protocol requests take no arguments at all. 
 Instead, they use the
-<function>xReq </function>
+<function>xReq</function>
 structure in
 &lt;X11/Xproto.h&gt;,
 which contains only a reqType and a length (and a pad byte).
@@ -2284,7 +2284,7 @@ Only
 <function>QueryFont</function>,
 <function>QueryKeymap</function>,
 and
-<function>GetKeyboardControl </function>
+<function>GetKeyboardControl</function>
 have reply structures longer than 32 bytes in the core protocol.
 </para>
 <para>
@@ -2343,7 +2343,7 @@ Two calls, which are generally implemented as macros, have been provided.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> LockDisplay</function></funcdef>
+  <funcdef><function>LockDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2354,7 +2354,7 @@ Two calls, which are generally implemented as macros, have been provided.
 <indexterm significance="preferred"><primary>UnlockDisplay</primary></indexterm>
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> UnlockDisplay</function></funcdef>
+  <funcdef><function>UnlockDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2393,7 +2393,7 @@ the name of the protocol request as declared in
 &lt;X11/Xproto.h&gt;
 except with X_ removed.   
 Each one declares a 
-<function>Display </function>
+<function>Display</function>
 structure pointer,
 called dpy, and a pointer to a request structure, called req,
 which is of the appropriate type.
@@ -2421,7 +2421,7 @@ and so on),
 then use 
 <function>GetResReq</function>.
 The second argument to the macro is the 32-bit object.  
-<function>X_MapWindow </function>
+<function>X_MapWindow</function>
 is a good example.
 </para>
 <para>
@@ -2456,13 +2456,13 @@ req-&gt;arg2 = arg2;
 ...
 </literallayout>
 A few stub procedures (such as 
-<function>XCreateGC </function>
+<function>XCreateGC</function>
 and 
 <function>XCreatePixmap</function>)
 return a resource ID to the caller but pass a resource ID as an argument
 to the protocol request.   
 Such procedures use the macro 
-<function>XAllocID </function>
+<function>XAllocID</function>
 to allocate a resource ID from the range of IDs 
 that were assigned to this client when it opened the connection.
 </para>
@@ -2477,11 +2477,11 @@ return (rid);
 Finally, some stub procedures transmit a fixed amount of variable-length
 data after the request.  
 Typically, these procedures (such as
-<function>XMoveWindow </function>
+<function>XMoveWindow</function>
 and 
 <function>XSetBackground</function>)
 are special cases of more general functions like 
-<function>XMoveResizeWindow </function>
+<function>XMoveResizeWindow</function>
 and 
 <function>XChangeGC</function>.
 These procedures use 
@@ -2498,7 +2498,7 @@ Variable Length Arguments
 <!-- .LP -->
 Some protocol requests take additional variable-length data that
 follow the 
-<function>xDoSomethingReq </function>
+<function>xDoSomethingReq</function>
 structure.    
 The format of this data varies from request to request. 
 Some requests require a sequence of 8-bit bytes, 
@@ -2520,25 +2520,25 @@ then you must round the length up and shift it before adding:
 req-&gt;length += (nbytes+3)&gt;&gt;2;
 </literallayout>
 To transmit variable-length data, use the 
-<function>Data </function>
+<function>Data</function>
 macros.
 If the data fits into the output buffer, 
 then this macro copies it to the buffer.  
 If it does not fit, however,
 the 
-<function>Data </function>
+<function>Data</function>
 macro calls 
 <function>_XSend</function>,
 which transmits first the contents of the buffer and then your data.
 The 
-<function>Data </function>
+<function>Data</function>
 macros take three arguments:  
 the display, a pointer to the beginning of the data, 
 and the number of bytes to be sent.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> Data</function></funcdef>
+  <funcdef><function>Data</function></funcdef>
   <paramdef><parameter> display</parameter></paramdef>
   <paramdef>(char<parameter> *</parameter></paramdef>
 </funcprototype>
@@ -2563,11 +2563,11 @@ Use the appropriate macro when sending byte, short, or long data.
 <!-- .LP -->
 If the protocol request requires a reply, 
 then call the procedure 
-<function>_XSend </function>
+<function>_XSend</function>
 instead of the 
-<function>Data </function>
+<function>Data</function>
 macro.  
-<function>_XSend </function>
+<function>_XSend</function>
 takes the same arguments, but because it sends your data immediately instead of 
 copying it into the output buffer (which would later be flushed
 anyway by the following call on 
@@ -2580,21 +2580,21 @@ Replies
 <!-- .LP -->
 If the protocol request has a reply, 
 then call 
-<function>_XReply </function>
+<function>_XReply</function>
 after you have finished dealing with 
 all the fixed-length and variable-length arguments.  
-<function>_XReply </function>
+<function>_XReply</function>
 flushes the output buffer and waits for an 
-<function>xReply </function>
+<function>xReply</function>
 packet to arrive.  
 If any events arrive in the meantime,
-<function>_XReply </function>
+<function>_XReply</function>
 places them in the queue for later use.
 <indexterm significance="preferred"><primary>_XReply</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> _XReply</function></funcdef>
+  <funcdef>Status <function>_XReply</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>xReply<parameter> *rep</parameter></paramdef>
   <paramdef>int<parameter> extra</parameter></paramdef>
@@ -2650,26 +2650,26 @@ should be discarded.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>_XReply </function>
+<function>_XReply</function>
 function waits for a reply packet and copies its contents into the
 specified rep.  
-<function>_XReply </function>
+<function>_XReply</function>
 handles error and event packets that occur before the reply is received.
-<function>_XReply </function>
+<function>_XReply</function>
 takes four arguments:
 </para>
 <itemizedlist>
   <listitem>
     <para>
 A 
-<function>Display </function>
+<function>Display</function>
 * structure
     </para>
   </listitem>
   <listitem>
     <para>
 A pointer to a reply structure (which must be cast to an 
-<function>xReply </function>
+<function>xReply</function>
 *)
     </para>
   </listitem>
@@ -2684,7 +2684,7 @@ in the reply structure
   <listitem>
     <para>
 A Boolean that indicates whether
-<function>_XReply </function>
+<function>_XReply</function>
 is to discard any additional bytes
 beyond those it was told to read
     </para>
@@ -2705,28 +2705,28 @@ which have longer replies.
 <para>
 <!-- .LP -->
 The last argument should be 
-<function>False </function>
+<function>False</function>
 if the reply structure is followed
 by additional variable-length data (such as a list or string).  
 It should be 
-<function>True </function>
+<function>True</function>
 if there is not any variable-length data.
 <!-- .NT -->
 This last argument is provided for upward-compatibility reasons
 to allow a client to communicate properly with a hypothetical later
 version of the server that sends more data than the client expected.
 For example, some later version of 
-<function>GetWindowAttributes </function>
+<function>GetWindowAttributes</function>
 might use a
 larger, but compatible, 
-<function>xGetWindowAttributesReply </function>
+<function>xGetWindowAttributesReply</function>
 that contains additional attribute data at the end.
 <!-- .NE -->
-<function>_XReply </function>
+<function>_XReply</function>
 returns 
 <function>True</function>
 if it received a reply successfully or 
-<function>False </function>
+<function>False</function>
 if it received any sort of error. 
 </para>
 <para>
@@ -2750,11 +2750,11 @@ return (rep.ret4);
 </literallayout>
 If there is variable-length data after the reply, 
 change the 
-<function>True </function>
+<function>True</function>
 to 
 <function>False</function>,
 and use the appropriate
-<function>_XRead </function>
+<function>_XRead</function>
 function to read the variable-length data.
 </para>
 <para>
@@ -2762,7 +2762,7 @@ function to read the variable-length data.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> _XRead</function></funcdef>
+  <funcdef><function>_XRead</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *data_return</parameter></paramdef>
   <paramdef>long<parameter> nbytes</parameter></paramdef>
@@ -2814,7 +2814,7 @@ function reads the specified number of bytes into data_return.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> _XRead16</function></funcdef>
+  <funcdef><function>_XRead16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>short<parameter> *data_return</parameter></paramdef>
   <paramdef>long<parameter> nbytes</parameter></paramdef>
@@ -2868,7 +2868,7 @@ into the specified array as shorts.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> _XRead32</function></funcdef>
+  <funcdef><function>_XRead32</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>long<parameter> *data_return</parameter></paramdef>
   <paramdef>long<parameter> nbytes</parameter></paramdef>
@@ -2922,7 +2922,7 @@ into the specified array as longs.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> _XRead16Pad</function></funcdef>
+  <funcdef><function>_XRead16Pad</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>short<parameter> *data_return</parameter></paramdef>
   <paramdef>long<parameter> nbytes</parameter></paramdef>
@@ -2979,7 +2979,7 @@ reads and discards up to two additional pad bytes.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> _XReadPad</function></funcdef>
+  <funcdef><function>_XReadPad</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *data_return</parameter></paramdef>
   <paramdef>long<parameter> nbytes</parameter></paramdef>
@@ -3079,7 +3079,7 @@ critical section:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *_XAllocScratch</function></funcdef>
+  <funcdef>char *<function>_XAllocScratch</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedlong<parameter> nbytes</parameter></paramdef>
 </funcprototype>
@@ -3136,7 +3136,7 @@ critical sections:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *_XAllocTemp</function></funcdef>
+  <funcdef>char *<function>_XAllocTemp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedlong<parameter> nbytes</parameter></paramdef>
 </funcprototype>
@@ -3175,7 +3175,7 @@ The following function returns the storage:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> _XFreeTemp</function></funcdef>
+  <funcdef>void <function>_XFreeTemp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *buf</parameter></paramdef>
   <paramdef>unsignedlong<parameter> nbytes</parameter></paramdef>
@@ -3288,7 +3288,7 @@ is 16 or 32 bits, and a
 <function>long</function>
 is 32 bits.  
 The 
-<function>PackData </function>
+<function>PackData</function>
 macro is a half-hearted attempt to deal with the possibility of 32 bit shorts. 
 However, much more work is needed to make this work properly.
 <!-- .SH -->
@@ -3333,7 +3333,7 @@ Make sure to establish a close display handler to allow you to zero the entry.
 Do whatever other initialization your extension requires.
 (For example, install event handlers and so on.)
 Your initialization procedure would normally return a pointer to the
-<function>XExtCodes </function>
+<function>XExtCodes</function>
 structure for this extension, which is what would normally
 be found in your array of pointers.
     </para>
@@ -3343,7 +3343,7 @@ be found in your array of pointers.
 After returning from your initialization procedure, 
 the stub can now continue normally, because it has its major opcode safely 
 in its hand in the 
-<function>XExtCodes </function>
+<function>XExtCodes</function>
 structure.
 <!-- .bp -->
     </para>
diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index 25e23cae..d90298ad 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -57,7 +57,7 @@ and WM_NORMAL_HINTS properties.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetStandardProperties</function></funcdef>
+  <funcdef><function>XSetStandardProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> *window_name</parameter></paramdef>
@@ -178,7 +178,7 @@ the result is implementation-dependent.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 <!-- .SH -->
 </para>
@@ -189,7 +189,7 @@ Setting and Getting Window Sizing Hints
 <!-- .LP -->
 Xlib provides functions that you can use to set or get window sizing hints.
 The functions discussed in this section use the flags and the
-<function>XSizeHints </function>
+<function>XSizeHints</function>
 structure, as defined in the
 <!-- .hN X11/Xutil.h -->
 header file and use the WM_NORMAL_HINTS property.
@@ -205,7 +205,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetNormalHints</function></funcdef>
+  <funcdef><function>XSetNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints</parameter></paramdef>
@@ -280,7 +280,7 @@ the structure have been assigned values.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -294,7 +294,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetNormalHints</function></funcdef>
+  <funcdef>Status <function>XGetNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints_return</parameter></paramdef>
@@ -347,7 +347,7 @@ the application specified no normal size hints for this window.
 <!-- .LP -->
 <function>XGetNormalHints</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -365,7 +365,7 @@ This function is no longer supported by the
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetZoomHints</function></funcdef>
+  <funcdef><function>XSetZoomHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *zhints</parameter></paramdef>
@@ -421,7 +421,7 @@ zoomed state.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -435,7 +435,7 @@ This function is no longer supported by the
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetZoomHints</function></funcdef>
+  <funcdef>Status <function>XGetZoomHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *zhints_return</parameter></paramdef>
@@ -488,7 +488,7 @@ the application specified no zoom size hints for this window.
 <!-- .LP -->
 <function>XGetZoomHints</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -502,7 +502,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetSizeHints</function></funcdef>
+  <funcdef><function>XSetSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints</parameter></paramdef>
@@ -575,7 +575,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadAtom</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -589,7 +589,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetSizeHints</function></funcdef>
+  <funcdef>Status <function>XGetSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints_return</parameter></paramdef>
@@ -665,7 +665,7 @@ or zero otherwise.
 can generate
 <function>BadAtom</function>
 and 
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 <!-- .SH -->
 Getting and Setting an XStandardColormap Structure
@@ -673,7 +673,7 @@ Getting and Setting an XStandardColormap Structure
 <para>
 <!-- .LP -->
 To get the 
-<function>XStandardColormap </function>
+<function>XStandardColormap</function>
 structure associated with one of the described atoms, use
 <function>XGetStandardColormap</function>.
 This function has been superseded by
@@ -682,7 +682,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetStandardColormap</function></funcdef>
+  <funcdef>Status <function>XGetStandardColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XStandardColormap<parameter> *colormap_return</parameter></paramdef>
@@ -770,7 +770,7 @@ See section 14.3 for the semantics of standard colormaps.
 can generate
 <function>BadAtom</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -784,7 +784,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetStandardColormap</function></funcdef>
+  <funcdef><function>XSetStandardColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XStandardColormap<parameter> *colormap</parameter></paramdef>
@@ -850,7 +850,7 @@ can generate
 <function>BadAtom</function>,
 <function>BadDrawable</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 <!-- .SH -->
 Parsing Window Geometry
@@ -867,7 +867,7 @@ This function has been superseded by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XGeometry</function></funcdef>
+  <funcdef>int <function>XGeometry</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen</parameter></paramdef>
   <paramdef>char*position,<parameter> *default_position</parameter></paramdef>
@@ -1026,13 +1026,13 @@ size of the increments fwidth and fheight
 and any additional interior space (xadder and yadder)
 to make it easy to compute the resulting size.
 The
-<function>XGeometry </function>
+<function>XGeometry</function>
 function returns the position the window should be placed given a position and
 a default position.
 <function>XGeometry</function>
 determines the placement of
 a window using a geometry specification as specified by
-<function>XParseGeometry </function>
+<function>XParseGeometry</function>
 and the additional information about the window.
 Given a fully qualified default geometry specification and
 an incomplete geometry specification, 
@@ -1071,7 +1071,7 @@ It is only useful in very simple applications.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XGetDefault</function></funcdef>
+  <funcdef>char *<function>XGetDefault</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *program</parameter></paramdef>
   <paramdef>char<parameter> *option</parameter></paramdef>
@@ -1190,10 +1190,10 @@ These functions are provided mainly for compatibility with X Version 10
 and have no server support.  
 That is, they call other Xlib functions, not the server directly.  
 Thus, if you just have straight lines to draw, using 
-<function>XDrawLines </function>
+<function>XDrawLines</function>
 <indexterm><primary>XDrawLines</primary></indexterm>
 or
-<function>XDrawSegments </function>
+<function>XDrawSegments</function>
 <indexterm><primary>XDrawSegments</primary></indexterm>
 is much faster.
 </para>
@@ -1215,13 +1215,13 @@ and
 They are as compatible as possible given X Version 11's new line-drawing 
 functions.  
 One thing to note, however, is that
-<function>VertexDrawLastPoint </function>
+<function>VertexDrawLastPoint</function>
 is no longer supported. 
 Also, the error status returned is the opposite of what it was under 
 X Version 10 (this is the X Version 11 standard error status).  
-<function>XAppendVertex </function>
+<function>XAppendVertex</function>
 and 
-<function>XClearVertexFlag </function>
+<function>XClearVertexFlag</function>
 from X Version 10 also are not supported.
 </para>
 <para>
@@ -1233,15 +1233,15 @@ the closing of a closed figure  (see
 <function>XDrawLines</function>).
 The functions discussed here fail (return zero) only if they run out of memory
 or are passed a 
-<function>Vertex </function>
+<function>Vertex</function>
 list that has a 
-<function>Vertex </function>
+<function>Vertex</function>
 with 
 <function>VertexStartClosed</function>
 set that is not followed by a 
-<function>Vertex </function>
+<function>Vertex</function>
 with 
-<function>VertexEndClosed </function>
+<function>VertexEndClosed</function>
 set.
 </para>
 <para>
@@ -1265,7 +1265,7 @@ use
 
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XDraw</function></funcdef>
+  <funcdef>Status <function>XDraw</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1330,7 +1330,7 @@ Specifies how many vertices are in vlist.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XDraw </function>
+<function>XDraw</function>
 function draws an arbitrary polygon or curve.  
 The figure drawn is defined by the specified list of vertices (vlist).
 The points are connected by lines as specified in the flags in the
@@ -1361,9 +1361,9 @@ typedef struct _Vertex {
 The x and y members are the coordinates of the vertex 
 that are relative to either the upper left inside corner of the drawable 
 (if 
-<function>VertexRelative </function>
+<function>VertexRelative</function>
 is zero) or the previous vertex (if 
-<function>VertexRelative </function>
+<function>VertexRelative</function>
 is one).
 </para>
 <para>
@@ -1391,7 +1391,7 @@ VertexEndClosed    0x0010     /* else not */
   <listitem>
     <para>
 If 
-<function>VertexRelative </function>
+<function>VertexRelative</function>
 is not set,  
 the coordinates are absolute (that is, relative to the drawable's origin).  
 The first vertex must be an absolute vertex.
@@ -1400,7 +1400,7 @@ The first vertex must be an absolute vertex.
   <listitem>
     <para>
 If
-<function>VertexDontDraw </function>
+<function>VertexDontDraw</function>
 is one, 
 no line or curve is drawn from the previous vertex to this one.  
 This is analogous to picking up the pen and moving to another place 
@@ -1410,13 +1410,13 @@ before drawing another line.
   <listitem>
     <para>
 If 
-<function>VertexCurved </function>
+<function>VertexCurved</function>
 is one, 
 a spline algorithm is used to draw a smooth curve from the previous vertex
 through this one to the next vertex.  
 Otherwise, a straight line is drawn from the previous vertex to this one.  
 It makes sense to set 
-<function>VertexCurved </function>
+<function>VertexCurved</function>
 to one only if a previous and next vertex are both defined
 (either explicitly in the array or through the definition of a closed 
 curve).
@@ -1425,7 +1425,7 @@ curve).
   <listitem>
     <para>
 It is permissible for 
-<function>VertexDontDraw </function>
+<function>VertexDontDraw</function>
 bits and 
 <function>VertexCurved</function>
 bits both to be one. 
@@ -1436,13 +1436,13 @@ but do not want an actual curve drawing to start until this point.
   <listitem>
     <para>
 If 
-<function>VertexStartClosed </function>
+<function>VertexStartClosed</function>
 is one, 
 then this point marks the beginning of a closed curve.  
 This vertex must be followed later in the array by another vertex 
 whose effective coordinates are identical
 and that has a
-<function>VertexEndClosed </function>
+<function>VertexEndClosed</function>
 bit of one.
 The points in between form a cycle to determine predecessor 
 and successor vertices for the spline algorithm.
@@ -1463,7 +1463,7 @@ tile-stipple-x-origin, tile-stipple-y-origin, dash-offset, and dash-list.
 <!-- .LP -->
 <!-- .sp -->
 To achieve the effects of the X Version 10
-<function>XDrawTiled </function>
+<function>XDrawTiled</function>
 <indexterm><primary>X10 compatibility</primary><secondary>XDrawTiled</secondary></indexterm>
 and 
 <function>XDrawFilled</function>,
@@ -1476,7 +1476,7 @@ use
 
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XDrawFilled</function></funcdef>
+  <funcdef>Status <function>XDrawFilled</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1542,7 +1542,7 @@ Specifies how many vertices are in vlist.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XDrawFilled </function>
+<function>XDrawFilled</function>
 function draws arbitrary polygons or curves and then fills them.
 </para>
 <para>
@@ -1564,7 +1564,7 @@ These functions have been superseded by the context management functions
 (see section 16.10). 
 It is often necessary to associate arbitrary information with resource IDs.
 Xlib provides the 
-<function>XAssocTable </function>
+<function>XAssocTable</function>
 functions that you can use to make such an association.
 <indexterm><primary>Hash Lookup</primary></indexterm>
 <indexterm><primary>Window</primary><secondary>IDs</secondary></indexterm>
@@ -1631,7 +1631,7 @@ use
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XAssocTable<function> *XCreateAssocTable</function></funcdef>
+  <funcdef>XAssocTable *<function>XCreateAssocTable</function></funcdef>
   <paramdef>int<parameter> size</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1661,7 +1661,7 @@ should be a power of two.
 Some size  suggestions  might  be:  use  32 buckets  per  100  objects,
 and a reasonable maximum number of objects per buckets is 8.
 If  an  error  allocating  memory  for  the
-<function>XAssocTable </function>
+<function>XAssocTable</function>
 occurs, 
 a NULL pointer is returned. 
 </para>
@@ -1677,7 +1677,7 @@ use
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMakeAssoc</function></funcdef>
+  <funcdef><function>XMakeAssoc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XAssocTable<parameter> *table</parameter></paramdef>
   <paramdef>XID<parameter> x_id</parameter></paramdef>
@@ -1751,7 +1751,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XLookUpAssoc</function></funcdef>
+  <funcdef>char *<function>XLookUpAssoc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XAssocTable<parameter> *table</parameter></paramdef>
   <paramdef>XID<parameter> x_id</parameter></paramdef>
@@ -1816,7 +1816,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDeleteAssoc</function></funcdef>
+  <funcdef><function>XDeleteAssoc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XAssocTable<parameter> *table</parameter></paramdef>
   <paramdef>XID<parameter> x_id</parameter></paramdef>
@@ -1880,7 +1880,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDestroyAssocTable</function></funcdef>
+  <funcdef><function>XDestroyAssocTable</function></funcdef>
   <paramdef>XAssocTable<parameter> *table</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
diff --git a/specs/libX11/CH01.xml b/specs/libX11/CH01.xml
index 37dee914..1203e80b 100644
--- a/specs/libX11/CH01.xml
+++ b/specs/libX11/CH01.xml
@@ -196,7 +196,7 @@ Xlib provides no support for sharing graphics contexts between applications.
 Client programs are informed of events.
 Events may either be side effects of a request (for example, restacking windows
 generates 
-<function>Expose </function>
+<function>Expose</function>
 events) or completely asynchronous (for example, from the keyboard).
 A client program asks to be informed of events.
 Because other applications can send events to your application,
@@ -611,7 +611,7 @@ Coordinates and sizes in X are actually 16-bit quantities.
 This decision was made to minimize the bandwidth required for a
 given level of performance.
 Coordinates usually are declared as an
-<function>int </function>
+<function>int</function>
 in the interface.
 Values larger than 16 bits are truncated silently.
 Sizes (width and height) are declared as unsigned quantities.
@@ -768,8 +768,8 @@ a..z A..Z 0..9 ._-
   <listitem>
     <para>
 Global symbols are printed in 
-<function>this </function>
-<function>special </function>
+<function>this</function>
+<function>special</function>
 <function>font</function>.
 These can be either function names,
 symbols defined in include files, or structure names.
diff --git a/specs/libX11/CH02.xml b/specs/libX11/CH02.xml
index 0391ac2d..0146ddff 100644
--- a/specs/libX11/CH02.xml
+++ b/specs/libX11/CH02.xml
@@ -157,7 +157,7 @@ Specifies the screen to be used on that server.
 Multiple screens can be controlled by a single X server.
 The screen_number sets an internal variable that can be accessed by
 using the 
-<function>DefaultScreen </function>
+<function>DefaultScreen</function>
 macro or the 
 <function>XDefaultScreen</function>
 function if you are using languages other than C (see section 2.2.1).
@@ -182,7 +182,7 @@ dual-headed:0.1
 The
 <function>XOpenDisplay</function>
 function returns a 
-<function>Display </function>
+<function>Display</function>
 structure that serves as the
 connection to the X server and that contains all the information
 about that X server.
@@ -214,14 +214,14 @@ mechanisms.
 <!-- .LP -->
 <indexterm><primary>Display</primary></indexterm>
 If successful, 
-<function>XOpenDisplay </function>
+<function>XOpenDisplay</function>
 returns a pointer to a 
-<function>Display </function>
+<function>Display</function>
 structure,
 which is defined in 
 <!-- .hN X11/Xlib.h . -->
 If 
-<function>XOpenDisplay </function>
+<function>XOpenDisplay</function>
 does not succeed, it returns NULL.
 After a successful call to
 <function>XOpenDisplay</function>,
@@ -239,7 +239,7 @@ and
 structures only by using the information macros or functions.
 For information about using macros and functions to obtain information from 
 the
-<function>Display </function>
+<function>Display</function>
 structure,
 see section 2.2.1.
 </para>
@@ -258,7 +258,7 @@ X servers may implement various types of access control mechanisms
 <!-- .LP -->
 The Xlib library provides a number of useful macros 
 and corresponding functions that return data from the 
-<function>Display </function>
+<function>Display</function>
 structure.
 The macros are used for C programming, 
 and their corresponding function equivalents are for other language bindings.
@@ -285,11 +285,11 @@ Screen information macros
 <!-- .LP -->
 <indexterm ><primary>Display</primary><secondary>data structure</secondary></indexterm>
 All other members of the 
-<function>Display </function>
+<function>Display</function>
 structure (that is, those for which no macros are defined) are private to Xlib 
 and must not be used.
 Applications must never directly modify or inspect these private members of the 
-<function>Display </function>
+<function>Display</function>
 structure.
 <!-- .NT Note -->
 The
@@ -341,9 +341,9 @@ a procedure.
 <!-- .LP -->
 <!-- .sp -->
 Both 
-<function>BlackPixel </function>
+<function>BlackPixel</function>
 and 
-<function>WhitePixel </function>
+<function>WhitePixel</function>
 can be used in implementing a monochrome application.
 These pixel values are for permanently allocated entries in the default
 colormap.
@@ -357,7 +357,7 @@ BlackPixel(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_nu
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XBlackPixel</function></funcdef>
+  <funcdef>unsigned long <function>XBlackPixel</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -402,7 +402,7 @@ WhitePixel(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_nu
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XWhitePixel</function></funcdef>
+  <funcdef>unsigned long <function>XWhitePixel</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -447,7 +447,7 @@ ConnectionNumber(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XConnectionNumber</function></funcdef>
+  <funcdef>int <function>XConnectionNumber</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -484,7 +484,7 @@ DefaultColormap(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>scre
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Colormap <function> XDefaultColormap</function></funcdef>
+  <funcdef>Colormap <function>XDefaultColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -530,7 +530,7 @@ DefaultDepth(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDefaultDepth</function></funcdef>
+  <funcdef>int <function>XDefaultDepth</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -581,7 +581,7 @@ DefaultGC(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_num
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>GC <function> XDefaultGC</function></funcdef>
+  <funcdef>GC <function>XDefaultGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
   <paramdef>int<parameter> *count_return</parameter></paramdef>
@@ -646,7 +646,7 @@ DefaultGC(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_num
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>GC <function> XDefaultGC</function></funcdef>
+  <funcdef>GC <function>XDefaultGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -699,7 +699,7 @@ DefaultRootWindow(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Window <function> XDefaultRootWindow</function></funcdef>
+  <funcdef>Window <function>XDefaultRootWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -733,7 +733,7 @@ DefaultScreenOfDisplay(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Screen *<function> XDefaultScreenOfDisplay</function></funcdef>
+  <funcdef>Screen *<function>XDefaultScreenOfDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -767,7 +767,7 @@ ScreenOfDisplay(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>scre
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Screen *<function> XScreenOfDisplay</function></funcdef>
+  <funcdef>Screen *<function>XScreenOfDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -812,7 +812,7 @@ DefaultScreen(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDefaultScreen</function></funcdef>
+  <funcdef>int <function>XDefaultScreen</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -850,7 +850,7 @@ DefaultVisual(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Visual *<function> XDefaultVisual</function></funcdef>
+  <funcdef>Visual *<function>XDefaultVisual</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -897,7 +897,7 @@ DisplayCells(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDisplayCells</function></funcdef>
+  <funcdef>int <function>XDisplayCells</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -942,7 +942,7 @@ DisplayPlanes(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDisplayPlanes</function></funcdef>
+  <funcdef>int <function>XDisplayPlanes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -989,7 +989,7 @@ DisplayString(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XDisplayString</function></funcdef>
+  <funcdef>char *<function>XDisplayString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1033,7 +1033,7 @@ LastKnownRequestProcessed(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XLastKnownRequestProcessed</function></funcdef>
+  <funcdef>unsigned long <function>XLastKnownRequestProcessed</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1090,7 +1090,7 @@ LastKnownRequestProcessed(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XLastKnownRequestProcessed</function></funcdef>
+  <funcdef>unsigned long <function>XLastKnownRequestProcessed</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1139,7 +1139,7 @@ LastKnownRequestProcessed(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XLastKnownRequestProcessed</function></funcdef>
+  <funcdef>unsigned long <function>XLastKnownRequestProcessed</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1176,7 +1176,7 @@ NextRequest(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XNextRequest</function></funcdef>
+  <funcdef>unsigned long <function>XNextRequest</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1212,7 +1212,7 @@ ProtocolVersion(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XProtocolVersion</function></funcdef>
+  <funcdef>int <function>XProtocolVersion</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1247,7 +1247,7 @@ ProtocolRevision(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XProtocolRevision</function></funcdef>
+  <funcdef>int <function>XProtocolRevision</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1281,7 +1281,7 @@ QLength(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XQLength</function></funcdef>
+  <funcdef>int <function>XQLength</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1318,7 +1318,7 @@ RootWindow(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_nu
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Window <function> XRootWindow</function></funcdef>
+  <funcdef>Window <function>XRootWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -1367,7 +1367,7 @@ ScreenCount(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XScreenCount</function></funcdef>
+  <funcdef>int <function>XScreenCount</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1401,7 +1401,7 @@ ServerVendor(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XServerVendor</function></funcdef>
+  <funcdef>char *<function>XServerVendor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1439,7 +1439,7 @@ VendorRelease(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XVendorRelease</function></funcdef>
+  <funcdef>int <function>XVendorRelease</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1512,7 +1512,7 @@ ImageByteOrder(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XImageByteOrder</function></funcdef>
+  <funcdef>int <function>XImageByteOrder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *count_return</parameter></paramdef>
 </funcprototype>
@@ -1575,7 +1575,7 @@ ImageByteOrder(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XImageByteOrder</function></funcdef>
+  <funcdef>int <function>XImageByteOrder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1601,7 +1601,7 @@ Both specify the required byte order for images for each scanline unit in
 XY format (bitmap) or for each pixel value in 
 Z format.
 The macro or function can return either
-<function>LSBFirst </function>
+<function>LSBFirst</function>
 or 
 <function>MSBFirst</function>.
 </para>
@@ -1615,7 +1615,7 @@ BitmapUnit(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XBitmapUnit</function></funcdef>
+  <funcdef>int <function>XBitmapUnit</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1650,7 +1650,7 @@ BitmapBitOrder(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XBitmapBitOrder</function></funcdef>
+  <funcdef>int <function>XBitmapBitOrder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1690,7 +1690,7 @@ BitmapPad(<emphasis remap='I'>display</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XBitmapPad</function></funcdef>
+  <funcdef>int <function>XBitmapPad</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1725,7 +1725,7 @@ DisplayHeight(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDisplayHeight</function></funcdef>
+  <funcdef>int <function>XDisplayHeight</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -1771,7 +1771,7 @@ DisplayHeightMM(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>scre
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDisplayHeightMM</function></funcdef>
+  <funcdef>int <function>XDisplayHeightMM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -1816,7 +1816,7 @@ DisplayWidth(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDisplayWidth</function></funcdef>
+  <funcdef>int <function>XDisplayWidth</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -1861,7 +1861,7 @@ DisplayWidthMM(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>scree
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDisplayWidthMM</function></funcdef>
+  <funcdef>int <function>XDisplayWidthMM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
 </funcprototype>
@@ -1920,7 +1920,7 @@ BlackPixelOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XBlackPixelOfScreen</function></funcdef>
+  <funcdef>unsigned long <function>XBlackPixelOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1956,7 +1956,7 @@ WhitePixelOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XWhitePixelOfScreen</function></funcdef>
+  <funcdef>unsigned long <function>XWhitePixelOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1992,7 +1992,7 @@ CellsOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XCellsOfScreen</function></funcdef>
+  <funcdef>int <function>XCellsOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2029,7 +2029,7 @@ DefaultColormapOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Colormap <function> XDefaultColormapOfScreen</function></funcdef>
+  <funcdef>Colormap <function>XDefaultColormapOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2065,7 +2065,7 @@ DefaultDepthOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDefaultDepthOfScreen</function></funcdef>
+  <funcdef>int <function>XDefaultDepthOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2101,7 +2101,7 @@ DefaultGCOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>GC <function> XDefaultGCOfScreen</function></funcdef>
+  <funcdef>GC <function>XDefaultGCOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2139,7 +2139,7 @@ DefaultVisualOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Visual *<function> XDefaultVisualOfScreen</function></funcdef>
+  <funcdef>Visual *<function>XDefaultVisualOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2177,7 +2177,7 @@ DoesBackingStore(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDoesBackingStore</function></funcdef>
+  <funcdef>int <function>XDoesBackingStore</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2207,7 +2207,7 @@ The value returned can be one of
 <function>WhenMapped</function>,
 <function>NotUseful</function>,
 or
-<function>Always </function>
+<function>Always</function>
 (see section 3.2.4).
 </para>
 <para>
@@ -2220,7 +2220,7 @@ DoesSaveUnders(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XDoesSaveUnders</function></funcdef>
+  <funcdef>Bool <function>XDoesSaveUnders</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2263,7 +2263,7 @@ DisplayOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Display *<function> XDisplayOfScreen</function></funcdef>
+  <funcdef>Display *<function>XDisplayOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2300,7 +2300,7 @@ EventMaskOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>long <function> XEventMaskOfScreen</function></funcdef>
+  <funcdef>long <function>XEventMaskOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2336,7 +2336,7 @@ EventMaskOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>long <function> XEventMaskOfScreen</function></funcdef>
+  <funcdef>long <function>XEventMaskOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2373,7 +2373,7 @@ WidthOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XWidthOfScreen</function></funcdef>
+  <funcdef>int <function>XWidthOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2409,7 +2409,7 @@ HeightOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XHeightOfScreen</function></funcdef>
+  <funcdef>int <function>XHeightOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2445,7 +2445,7 @@ WidthMMOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XWidthMMOfScreen</function></funcdef>
+  <funcdef>int <function>XWidthMMOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2481,7 +2481,7 @@ HeightMMOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XHeightMMOfScreen</function></funcdef>
+  <funcdef>int <function>XHeightMMOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2517,7 +2517,7 @@ MaxCmapsOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XMaxCmapsOfScreen</function></funcdef>
+  <funcdef>int <function>XMaxCmapsOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2554,7 +2554,7 @@ MinCmapsOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XMinCmapsOfScreen</function></funcdef>
+  <funcdef>int <function>XMinCmapsOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2591,7 +2591,7 @@ PlanesOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XPlanesOfScreen</function></funcdef>
+  <funcdef>int <function>XPlanesOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2627,7 +2627,7 @@ RootWindowOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Window <function> XRootWindowOfScreen</function></funcdef>
+  <funcdef>Window <function>XRootWindowOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2663,7 +2663,7 @@ Both return the root window of the specified screen.
 <para>
 <!-- .LP -->
 To execute a 
-<function>NoOperation </function>
+<function>NoOperation</function>
 protocol request, use
 <function>XNoOp</function>.
 <indexterm significance="preferred"><primary>XNoOp</primary></indexterm>
@@ -2690,7 +2690,7 @@ protocol request, use
 The
 <function>XNoOp</function>
 function sends a 
-<function>NoOperation </function>
+<function>NoOperation</function>
 protocol request to the X server,
 thereby exercising the connection.
 </para>
@@ -2876,7 +2876,7 @@ see section 2.6.
 <!-- .LP -->
 <function>XSetCloseDownMode</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 </sect1>
@@ -2906,7 +2906,7 @@ It disowns all selections owned by the client
 It performs an
 <function>XUngrabPointer</function>
 and
-<function>XUngrabKeyboard </function>
+<function>XUngrabKeyboard</function>
 if the client has actively grabbed the pointer 
 or the keyboard.
     </para>
@@ -2914,7 +2914,7 @@ or the keyboard.
   <listitem>
     <para>
 It performs an
-<function>XUngrabServer </function>
+<function>XUngrabServer</function>
 if the client has grabbed the server.
     </para>
   </listitem>
@@ -3314,7 +3314,7 @@ To stop tracking internal connections for a display, use
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status <function>XRemoveConnectionWatch </function></funcdef>
+  <funcdef>Status <function>XRemoveConnectionWatch</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XWatchProc<parameter> procedure</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
@@ -3431,7 +3431,7 @@ To obtain all of the current internal connections for a display, use
 </para>
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XInternalConnectionNumbers </function></funcdef>
+  <funcdef>Status <function>XInternalConnectionNumbers</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int **<parameter> fd</parameter></paramdef>
   <paramdef>int *<parameter> count_return</parameter></paramdef>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index e9760993..25335a60 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -25,7 +25,7 @@ the default depth of the default root window, and the default visual type
 <para>
 <!-- .LP -->
 Xlib uses an opaque 
-<function>Visual </function>
+<function>Visual</function>
 <indexterm significance="preferred"><primary>Visual</primary></indexterm>
 structure that contains information about the possible color mapping.
 The visual utility functions (see section 16.7) use an
@@ -96,9 +96,9 @@ independent <acronym>RGB</acronym> values, and the <acronym>RGB</acronym> values
   </listitem>
   <listitem>
     <para>
-<function>GrayScale </function>
+<function>GrayScale</function>
 is treated the same way as 
-<function>PseudoColor  </function>
+<function>PseudoColor</function>
 except that the primary that drives the screen is undefined. 
 Thus, the client should always store the
 same value for red, green, and blue in the colormaps.  
@@ -117,7 +117,7 @@ The <acronym>RGB</acronym> values can be changed dynamically.
     <para>
 <function>TrueColor</function>
 is treated the same way as 
-<function>DirectColor </function>
+<function>DirectColor</function>
 except that the colormap has predefined, read-only <acronym>RGB</acronym> values.
 These <acronym>RGB</acronym> values are server dependent but provide linear or near-linear
 ramps in each primary.  
@@ -127,19 +127,19 @@ ramps in each primary.
     <para>
 <function>StaticColor</function>
 is treated the same way as 
-<function>PseudoColor </function>
+<function>PseudoColor</function>
 except that the colormap has predefined, 
 read-only, server-dependent <acronym>RGB</acronym> values.
     </para>
   </listitem>
   <listitem>
     <para>
-<function>StaticGray </function>
+<function>StaticGray</function>
 is treated the same way as 
-<function>StaticColor </function>
+<function>StaticColor</function>
 except that the <acronym>RGB</acronym> values are equal for any single pixel
 value, thus resulting in shades of gray.  
-<function>StaticGray </function>
+<function>StaticGray</function>
 with a two-entry
 colormap can be thought of as monochrome.
     </para>
@@ -159,7 +159,7 @@ Actual <acronym>RGB</acronym> values are unsigned 16-bit numbers.
 The colormap_size member defines the number of available colormap entries
 in a newly created colormap.  
 For 
-<function>DirectColor </function>
+<function>DirectColor</function>
 and 
 <function>TrueColor</function>,
 this is the size of an individual pixel subfield.
@@ -175,7 +175,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>VisualID<function> XVisualIDFromVisual</function></funcdef>
+  <funcdef>VisualID <function>XVisualIDFromVisual</function></funcdef>
   <paramdef>Visual<parameter> *\^visual</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -325,7 +325,7 @@ When a window is eventually mapped to the screen
 <function>XMapWindow</function>),
 <indexterm><primary>XMapWindow</primary></indexterm>
 the X server generates an 
-<function>Expose </function>
+<function>Expose</function>
 event for the window if backing store has not been maintained.
 </para>
 <para>
@@ -551,7 +551,7 @@ a window's background in a single color.
 <para>
 <!-- .LP -->
 You can set the background-pixmap to a pixmap,  
-<function>None </function>
+<function>None</function>
 (default), or 
 <function>ParentRelative</function>.
 You can set the background-pixel of a window to any pixel value (no default).
@@ -637,10 +637,10 @@ the previous screen contents from other windows of the same depth as the window
 are simply left in place as long as the contents come from the parent of the
 window or an inferior of the parent.
 Otherwise, the initial contents of the exposed regions are undefined.
-<function>Expose </function>
+<function>Expose</function>
 events are then generated for the regions, even if the background-pixmap
 is
-<function>None </function>
+<function>None</function>
 (see section 10.9).
 </para>
 </sect2>
@@ -672,7 +672,7 @@ The border tile origin is always the same as the background tile origin.
 <!-- .LP -->
 You can also set the border-pixmap to a pixmap of any size (some may be faster
 than others) or to
-<function>CopyFromParent </function>
+<function>CopyFromParent</function>
 (default).
 You can set the border-pixel to any pixel value (no default).
 </para>
@@ -815,7 +815,7 @@ event is generated (see section 10.10.5).
 <para>
 <!-- .LP -->
 A bit-gravity of
-<function>StaticGravity </function>
+<function>StaticGravity</function>
 indicates that the contents or origin should not move relative to the 
 origin of the root window.
 If the change in size of the window is coupled with a change in position (x, y),
@@ -830,12 +830,12 @@ not when the window is moved.
 <para>
 <!-- .LP -->
 A bit-gravity of 
-<function>ForgetGravity </function>
+<function>ForgetGravity</function>
 indicates that the window's contents are always discarded after a size change, 
 even if a backing store or save under has been requested.
 The window is tiled with its background
 and zero or more 
-<function>Expose </function>
+<function>Expose</function>
 events are generated. 
 If no background is defined, the existing screen contents are not
 altered.
@@ -855,14 +855,14 @@ instead.
 <para>
 <!-- .LP -->
 A win-gravity of 
-<function>UnmapGravity </function>
+<function>UnmapGravity</function>
 is like 
 <function>NorthWestGravity</function>
 (the window is not moved),
 except the child is also
 unmapped when the parent is resized,
 and an 
-<function>UnmapNotify </function>
+<function>UnmapNotify</function>
 event is
 generated.
 </para>
@@ -883,7 +883,7 @@ are known as backing store.
 The backing store advises the X server on what to do 
 with the contents of a window.
 The backing-store attribute can be set to
-<function>NotUseful </function>
+<function>NotUseful</function>
 (default),
 <function>WhenMapped</function>,
 or
@@ -892,7 +892,7 @@ or
 <para>
 <!-- .LP -->
 A backing-store attribute of 
-<function>NotUseful </function>
+<function>NotUseful</function>
 advises the X server that 
 maintaining contents is unnecessary, 
 although some X implementations may
@@ -900,22 +900,22 @@ still choose to maintain contents and, therefore, not generate
 <function>Expose</function>
 events.
 A backing-store attribute of 
-<function>WhenMapped </function>
+<function>WhenMapped</function>
 advises the X server that maintaining contents of 
 obscured regions when the window is mapped would be beneficial.
 In this case,
 the server may generate an 
-<function>Expose </function>
+<function>Expose</function>
 event when the window is created.
 A backing-store attribute of 
-<function>Always </function>
+<function>Always</function>
 advises the X server that maintaining contents even when 
 the window is unmapped would be beneficial.  
 Even if the window is larger than its parent, 
 this is a request to the X server to maintain complete contents, 
 not just the region within the parent window boundaries.  
 While the X server maintains the window's contents, 
-<function>Expose </function>
+<function>Expose</function>
 events normally are not generated, 
 but the X server may stop maintaining 
 contents at any time.  
@@ -952,7 +952,7 @@ so the temporarily obscured applications do not have to repaint.
 You can set the save-under flag to
 <function>True</function>
 or
-<function>False </function>
+<function>False</function>
 (default).
 If save-under is 
 <function>True</function>,
@@ -1001,7 +1001,7 @@ window (or, for some event types, inferiors of this window).
 The event mask is the bitwise inclusive OR of zero or more of the 
 valid event mask bits.
 You can specify that no maskable events are reported by setting 
-<function>NoEventMask </function>
+<function>NoEventMask</function>
 (default).
 </para>
 <para>
@@ -1028,7 +1028,7 @@ of the following masks:
 and
 <function>ButtonMotion</function>.
 You can specify that all events are propagated by setting 
-<function>NoEventMask </function>
+<function>NoEventMask</function>
 (default).
 </para>
 </sect2>
@@ -1055,12 +1055,12 @@ use the override-redirect flag.
 <!-- .LP -->
 The override-redirect flag specifies whether map and configure requests 
 on this window should override a 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent.
 You can set the override-redirect flag to
 <function>True</function>
 or
-<function>False </function>
+<function>False</function>
 (default).
 Window managers use this information to avoid tampering with pop-up windows
 (see also chapter 14).
@@ -1079,7 +1079,7 @@ colors of the
 window.  
 The colormap must have the same visual type as the window,
 or a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.  
 X servers capable of supporting multiple 
 hardware colormaps can use this information, 
@@ -1096,12 +1096,12 @@ If you set the colormap to
 the parent window's colormap is copied and used by its child.
 However, the child window must have the same visual type as the parent, 
 or a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results. 
 The parent window must not have a colormap of 
 <function>None</function>,
 or a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 The colormap is copied by sharing the colormap object between the child 
 and parent, not by making a complete copy of the colormap contents.
@@ -1209,25 +1209,25 @@ see chapter 14 and the <emphasis remap='I'>Inter-Client Communication Convention
 <function>XCreateWindow</function>
 is the more general function that allows you to set specific window attributes 
 when you create a window.
-<function>XCreateSimpleWindow </function>
+<function>XCreateSimpleWindow</function>
 creates a window that inherits its attributes from its parent window.
 </para>
 <para>
 <!-- .LP -->
 <indexterm><primary>Window</primary><secondary>InputOnly</secondary></indexterm>
 The X server acts as if 
-<function>InputOnly </function>
+<function>InputOnly</function>
 windows do not exist for
 the purposes of graphics requests, exposure processing, and
-<function>VisibilityNotify </function>
+<function>VisibilityNotify</function>
 events.
 An 
-<function>InputOnly </function>
+<function>InputOnly</function>
 window cannot be used as a
 drawable (that is, as a source or destination for graphics requests).
 <function>InputOnly</function>
 and 
-<function>InputOutput </function>
+<function>InputOutput</function>
 windows act identically in other respects (properties,
 grabs, input control, and so on).
 Extension packages can define other classes of windows.
@@ -1240,7 +1240,7 @@ To create an unmapped window and set its window attributes, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Window<function> XCreateWindow</function></funcdef>
+  <funcdef>Window <function>XCreateWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> parent</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -1375,7 +1375,7 @@ is taken from the parent.
       <para>
 Specifies the visual type.
 A visual of 
-<function>CopyFromParent </function>
+<function>CopyFromParent</function>
 means the visual type is taken from the 
 parent.
       </para>
@@ -1491,7 +1491,7 @@ can generate
 <function>BadPixmap</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -1505,7 +1505,7 @@ subwindow of a given parent window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Window<function> XCreateSimpleWindow</function></funcdef>
+  <funcdef>Window <function>XCreateSimpleWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> parent</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -1652,7 +1652,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -1675,7 +1675,7 @@ To destroy a window and all of its subwindows, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDestroyWindow</function></funcdef>
+  <funcdef><function>XDestroyWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -1726,14 +1726,14 @@ The ordering among siblings and across subhierarchies is not otherwise
 constrained.
 If the window you specified is a root window, no windows are destroyed.
 Destroying a mapped window will generate 
-<function>Expose </function>
+<function>Expose</function>
 events on other windows that were obscured by the window being destroyed.
 </para>
 <para>
 <!-- .LP -->
 <function>XDestroyWindow</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -1745,7 +1745,7 @@ To destroy all subwindows of a specified window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDestroySubwindows</function></funcdef>
+  <funcdef><function>XDestroySubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -1788,7 +1788,7 @@ If any mapped
 subwindows were actually destroyed,
 <function>XDestroySubwindows</function>
 causes the X server to generate 
-<function>Expose </function>
+<function>Expose</function>
 events on the specified window.
 This is much more efficient than deleting many windows
 one at a time because much of the work need be performed only once for all
@@ -1799,7 +1799,7 @@ The subwindows should never be referenced again.
 <!-- .LP -->
 <function>XDestroySubwindows</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -1834,11 +1834,11 @@ It is entirely clipped by an ancestor.
 </itemizedlist>
 <para>
 <!-- .LP -->
-<function>Expose </function>
+<function>Expose</function>
 events are generated for the window when part or all of
 it becomes visible on the screen. 
 A client receives the
-<function>Expose </function>
+<function>Expose</function>
 events only if it has asked for them.
 Windows retain their position in the stacking order when they are unmapped.
 </para>
@@ -1846,12 +1846,12 @@ Windows retain their position in the stacking order when they are unmapped.
 <!-- .LP -->
 A window manager may want to control the placement of subwindows.
 If 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 has been selected by a window manager
 on a parent window (usually a root window),
 a map request initiated by other clients on a child window is not performed,
 and the window manager is sent a 
-<function>MapRequest </function>
+<function>MapRequest</function>
 event.
 However, if the override-redirect flag on the child had been set to
 <function>True</function>
@@ -1872,11 +1872,11 @@ Only a single client at a time can select for
 <para>
 <!-- .LP -->
 Similarly, a single client can select for 
-<function>ResizeRedirectMask </function>
+<function>ResizeRedirectMask</function>
 on a parent window.
 Then, any attempt to resize the window by another client is suppressed, and
 the client receives a 
-<function>ResizeRequest </function>
+<function>ResizeRequest</function>
 event.
 </para>
 <para>
@@ -1888,7 +1888,7 @@ To map a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMapWindow</function></funcdef>
+  <funcdef><function>XMapWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -1937,7 +1937,7 @@ This function has no effect if the window is already mapped.
 <para>
 <!-- .LP -->
 If the override-redirect of the window is
-<function>False </function>
+<function>False</function>
 and if some other client has selected
 <function>SubstructureRedirectMask</function>
 on the parent window, then the X server generates a
@@ -1971,11 +1971,11 @@ Similar tiling and exposure take place for any newly viewable inferiors.
 <!-- .LP -->
 <indexterm><primary>XMapWindow</primary></indexterm>
 If the window is an
-<function>InputOutput </function>
+<function>InputOutput</function>
 window,
 <function>XMapWindow</function>
 generates 
-<function>Expose </function>
+<function>Expose</function>
 events on each 
 <function>InputOutput</function>
 window that it causes to be displayed.
@@ -1984,16 +1984,16 @@ and if the client begins processing events,
 the window is painted twice.
 To avoid this,
 first ask for 
-<function>Expose </function>
+<function>Expose</function>
 events and then map the window,
 so the client processes input events as usual.
 The event list will include 
-<function>Expose </function>
+<function>Expose</function>
 for each
 window that has appeared on the screen. 
 The client's normal response to
 an 
-<function>Expose </function>
+<function>Expose</function>
 event should be to repaint the window.
 This method usually leads to simpler programs and to proper interaction
 with window managers.
@@ -2002,7 +2002,7 @@ with window managers.
 <!-- .LP -->
 <function>XMapWindow</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -2014,7 +2014,7 @@ To map and raise a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMapRaised</function></funcdef>
+  <funcdef><function>XMapRaised</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -2062,7 +2062,7 @@ see
 <!-- .LP -->
 <function>XMapRaised</function>
 can generate multiple
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2074,7 +2074,7 @@ To map all subwindows for a specified window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMapSubwindows</function></funcdef>
+  <funcdef><function>XMapSubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -2122,7 +2122,7 @@ only once, for all of the windows, rather than for each window.
 <!-- .LP -->
 <function>XMapSubwindows</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -2144,7 +2144,7 @@ To unmap a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUnmapWindow</function></funcdef>
+  <funcdef><function>XUnmapWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -2184,7 +2184,7 @@ function unmaps the specified window and causes the X server to generate an
 <indexterm><primary>XUnmapWindow</primary></indexterm>
 event.
 If the specified window is already unmapped, 
-<function>XUnmapWindow </function>
+<function>XUnmapWindow</function>
 has no effect.
 Normal exposure processing on formerly obscured windows is performed.
 Any child window will no longer be visible until another map call is
@@ -2192,14 +2192,14 @@ made on the parent.
 In other words, the subwindows are still mapped but are not visible
 until the parent is mapped.
 Unmapping a window will generate 
-<function>Expose </function>
+<function>Expose</function>
 events on windows that were formerly obscured by it.
 </para>
 <para>
 <!-- .LP -->
 <function>XUnmapWindow</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -2211,7 +2211,7 @@ To unmap all subwindows for a specified window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUnmapSubwindows</function></funcdef>
+  <funcdef><function>XUnmapSubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -2250,7 +2250,7 @@ stacking order.
 It causes the X server to generate an
 <function>UnmapNotify</function>
 event on each subwindow and 
-<function>Expose </function>
+<function>Expose</function>
 events on formerly obscured windows.
 <indexterm><primary>UnmapNotify Event</primary></indexterm>
 Using this function is much more efficient than unmapping multiple windows
@@ -2261,7 +2261,7 @@ only once, for all of the windows, rather than for each window.
 <!-- .LP -->
 <function>XUnmapSubwindows</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -2353,7 +2353,7 @@ or
 <para>
 <!-- .LP -->
 If the override-redirect flag of the window is
-<function>False </function>
+<function>False</function>
 and if some other client has selected
 <function>SubstructureRedirectMask</function>
 on the parent, the X server generates a
@@ -2361,7 +2361,7 @@ on the parent, the X server generates a
 event, and no further processing is performed.
 Otherwise, 
 if some other client has selected 
-<function>ResizeRedirectMask </function>
+<function>ResizeRedirectMask</function>
 on the window and the inside
 width or height of the window is being changed,
 a 
@@ -2370,22 +2370,22 @@ event is generated, and the current inside width and height are
 used instead.
 Note that the override-redirect flag of the window has no effect
 on
-<function>ResizeRedirectMask </function>
+<function>ResizeRedirectMask</function>
 and that
 <function>SubstructureRedirectMask</function>
 on the parent has precedence over
-<function>ResizeRedirectMask </function>
+<function>ResizeRedirectMask</function>
 on the window.
 </para>
 <para>
 <!-- .LP -->
 When the geometry of the window is changed as specified, 
 the window is restacked among siblings, and a
-<function>ConfigureNotify </function>
+<function>ConfigureNotify</function>
 event is generated if the state of the window actually changes.
 <function>GravityNotify</function>
 events are generated after 
-<function>ConfigureNotify </function>
+<function>ConfigureNotify</function>
 events.
 If the inside width or height of the window has actually changed, 
 children of the window are affected as specified.
@@ -2516,7 +2516,7 @@ To configure a window's size, location, stacking, or border, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XConfigureWindow</function></funcdef>
+  <funcdef><function>XConfigureWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>unsignedint<parameter> value_mask</parameter></paramdef>
@@ -2565,7 +2565,7 @@ This mask is the bitwise inclusive OR of the valid configure window values bits.
     <listitem>
       <para>
 Specifies the 
-<function>XWindowChanges </function>
+<function>XWindowChanges</function>
 structure.
     </para>
   </listitem>
@@ -2610,7 +2610,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2622,7 +2622,7 @@ To move a window without changing its size, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMoveWindow</function></funcdef>
+  <funcdef><function>XMoveWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -2689,21 +2689,21 @@ depending on if the window is obscured by nonchildren
 and if no backing store exists.
 If the contents of the window are lost, 
 the X server generates
-<function>Expose </function>
+<function>Expose</function>
 events.
 Moving a mapped window generates
-<function>Expose </function>
+<function>Expose</function>
 events on any formerly obscured windows. 
 </para>
 <para>
 <!-- .LP -->
 If the override-redirect flag of the window is 
-<function>False </function>
+<function>False</function>
 and some
 other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent, the X server generates a
-<function>ConfigureRequest </function>
+<function>ConfigureRequest</function>
 event, and no further processing is
 performed.  
 Otherwise, the window is moved.
@@ -2712,7 +2712,7 @@ Otherwise, the window is moved.
 <!-- .LP -->
 <function>XMoveWindow</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -2724,7 +2724,7 @@ To change a window's size without changing the upper-left coordinate, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XResizeWindow</function></funcdef>
+  <funcdef><function>XResizeWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
@@ -2787,22 +2787,22 @@ its borders.
 This function does not change the window's upper-left coordinate or
 the origin and does not restack the window.
 Changing the size of a mapped window may lose its contents and generate
-<function>Expose </function>
+<function>Expose</function>
 events.
 If a mapped window is made smaller, 
 changing its size generates
-<function>Expose </function>
+<function>Expose</function>
 events on windows that the mapped window formerly obscured.
 </para>
 <para>
 <!-- .LP -->
 If the override-redirect flag of the window is 
-<function>False </function>
+<function>False</function>
 and some
 other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent, the X server generates a
-<function>ConfigureRequest </function>
+<function>ConfigureRequest</function>
 event, and no further processing is performed.  
 If either width or height is zero,
 a
@@ -2815,7 +2815,7 @@ error results.
 can generate
 <function>BadValue</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2827,7 +2827,7 @@ To change the size and location of a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMoveResizeWindow</function></funcdef>
+  <funcdef><function>XMoveResizeWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -2911,22 +2911,22 @@ The
 function changes the size and location of the specified window 
 without raising it.
 Moving and resizing a mapped window may generate an
-<function>Expose </function>
+<function>Expose</function>
 event on the window.
 Depending on the new size and location parameters,
 moving and resizing a window may generate 
-<function>Expose </function>
+<function>Expose</function>
 events on windows that the window formerly obscured. 
 </para>
 <para>
 <!-- .LP -->
 If the override-redirect flag of the window is 
-<function>False </function>
+<function>False</function>
 and some
 other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent, the X server generates a
-<function>ConfigureRequest </function>
+<function>ConfigureRequest</function>
 event, and no further processing is performed.  
 Otherwise, the window size and location are changed.
 </para>
@@ -2934,9 +2934,9 @@ Otherwise, the window size and location are changed.
 <!-- .LP -->
 <function>XMoveResizeWindow</function>
 can generate
-<function>BadValue </function>
+<function>BadValue</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2948,7 +2948,7 @@ To change the border width of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWindowBorderWidth</function></funcdef>
+  <funcdef><function>XSetWindowBorderWidth</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>unsignedint<parameter> width</parameter></paramdef>
@@ -2999,7 +2999,7 @@ function sets the specified window's border width to the specified width.
 <!-- .LP -->
 <function>XSetWindowBorderWidth</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -3025,7 +3025,7 @@ To raise a window so that no sibling window obscures it, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRaiseWindow</function></funcdef>
+  <funcdef><function>XRaiseWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -3073,12 +3073,12 @@ events for the window and any mapped subwindows that were formerly obscured.
 <para>
 <!-- .LP -->
 If the override-redirect attribute of the window is 
-<function>False </function>
+<function>False</function>
 and some
 other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent, the X server generates a
-<function>ConfigureRequest </function>
+<function>ConfigureRequest</function>
 event, and no processing is performed.
 Otherwise, the window is raised.
 </para>
@@ -3086,7 +3086,7 @@ Otherwise, the window is raised.
 <!-- .LP -->
 <function>XRaiseWindow</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -3098,7 +3098,7 @@ To lower a window so that it does not obscure any sibling windows, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XLowerWindow</function></funcdef>
+  <funcdef><function>XLowerWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -3140,18 +3140,18 @@ stacked on a desk, then lowering a window is analogous to moving the
 sheet to the bottom of the stack but leaving its x and y location on
 the desk constant.
 Lowering a mapped window will generate 
-<function>Expose </function>
+<function>Expose</function>
 events on any windows it formerly obscured.
 </para>
 <para>
 <!-- .LP -->
 If the override-redirect attribute of the window is 
-<function>False </function>
+<function>False</function>
 and some
 other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent, the X server generates a
-<function>ConfigureRequest </function>
+<function>ConfigureRequest</function>
 event, and no processing is performed.  
 Otherwise, the window is lowered to the bottom of the
 stack.
@@ -3160,7 +3160,7 @@ stack.
 <!-- .LP -->
 <function>XLowerWindow</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -3172,7 +3172,7 @@ To circulate a subwindow up or down, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XCirculateSubwindows</function></funcdef>
+  <funcdef><function>XCirculateSubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> direction</parameter></paramdef>
@@ -3236,9 +3236,9 @@ lowers the highest mapped child (if any) that occludes another child
 to the bottom of the stack.
 Exposure processing is then performed on formerly obscured windows.
 If some other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the window, the X server generates a 
-<function>CirculateRequest </function>
+<function>CirculateRequest</function>
 event, and no further processing is performed.
 If a child is actually restacked,
 the X server generates a
@@ -3251,7 +3251,7 @@ event.
 can generate
 <function>BadValue</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -3264,7 +3264,7 @@ occluded by another child, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XCirculateSubwindowsUp</function></funcdef>
+  <funcdef><function>XCirculateSubwindowsUp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -3313,7 +3313,7 @@ specified.
 <!-- .LP -->
 <function>XCirculateSubwindowsUp</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -3326,7 +3326,7 @@ completely occludes another child, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XCirculateSubwindowsDown</function></funcdef>
+  <funcdef><function>XCirculateSubwindowsDown</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -3373,7 +3373,7 @@ specified.
 <!-- .LP -->
 <function>XCirculateSubwindowsDown</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -3385,7 +3385,7 @@ To restack a set of windows from top to bottom, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRestackWindows</function></funcdef>
+  <funcdef><function>XRestackWindows</function></funcdef>
   <paramdef>XRestackWindows\^(\^display,windows,<parameter> \^nwindows)</parameter></paramdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> windows[]</parameter></paramdef>
@@ -3445,12 +3445,12 @@ error results.
 <para>
 <!-- .LP -->
 If the override-redirect attribute of a window is 
-<function>False </function>
+<function>False</function>
 and some
 other client has selected 
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent, the X server generates 
-<function>ConfigureRequest </function>
+<function>ConfigureRequest</function>
 events for each window whose override-redirect flag is not set, 
 and no further processing is performed.
 Otherwise, the windows will be restacked in top-to-bottom order.
@@ -3459,7 +3459,7 @@ Otherwise, the windows will be restacked in top-to-bottom order.
 <!-- .LP -->
 <function>XRestackWindows</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -3491,7 +3491,7 @@ To change one or more attributes for a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeWindowAttributes</function></funcdef>
+  <funcdef><function>XChangeWindowAttributes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
@@ -3578,7 +3578,7 @@ To repaint the window and its background, use
 Setting the border or changing the background such that the
 border tile origin changes causes the border to be repainted.
 Changing the background of a root window to 
-<function>None </function>
+<function>None</function>
 or 
 <function>ParentRelative</function>
 restores the default background pixmap.
@@ -3588,7 +3588,7 @@ restores the default border pixmap.
 Changing the win-gravity does not affect the current position of the
 window.
 Changing the backing-store of an obscured window to 
-<function>WhenMapped </function>
+<function>WhenMapped</function>
 or
 <function>Always</function>,
 or changing the backing-planes, backing-pixel, or
@@ -3602,7 +3602,7 @@ immediate effect on the screen because the map may not be installed
 (see
 <function>XInstallColormap</function>).
 Changing the cursor of a root window to 
-<function>None </function>
+<function>None</function>
 restores the default
 cursor.
 Whenever possible, you are encouraged to share colormaps.
@@ -3637,7 +3637,7 @@ can generate
 <function>BadPixmap</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -3649,7 +3649,7 @@ To set the background of a window to a given pixel, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWindowBackground</function></funcdef>
+  <funcdef><function>XSetWindowBackground</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>unsignedlong<parameter> background_pixel</parameter></paramdef>
@@ -3710,7 +3710,7 @@ error results.
 can generate
 <function>BadMatch</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -3726,7 +3726,7 @@ To set the background of a window to a given pixmap, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWindowBackgroundPixmap</function></funcdef>
+  <funcdef><function>XSetWindowBackgroundPixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Pixmap<parameter> background_pixmap</parameter></paramdef>
@@ -3800,7 +3800,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadPixmap</function>,
 and 
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 <!-- .NT Note -->
 <function>XSetWindowBackground</function>
@@ -3818,7 +3818,7 @@ To change and repaint a window's border to a given pixel, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWindowBorder</function></funcdef>
+  <funcdef><function>XSetWindowBorder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>unsignedlong<parameter> border_pixel</parameter></paramdef>
@@ -3874,9 +3874,9 @@ error results.
 <!-- .LP -->
 <function>XSetWindowBorder</function>
 can generate
-<function>BadMatch </function>
+<function>BadMatch</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -3888,7 +3888,7 @@ To change and repaint the border tile of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWindowBorderPixmap</function></funcdef>
+  <funcdef><function>XSetWindowBorderPixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Pixmap<parameter> border_pixmap</parameter></paramdef>
@@ -3955,7 +3955,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadPixmap</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -3967,7 +3967,7 @@ To set the colormap of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWindowColormap</function></funcdef>
+  <funcdef><function>XSetWindowColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Colormap<parameter> colormap</parameter></paramdef>
@@ -4025,7 +4025,7 @@ can generate
 <function>BadColor</function>,
 <function>BadMatch</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -4038,7 +4038,7 @@ To define which cursor will be used in a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDefineCursor</function></funcdef>
+  <funcdef><function>XDefineCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Cursor<parameter> cursor</parameter></paramdef>
@@ -4094,7 +4094,7 @@ it is equivalent to
 can generate
 <function>BadCursor</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -4107,7 +4107,7 @@ To undefine the cursor in a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUndefineCursor</function></funcdef>
+  <funcdef><function>XUndefineCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -4153,7 +4153,7 @@ the default cursor is restored.
 <!-- .LP -->
 <function>XUndefineCursor</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 <!-- .bp -->
 
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index 381cc0a7..a3d99844 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -39,7 +39,7 @@ a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XQueryTree</function></funcdef>
+  <funcdef>Status <function>XQueryTree</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window<parameter> *root_return</parameter></paramdef>
@@ -146,7 +146,7 @@ To obtain the current attributes of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWindowAttributes</function></funcdef>
+  <funcdef>Status <function>XGetWindowAttributes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XWindowAttributes<parameter> *window_attributes_return</parameter></paramdef>
@@ -406,7 +406,7 @@ To obtain the current geometry of a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetGeometry</function></funcdef>
+  <funcdef>Status <function>XGetGeometry</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>Window<parameter> *root_return</parameter></paramdef>
@@ -567,7 +567,7 @@ space of another window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XTranslateCoordinates</function></funcdef>
+  <funcdef>Bool <function>XTranslateCoordinates</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Windowsrc_w,<parameter> dest_w</parameter></paramdef>
   <paramdef>intsrc_x,<parameter> src_y</parameter></paramdef>
@@ -688,7 +688,7 @@ Otherwise, child_return is set to
 <!-- .LP -->
 <function>XTranslateCoordinates</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -701,7 +701,7 @@ or to determine the pointer coordinates relative to a specified window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XQueryPointer</function></funcdef>
+  <funcdef>Bool <function>XQueryPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window*root_return,<parameter> *child_return</parameter></paramdef>
@@ -855,7 +855,7 @@ may lag the physical state if device event processing is frozen
 <!-- .LP -->
 <function>XQueryPointer</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -912,7 +912,7 @@ predefined in the server for commonly used functions.
 The atoms for these properties are defined in 
 <!-- .hN X11/Xatom.h . -->
 To avoid name clashes with user symbols, the 
-<function>#define </function>
+<function>#define</function>
 name for each atom has the XA_ prefix.
 For an explanation of the functions that let you get and set
 much of the information stored in these predefined properties,
@@ -962,7 +962,7 @@ Font properties
   <listitem>
     <para>
 Type of a 
-<function>ClientMessage </function>
+<function>ClientMessage</function>
 event (none are built into the X server)
     </para>
   </listitem>
@@ -1189,7 +1189,7 @@ To return an atom for a given name, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Atom<function> XInternAtom</function></funcdef>
+  <funcdef>Atom <function>XInternAtom</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *atom_name</parameter></paramdef>
   <paramdef>Bool<parameter> only_if_exists</parameter></paramdef>
@@ -1258,7 +1258,7 @@ the X server closes.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1271,7 +1271,7 @@ To return atoms for an array of names, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XInternAtoms</function></funcdef>
+  <funcdef>Status <function>XInternAtoms</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> **names</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -1359,7 +1359,7 @@ otherwise, it returns zero.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1372,7 +1372,7 @@ To return a name for a given atom identifier, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XGetAtomName</function></funcdef>
+  <funcdef>char *<function>XGetAtomName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Atom<parameter> atom</parameter></paramdef>
 </funcprototype>
@@ -1418,7 +1418,7 @@ call
 <!-- .LP -->
 <function>XGetAtomName</function>
 can generate a
-<function>BadAtom </function>
+<function>BadAtom</function>
 error.
 </para>
 <para>
@@ -1431,7 +1431,7 @@ To return the names for an array of atom identifiers, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetAtomNames</function></funcdef>
+  <funcdef>Status <function>XGetAtomNames</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Atom<parameter> *atoms</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -1506,7 +1506,7 @@ otherwise, it returns zero.
 <!-- .LP -->
 <function>XGetAtomNames</function>
 can generate a
-<function>BadAtom </function>
+<function>BadAtom</function>
 error.
 </para>
 </sect1>
@@ -1548,7 +1548,7 @@ To obtain the type, format, and value of a property of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XGetWindowProperty</function></funcdef>
+  <funcdef>int <function>XGetWindowProperty</function></funcdef>
   <paramdef><parameter> \^display</parameter></paramdef>
   <paramdef><parameter> w</parameter></paramdef>
   <paramdef><parameter> property</parameter></paramdef>
@@ -1707,7 +1707,7 @@ sets the return arguments as follows:
   <listitem>
     <para>
 If the specified property does not exist for the specified window,
-<function>XGetWindowProperty </function>
+<function>XGetWindowProperty</function>
 returns 
 <function>None</function>
 to actual_type_return and the value zero to 
@@ -1720,7 +1720,7 @@ In this case, the delete argument is ignored.
     <para>
 If the specified property exists 
 but its type does not match the specified type,
-<function>XGetWindowProperty </function>
+<function>XGetWindowProperty</function>
 returns the actual property type to actual_type_return, 
 the actual property format (never zero) to actual_format_return, 
 and the property length in bytes
@@ -1733,9 +1733,9 @@ The nitems_return argument is empty.
   <listitem>
     <para>
 If the specified property exists and either you assign 
-<function>AnyPropertyType </function>
+<function>AnyPropertyType</function>
 to the req_type argument or the specified type matches the actual property type,
-<function>XGetWindowProperty </function>
+<function>XGetWindowProperty</function>
 returns the actual property type to actual_type_return and the actual
 property format (never zero) to actual_format_return. 
 It also returns a value to bytes_after_return and nitems_return, by 
@@ -1791,12 +1791,12 @@ do not have to be copied into yet another string before use.
 <para>
 <!-- .LP -->
 If delete is 
-<function>True </function>
+<function>True</function>
 and bytes_after_return is zero, 
 <function>XGetWindowProperty</function>
 deletes the property 
 from the window and generates a 
-<function>PropertyNotify </function>
+<function>PropertyNotify</function>
 event on the window.
 </para>
 <para>
@@ -1815,7 +1815,7 @@ can generate
 <function>BadAtom</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -1828,7 +1828,7 @@ To obtain a given window's property list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Atom<function> *XListProperties</function></funcdef>
+  <funcdef>Atom *<function>XListProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> *num_prop_return</parameter></paramdef>
@@ -1883,7 +1883,7 @@ To free the memory allocated by this function, use
 <!-- .LP -->
 <function>XListProperties</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 <para>
@@ -1901,7 +1901,7 @@ To change a property of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeProperty</function></funcdef>
+  <funcdef><function>XChangeProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Atomproperty,<parameter> type</parameter></paramdef>
@@ -2087,7 +2087,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2102,7 +2102,7 @@ To rotate a window's property list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRotateWindowProperties</function></funcdef>
+  <funcdef><function>XRotateWindowProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Atom<parameter> properties[]\^</parameter></paramdef>
@@ -2187,12 +2187,12 @@ event for each property in the order that they are listed in the array.
 If an atom occurs more than once in the list or no property with that 
 name is defined for the window,
 a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 If a 
-<function>BadAtom </function>
+<function>BadAtom</function>
 or 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results,
 no properties are changed.
 </para>
@@ -2203,7 +2203,7 @@ can generate
 <function>BadAtom</function>,
 <function>BadMatch</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2216,7 +2216,7 @@ To delete a property on a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDeleteProperty</function></funcdef>
+  <funcdef><function>XDeleteProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Atom<parameter> property</parameter></paramdef>
@@ -2274,7 +2274,7 @@ event on the window unless the property does not exist.
 can generate
 <function>BadAtom</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -2339,7 +2339,7 @@ To set the selection owner, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetSelectionOwner</function></funcdef>
+  <funcdef><function>XSetSelectionOwner</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Atom<parameter> selection</parameter></paramdef>
   <paramdef>Window<parameter> owner</parameter></paramdef>
@@ -2424,7 +2424,7 @@ the same as the current owner of the selection and the current
 owner is not
 <function>None</function>,
 the current owner is sent a 
-<function>SelectionClear </function>
+<function>SelectionClear</function>
 event.
 If the client that is the owner of a selection is later
 terminated (that is, its connection is closed)
@@ -2449,7 +2449,7 @@ Selections are global to the X server.
 can generate
 <function>BadAtom</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2462,7 +2462,7 @@ To return the selection owner, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Window<function> XGetSelectionOwner</function></funcdef>
+  <funcdef>Window <function>XGetSelectionOwner</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Atom<parameter> selection</parameter></paramdef>
 </funcprototype>
@@ -2511,7 +2511,7 @@ there is no owner for the selection.
 <!-- .LP -->
 <function>XGetSelectionOwner</function>
 can generate a
-<function>BadAtom </function>
+<function>BadAtom</function>
 error.
 </para>
 <para>
@@ -2524,7 +2524,7 @@ To request conversion of a selection, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XConvertSelection</function></funcdef>
+  <funcdef><function>XConvertSelection</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Atomselection,<parameter> target</parameter></paramdef>
   <paramdef>Atom<parameter> property</parameter></paramdef>
@@ -2637,7 +2637,7 @@ There are two predefined selection atoms: PRIMARY and SECONDARY.
 can generate
 <function>BadAtom</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 <!-- .bp -->
 
diff --git a/specs/libX11/CH05.xml b/specs/libX11/CH05.xml
index 9faa197b..12dfd33f 100644
--- a/specs/libX11/CH05.xml
+++ b/specs/libX11/CH05.xml
@@ -23,7 +23,7 @@ To create a pixmap of a given size, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Pixmap<function> XCreatePixmap</function></funcdef>
+  <funcdef>Pixmap <function>XCreatePixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
@@ -123,7 +123,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadDrawable</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -135,7 +135,7 @@ To free all storage associated with a specified pixmap, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreePixmap</function></funcdef>
+  <funcdef><function>XFreePixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Pixmap<parameter> pixmap</parameter></paramdef>
 </funcprototype>
@@ -177,7 +177,7 @@ The pixmap should never be referenced again.
 <!-- .LP -->
 <function>XFreePixmap</function>
 can generate a
-<function>BadPixmap </function>
+<function>BadPixmap</function>
 error.
 </para>
 </sect1>
@@ -227,7 +227,7 @@ To create a cursor from the standard cursor font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Cursor<function> XCreateFontCursor</function></funcdef>
+  <funcdef>Cursor <function>XCreateFontCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedint<parameter> shape</parameter></paramdef>
 </funcprototype>
@@ -282,7 +282,7 @@ see appendix B.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -294,7 +294,7 @@ To create a cursor from font glyphs, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Cursor<function> XCreateGlyphCursor</function></funcdef>
+  <funcdef>Cursor <function>XCreateGlyphCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Fontsource_font,<parameter> mask_font</parameter></paramdef>
   <paramdef>unsignedintsource_char,<parameter> mask_char</parameter></paramdef>
@@ -420,7 +420,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadFont</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -433,7 +433,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Cursor<function> XCreatePixmapCursor</function></funcdef>
+  <funcdef>Cursor <function>XCreatePixmapCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Pixmap<parameter> source</parameter></paramdef>
   <paramdef>Pixmap<parameter> mask</parameter></paramdef>
@@ -580,7 +580,7 @@ To determine useful cursor sizes, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XQueryBestCursor</function></funcdef>
+  <funcdef>Status <function>XQueryBestCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
@@ -673,7 +673,7 @@ cannot support large ones.
 <!-- .LP -->
 <function>XQueryBestCursor</function>
 can generate a
-<function>BadDrawable </function>
+<function>BadDrawable</function>
 error.
 </para>
 <para>
@@ -685,7 +685,7 @@ To change the color of a given cursor, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRecolorCursor</function></funcdef>
+  <funcdef><function>XRecolorCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Cursor<parameter> cursor</parameter></paramdef>
   <paramdef>XColor*foreground_color,<parameter> *background_color</parameter></paramdef>
@@ -751,7 +751,7 @@ structures are ignored; only the <acronym>RGB</acronym> values are used.
 <!-- .LP -->
 <function>XRecolorCursor</function>
 can generate a
-<function>BadCursor </function>
+<function>BadCursor</function>
 error.
 </para>
 <para>
@@ -763,7 +763,7 @@ To free (destroy) a given cursor, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeCursor</function></funcdef>
+  <funcdef><function>XFreeCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Cursor<parameter> cursor</parameter></paramdef>
 </funcprototype>
@@ -806,7 +806,7 @@ The specified cursor ID should not be referred to again.
 <!-- .LP -->
 <function>XFreeCursor</function>
 can generate a
-<function>BadCursor </function>
+<function>BadCursor</function>
 error.
 <!-- .bp -->
 
diff --git a/specs/libX11/CH06.xml b/specs/libX11/CH06.xml
index cd3e0a83..3e432fab 100644
--- a/specs/libX11/CH06.xml
+++ b/specs/libX11/CH06.xml
@@ -148,10 +148,10 @@ are written to encourage sharing of colormap entries between applications.
 <para>
 <!-- .LP -->
 The 
-<function>DefaultColormap </function>
+<function>DefaultColormap</function>
 macro returns the default colormap.
 The 
-<function>DefaultVisual </function>
+<function>DefaultVisual</function>
 macro
 returns the default visual type for the specified screen.
 <indexterm><primary>Color map</primary></indexterm>
@@ -162,7 +162,7 @@ Possible visual types are
 <function>PseudoColor</function>,
 <function>TrueColor</function>,
 or 
-<function>DirectColor </function>
+<function>DirectColor</function>
 (see section 3.1).
 </para>
 <sect1 id="Color_Structures">
@@ -807,7 +807,7 @@ To create a colormap for a screen, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Colormap<function> XCreateColormap</function></funcdef>
+  <funcdef>Colormap <function>XCreateColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Visual<parameter> *visual</parameter></paramdef>
@@ -859,7 +859,7 @@ error results.
       <para>
 Specifies the colormap entries to be allocated.
 You can pass 
-<function>AllocNone </function>
+<function>AllocNone</function>
 or 
 <function>AllocAll</function>.
     </para>
@@ -943,7 +943,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -956,7 +956,7 @@ shared colormap has failed because of resource exhaustion, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Colormap<function>XCopyColormapAndFree </function></funcdef>
+  <funcdef>Colormap <function>XCopyColormapAndFree</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Colormap<parameter> colormap</parameter></paramdef>
 </funcprototype>
@@ -1020,7 +1020,7 @@ and that have not been freed since they were allocated.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadColor </function>
+<function>BadColor</function>
 errors.
 </para>
 <para>
@@ -1081,7 +1081,7 @@ or
 <function>XChangeWindowAttributes</function>),
 <function>XFreeColormap</function>
 changes the colormap associated with the window to
-<function>None </function>
+<function>None</function>
 and generates a
 <function>ColormapNotify</function>
 event.
@@ -1092,7 +1092,7 @@ X does not define the colors displayed for a window with a colormap of
 <!-- .LP -->
 <function>XFreeColormap</function>
 can generate a
-<function>BadColor </function>
+<function>BadColor</function>
 error.
 </para>
 </sect1>
@@ -1195,7 +1195,7 @@ otherwise, it returns zero.
 <!-- .LP -->
 <function>XLookupColor</function>
 can generate a
-<function>BadColor </function>
+<function>BadColor</function>
 error.
 </para>
 <para>
@@ -1285,7 +1285,7 @@ otherwise, it returns zero.
 <!-- .LP -->
 <function>XParseColor</function>
 can generate a
-<function>BadColor </function>
+<function>BadColor</function>
 error.
 </para>
 <para>
@@ -1526,7 +1526,7 @@ structure.
 <!-- .LP -->
 <function>XAllocColor</function>
 can generate a
-<function>BadColor </function>
+<function>BadColor</function>
 error.
 <!-- .EQ -->
 delim %%
@@ -1618,7 +1618,7 @@ returns the pixel value of the color cell and the color specification
 actually allocated.
 This returned color specification is the result of converting the <acronym>RGB</acronym> value
 returned by 
-<function>XAllocColor </function>
+<function>XAllocColor</function>
 into the format specified with the result_format argument.
 If there is no interest in a returned color specification, 
 unnecessary computation can be bypassed if result_format is set to
@@ -2014,7 +2014,7 @@ ncolors * %2 sup nplanes% distinct pixels can be produced.
 All of these are
 allocated writable by the request.
 For 
-<function>GrayScale </function>
+<function>GrayScale</function>
 or 
 <function>PseudoColor</function>,
 each mask has exactly one bit set to 1. 
@@ -2022,12 +2022,12 @@ For
 <function>DirectColor</function>,
 each has exactly three bits set to 1.
 If contig is 
-<function>True </function>
+<function>True</function>
 and if all masks are ORed
 together, a single contiguous set of bits set to 1 will be formed for 
 <function>GrayScale</function>
 or 
-<function>PseudoColor </function>
+<function>PseudoColor</function>
 and three contiguous sets of bits set to 1 (one within each
 pixel subfield) for 
 <function>DirectColor</function>.
@@ -2042,7 +2042,7 @@ returns nonzero if it succeeded or zero if it failed.
 can generate
 <function>BadColor</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2245,7 +2245,7 @@ returns nonzero if it succeeded or zero if it failed.
 can generate
 <function>BadColor</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2347,7 +2347,7 @@ and
 <function>XAllocColorPlanes</function>).
 Note that freeing an
 individual pixel obtained from 
-<function>XAllocColorPlanes </function>
+<function>XAllocColorPlanes</function>
 may not actually allow
 it to be reused until all of its related pixels are also freed.
 Similarly,
@@ -2360,7 +2360,7 @@ it must free the entry that many times before the entry is actually freed.
 All specified pixels that are allocated by the client in the colormap are
 freed, even if one or more pixels produce an error. 
 If a specified pixel is not a valid index into the colormap, a 
-<function>BadValue </function>
+<function>BadValue</function>
 error results.
 If a specified pixel is not allocated by the
 client (that is, is unallocated or is only allocated by another client)
@@ -2381,7 +2381,7 @@ can generate
 <function>BadAccess</function>,
 <function>BadColor</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect1>
@@ -2479,7 +2479,7 @@ can generate
 <function>BadAccess</function>,
 <function>BadColor</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2566,7 +2566,7 @@ in the flags member of the
 structures.
 If the colormap is an installed map for its screen, the
 changes are visible immediately.
-<function>XStoreColors </function>
+<function>XStoreColors</function>
 changes the specified pixels if they are allocated writable in the colormap 
 by any client, even if one or more pixels generates an error.
 If a specified pixel is not a valid index into the colormap, a
@@ -2585,7 +2585,7 @@ can generate
 <function>BadAccess</function>,
 <function>BadColor</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2951,7 +2951,7 @@ can generate
 <function>BadColor</function>,
 <function>BadName</function>,
 and 
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3045,7 +3045,7 @@ flags.
 can generate
 <function>BadColor</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3135,7 +3135,7 @@ flags in each structure.
 can generate
 <function>BadColor</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 <!-- .sp -->
 </para>
@@ -3601,7 +3601,7 @@ can return.
 
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Display <function>*XcmsDisplayOfCCC</function></funcdef>
+  <funcdef>Display *<function>XcmsDisplayOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3638,7 +3638,7 @@ Both return the display associated with the specified CCC.
 
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Visual<function>*XcmsVisualOfCCC</function></funcdef>
+  <funcdef>Visual *<function>XcmsVisualOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3748,7 +3748,7 @@ Both return the white point of the screen associated with the specified CCC.
 
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XcmsColor<function> *XcmsClientWhitePointOfCCC</function></funcdef>
+  <funcdef>XcmsColor *<function>XcmsClientWhitePointOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3788,7 +3788,7 @@ To set the Client White Point in the CCC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status <function> XcmsSetWhitePoint</function></funcdef>
+  <funcdef>Status <function>XcmsSetWhitePoint</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
   <paramdef>XcmsColor<parameter> *color</parameter></paramdef>
 </funcprototype>
@@ -4851,7 +4851,7 @@ Once to convert to
   <listitem>
     <para>
 A second time to convert from
-<function>XcmsRGB </function>
+<function>XcmsRGB</function>
     </para>
   </listitem>
 </itemizedlist>
@@ -4864,7 +4864,7 @@ and the adjustment procedure is
 During conversion to
 <function>XcmsRGB</function>,
 the call to 
-<function>XcmsAllocColor </function>
+<function>XcmsAllocColor</function>
 results in the following series of color specification conversions:
 <!-- .\" Do these need to be font coded? -->
 </para>
@@ -5969,7 +5969,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> </function></funcdef>
+  <funcdef>Status <function>XcmsCIELuvQueryMinL</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
   <paramdef>XcmsFloat<parameter> hue_angle</parameter></paramdef>
   <paramdef>XcmsFloat<parameter> chroma</parameter></paramdef>
@@ -6615,7 +6615,7 @@ associated with a specified color string prefix, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XcmsColorFormat<function>XcmsFormatOfPrefix</function></funcdef>
+  <funcdef>XcmsColorFormat <function>XcmsFormatOfPrefix</function></funcdef>
   <paramdef>char<parameter> *prefix</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6657,7 +6657,7 @@ specified by a color format, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char <function>*XcmsPrefixOfFormat</function></funcdef>
+  <funcdef>char *<function>XcmsPrefixOfFormat</function></funcdef>
   <paramdef>XcmsColorFormat<parameter> format</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -7289,7 +7289,7 @@ Specifies the appropriate screen number on the host server.
     <listitem>
       <para>
 Specifies the 
-<function>XcmsPerScrnInfo </function>
+<function>XcmsPerScrnInfo</function>
 structure, which contains the per screen information.
     </para>
   </listitem>
@@ -7337,7 +7337,7 @@ structure.
   <listitem>
     <para>
 It then sets the state member to 
-<function>XcmsInitSuccess </function>
+<function>XcmsInitSuccess</function>
 and finally returns
 <function>XcmsSuccess</function>.
     </para>
diff --git a/specs/libX11/CH07.xml b/specs/libX11/CH07.xml
index 308487bd..068f7a13 100644
--- a/specs/libX11/CH07.xml
+++ b/specs/libX11/CH07.xml
@@ -508,7 +508,7 @@ The line-style defines which sections of a line are drawn:
 The full path of the line is drawn,
 but the even dashes are filled differently
 from the odd dashes (see fill-style) with <!-- xref -->
-<function>CapButt </function>
+<function>CapButt</function>
 style used where even and odd dashes meet.
       </para>
     </listitem>
@@ -560,7 +560,7 @@ with no projection beyond.
 The line has a circular arc with the diameter equal to the line-width,
 centered on the endpoint.
 (This is equivalent to 
-<function>CapButt </function>
+<function>CapButt</function>
 for line-width of zero).
       </para>
     </listitem>
@@ -572,7 +572,7 @@ for line-width of zero).
 The line is square at the end, but the path continues beyond the endpoint
 for a distance equal to half the line-width.
 (This is equivalent to
-<function>CapButt </function>
+<function>CapButt</function>
 for line-width of zero).
       </para>
     </listitem>
@@ -610,7 +610,7 @@ centered on the joinpoint.
     <listitem>
       <para>
 The corner has
-<function>CapButt </function>
+<function>CapButt</function>
 endpoint styles with the triangular notch filled.
       </para>
     </listitem>
@@ -698,11 +698,11 @@ origin of whatever destination drawable is specified in a graphics
 request.
 The tile pixmap must have the same root and depth as the GC,
 or a
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 The stipple pixmap must have depth one and must have the same root as the
 GC, or a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.  
 For stipple operations where the fill-style is
 <function>FillStippled</function>
@@ -727,14 +727,14 @@ and
 <function>XFillArc</function>);
 for line requests 
 with line-style 
-<function>LineSolid </function>
+<function>LineSolid</function>
 (for example,
 <function>XDrawLine</function>,
 <function>XDrawSegments</function>,
 <function>XDrawRectangle</function>,
 <function>XDrawArc</function>);
 and for the even dashes for line requests with line-style 
-<function>LineOnOffDash </function>
+<function>LineOnOffDash</function>
 or 
 <function>LineDoubleDash</function>,
 the following apply:
@@ -839,7 +839,7 @@ The clip-mask restricts writes to the destination drawable.
 If the clip-mask is set to a pixmap,
 it must have depth one and have the same root as the GC,
 or a
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 If clip-mask is set to
 <function>None</function>,
@@ -875,7 +875,7 @@ neither source nor destination window is clipped by inferiors.
 This will result in including subwindow contents in the source
 and drawing through subwindow boundaries of the destination.
 The use of 
-<function>IncludeInferiors </function>
+<function>IncludeInferiors</function>
 on a window of one depth with mapped
 inferiors of differing depth is not illegal, but the semantics are
 undefined by the core protocol.
@@ -884,9 +884,9 @@ undefined by the core protocol.
 <!-- .LP -->
 The fill-rule defines what pixels are inside (drawn) for
 paths given in 
-<function>XFillPolygon </function>
+<function>XFillPolygon</function>
 requests and can be set to 
-<function>EvenOddRule </function>
+<function>EvenOddRule</function>
 or
 <function>WindingRule</function>.
 For
@@ -942,10 +942,10 @@ the arcs are chord filled.
 <para>
 <!-- .LP -->
 The graphics-exposure flag controls 
-<function>GraphicsExpose </function>
+<function>GraphicsExpose</function>
 event generation
 for 
-<function>XCopyArea </function>
+<function>XCopyArea</function>
 and 
 <function>XCopyPlane</function>
 requests (and any similar requests defined by extensions).
@@ -961,7 +961,7 @@ depth of drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>GC<function> XCreateGC</function></funcdef>
+  <funcdef>GC <function>XCreateGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
@@ -1037,7 +1037,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadPixmap</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1049,7 +1049,7 @@ To copy components from a source GC to a destination GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XCopyGC</function></funcdef>
+  <funcdef><function>XCopyGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GCsrc,<parameter> dest</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
@@ -1135,7 +1135,7 @@ To change the components in a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeGC</function></funcdef>
+  <funcdef><function>XChangeGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
@@ -1231,7 +1231,7 @@ To obtain components of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetGCValues</function></funcdef>
+  <funcdef>Status <function>XGetGCValues</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlong<parameter> valuemask</parameter></paramdef>
@@ -1280,7 +1280,7 @@ GC component mask bits.
     <listitem>
       <para>
 Returns the GC values in the specified
-<function>XGCValues </function>
+<function>XGCValues</function>
 structure.
     </para>
   </listitem>
@@ -1343,7 +1343,7 @@ To free a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeGC</function></funcdef>
+  <funcdef><function>XFreeGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
 </funcprototype>
@@ -1383,21 +1383,21 @@ function destroys the specified GC as well as all the associated storage.
 <!-- .LP -->
 <function>XFreeGC</function>
 can generate a
-<function>BadGC </function>
+<function>BadGC</function>
 error.
 </para>
 <para>
 <!-- .LP -->
 <!-- .sp -->
 To obtain the 
-<function>GContext </function>
+<function>GContext</function>
 resource ID for a given GC, use 
 <function>XGContextFromGC</function>.
 <indexterm significance="preferred"><primary>XGContextFromGC</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>GContext<function> XGContextFromGC</function></funcdef>
+  <funcdef>GContext <function>XGContextFromGC</function></funcdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1433,7 +1433,7 @@ To force sending GC component changes, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XFlushGC</function></funcdef>
+  <funcdef>void <function>XFlushGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
 </funcprototype>
@@ -1527,7 +1527,7 @@ for a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetState</function></funcdef>
+  <funcdef><function>XSetState</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlongforeground,<parameter> background</parameter></paramdef>
@@ -1608,7 +1608,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1620,7 +1620,7 @@ To set the foreground of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetForeground</function></funcdef>
+  <funcdef><function>XSetForeground</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlong<parameter> foreground</parameter></paramdef>
@@ -1667,7 +1667,7 @@ Specifies the foreground you want to set for the specified GC.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 <para>
@@ -1679,7 +1679,7 @@ To set the background of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetBackground</function></funcdef>
+  <funcdef><function>XSetBackground</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlong<parameter> background</parameter></paramdef>
@@ -1726,7 +1726,7 @@ Specifies the background you want to set for the specified GC.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 <para>
@@ -1738,7 +1738,7 @@ To set the display function in a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetFunction</function></funcdef>
+  <funcdef><function>XSetFunction</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> function</parameter></paramdef>
@@ -1786,7 +1786,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1798,7 +1798,7 @@ To set the plane mask of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetPlaneMask</function></funcdef>
+  <funcdef><function>XSetPlaneMask</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedlong<parameter> plane_mask</parameter></paramdef>
@@ -1846,7 +1846,7 @@ Specifies the plane mask.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 </sect2>
@@ -1863,7 +1863,7 @@ To set the line drawing components of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetLineAttributes</function></funcdef>
+  <funcdef><function>XSetLineAttributes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>unsignedint<parameter> line_width</parameter></paramdef>
@@ -1960,7 +1960,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1972,7 +1972,7 @@ To set the dash-offset and dash-list for dashed line styles of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetDashes</function></funcdef>
+  <funcdef><function>XSetDashes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> dash_offset</parameter></paramdef>
@@ -2084,7 +2084,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect2>
@@ -2101,7 +2101,7 @@ To set the fill-style of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetFillStyle</function></funcdef>
+  <funcdef><function>XSetFillStyle</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> fill_style</parameter></paramdef>
@@ -2155,7 +2155,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2167,7 +2167,7 @@ To set the fill-rule of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetFillRule</function></funcdef>
+  <funcdef><function>XSetFillRule</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> fill_rule</parameter></paramdef>
@@ -2219,7 +2219,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect2>
@@ -2247,7 +2247,7 @@ To obtain the best size of a tile, stipple, or cursor, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XQueryBestSize</function></funcdef>
+  <funcdef>Status <function>XQueryBestSize</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> class</parameter></paramdef>
   <paramdef>Drawable<parameter> which_screen</parameter></paramdef>
@@ -2357,18 +2357,18 @@ For
 <function>CursorShape</function>,
 the drawable indicates the desired screen.
 For 
-<function>TileShape </function>
+<function>TileShape</function>
 and 
 <function>StippleShape</function>,
 the drawable indicates the screen and possibly the window class and depth.
 An 
-<function>InputOnly </function>
+<function>InputOnly</function>
 window cannot be used as the drawable for 
 <function>TileShape</function>
 or 
 <function>StippleShape</function>,
 or a
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 </para>
 <para>
@@ -2378,7 +2378,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadMatch</function>,
 and 
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2390,7 +2390,7 @@ To obtain the best fill tile shape, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XQueryBestTile</function></funcdef>
+  <funcdef>Status <function>XQueryBestTile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> which_screen</parameter></paramdef>
   <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
@@ -2473,9 +2473,9 @@ function returns the best or closest size, that is, the size that can be
 tiled fastest on the screen specified by which_screen.
 The drawable indicates the screen and possibly the window class and depth.
 If an 
-<function>InputOnly </function>
+<function>InputOnly</function>
 window is used as the drawable, a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 </para>
 <para>
@@ -2484,7 +2484,7 @@ error results.
 can generate
 <function>BadDrawable</function>
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 <para>
@@ -2496,7 +2496,7 @@ To obtain the best stipple shape, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XQueryBestStipple</function></funcdef>
+  <funcdef>Status <function>XQueryBestStipple</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> which_screen</parameter></paramdef>
   <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
@@ -2590,7 +2590,7 @@ error results.
 can generate
 <function>BadDrawable</function>
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 <para>
@@ -2602,7 +2602,7 @@ To set the fill tile of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetTile</function></funcdef>
+  <funcdef><function>XSetTile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>Pixmap<parameter> tile</parameter></paramdef>
@@ -2658,7 +2658,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadPixmap </function>
+<function>BadPixmap</function>
 errors.
 </para>
 <para>
@@ -2670,7 +2670,7 @@ To set the stipple of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetStipple</function></funcdef>
+  <funcdef><function>XSetStipple</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>Pixmap<parameter> stipple</parameter></paramdef>
@@ -2726,7 +2726,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadPixmap </function>
+<function>BadPixmap</function>
 errors.
 </para>
 <para>
@@ -2738,7 +2738,7 @@ To set the tile or stipple origin of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetTSOrigin</function></funcdef>
+  <funcdef><function>XSetTSOrigin</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>intts_x_origin,<parameter> ts_y_origin</parameter></paramdef>
@@ -2802,7 +2802,7 @@ drawable is specified in the graphics request.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 </sect2>
@@ -2819,7 +2819,7 @@ To set the current font of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetFont</function></funcdef>
+  <funcdef><function>XSetFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>Font<parameter> font</parameter></paramdef>
@@ -2867,7 +2867,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadFont</function>,
 and 
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 </sect2>
@@ -2890,7 +2890,7 @@ To set the clip-origin of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetClipOrigin</function></funcdef>
+  <funcdef><function>XSetClipOrigin</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>intclip_x_origin,<parameter> clip_y_origin</parameter></paramdef>
@@ -2953,7 +2953,7 @@ destination drawable is specified in the graphics request.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 <para>
@@ -2965,7 +2965,7 @@ To set the clip-mask of a given GC to the specified pixmap, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetClipMask</function></funcdef>
+  <funcdef><function>XSetClipMask</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>Pixmap<parameter> pixmap</parameter></paramdef>
@@ -3021,7 +3021,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadPixmap </function>
+<function>BadPixmap</function>
 errors.
 </para>
 <para>
@@ -3033,7 +3033,7 @@ To set the clip-mask of a given GC to the specified list of rectangles, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetClipRectangles</function></funcdef>
+  <funcdef><function>XSetClipRectangles</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>intclip_x_origin,<parameter> clip_y_origin</parameter></paramdef>
@@ -3158,19 +3158,19 @@ If an incorrect ordering is specified, the X server may generate a
 error, but it is not required to do so.
 If no error is generated, the graphics
 results are undefined.
-<function>Unsorted </function>
+<function>Unsorted</function>
 means the rectangles are in arbitrary order.
-<function>YSorted </function>
+<function>YSorted</function>
 means that the rectangles are nondecreasing in their Y origin.
-<function>YXSorted </function>
+<function>YXSorted</function>
 additionally constrains 
-<function>YSorted </function>
+<function>YSorted</function>
 order in that all
 rectangles with an equal Y origin are nondecreasing in their X
 origin.  
-<function>YXBanded </function>
+<function>YXBanded</function>
 additionally constrains 
-<function>YXSorted </function>
+<function>YXSorted</function>
 by requiring that,
 for every possible Y scanline, all rectangles that include that
 scanline have an identical Y origins and Y extents.
@@ -3183,7 +3183,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3207,7 +3207,7 @@ To set the arc mode of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetArcMode</function></funcdef>
+  <funcdef><function>XSetArcMode</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> arc_mode</parameter></paramdef>
@@ -3259,7 +3259,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3271,7 +3271,7 @@ To set the subwindow mode of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetSubwindowMode</function></funcdef>
+  <funcdef><function>XSetSubwindowMode</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>int<parameter> subwindow_mode</parameter></paramdef>
@@ -3323,7 +3323,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3335,7 +3335,7 @@ To set the graphics-exposures flag of a given GC, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetGraphicsExposures</function></funcdef>
+  <funcdef><function>XSetGraphicsExposures</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>Bool<parameter> graphics_exposures</parameter></paramdef>
@@ -3391,7 +3391,7 @@ can generate
 <function>BadAlloc</function>,
 <function>BadGC</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 <!-- .bp -->
 
diff --git a/specs/libX11/CH08.xml b/specs/libX11/CH08.xml
index 7174884e..6cd6fc66 100644
--- a/specs/libX11/CH08.xml
+++ b/specs/libX11/CH08.xml
@@ -42,7 +42,7 @@ To clear a rectangular area of a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XClearArea</function></funcdef>
+  <funcdef><function>XClearArea</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -154,7 +154,7 @@ In either
 case, if exposures is 
 <function>True</function>,
 one or more 
-<function>Expose </function>
+<function>Expose</function>
 events are generated for regions of the rectangle that are either visible or are
 being retained in a backing store.
 If you specify a window whose class is
@@ -170,7 +170,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -184,7 +184,7 @@ To clear the entire area in a given window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XClearWindow</function></funcdef>
+  <funcdef><function>XClearWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -243,7 +243,7 @@ error results.
 can generate
 <function>BadMatch</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -268,7 +268,7 @@ root and depth, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XCopyArea</function></funcdef>
+  <funcdef><function>XCopyArea</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawablesrc,<parameter> dest</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -417,7 +417,7 @@ If the destination is a window with a background other than
 corresponding regions
 of the destination are tiled with that background
 (with plane-mask of all ones and
-<function>GXcopy </function>
+<function>GXcopy</function>
 function).
 Regardless of tiling or whether the destination is a window or a pixmap,
 if graphics-exposures is 
@@ -426,11 +426,11 @@ then
 <function>GraphicsExpose</function>
 events for all corresponding destination regions are generated.
 If graphics-exposures is 
-<function>True </function>
+<function>True</function>
 but no
 <function>GraphicsExpose</function>
 events are generated, a
-<function>NoExpose </function>
+<function>NoExpose</function>
 event is generated.
 Note that by default graphics-exposures is
 <function>True</function>
@@ -449,7 +449,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 <!-- .sp -->
 </para>
@@ -463,7 +463,7 @@ To copy a single bit plane of a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XCopyPlane</function></funcdef>
+  <funcdef><function>XCopyPlane</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawablesrc,<parameter> dest</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -644,7 +644,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and 
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect1>
@@ -767,7 +767,7 @@ To draw a single point in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawPoint</function></funcdef>
+  <funcdef><function>XDrawPoint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -839,7 +839,7 @@ To draw multiple points in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawPoints</function></funcdef>
+  <funcdef><function>XDrawPoints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -945,7 +945,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and 
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 <function>XDrawPoints</function>
 can generate
@@ -953,7 +953,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect2>
@@ -980,7 +980,7 @@ To draw a single line between two points in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawLine</function></funcdef>
+  <funcdef><function>XDrawLine</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1074,7 +1074,7 @@ To draw multiple lines in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawLines</function></funcdef>
+  <funcdef><function>XDrawLines</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1162,7 +1162,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawSegments</function></funcdef>
+  <funcdef><function>XDrawSegments</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1233,7 +1233,7 @@ function uses the components of the specified GC to
 draw a line between the specified set of points (x1, y1) and (x2, y2).
 It does not perform joining at coincident endpoints.
 For any given line, 
-<function>XDrawLine </function>
+<function>XDrawLine</function>
 does not draw a pixel more than once.
 If lines intersect, the intersecting pixels are drawn multiple times.  
 </para>
@@ -1256,7 +1256,7 @@ If thin (zero line-width) lines intersect,
 the intersecting pixels are drawn multiple times.
 If wide lines intersect, the intersecting pixels are drawn only once, as though
 the entire 
-<function>PolyLine </function>
+<function>PolyLine</function>
 protocol request were a single, filled shape.
 <function>CoordModeOrigin</function>
 treats all coordinates as relative to the origin,
@@ -1267,10 +1267,10 @@ treats all coordinates after the first as relative to the previous point.
 <para>
 <!-- .LP -->
 The
-<function>XDrawSegments </function>
+<function>XDrawSegments</function>
 function draws multiple, unconnected lines. 
 For each segment, 
-<function>XDrawSegments </function>
+<function>XDrawSegments</function>
 draws a
 line between (x1, y1) and (x2, y2).
 It draws the lines in the order listed in the array of
@@ -1304,11 +1304,11 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 <function>XDrawLines</function>
 also can generate
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect2>
@@ -1332,7 +1332,7 @@ To draw the outline of a single rectangle in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawRectangle</function></funcdef>
+  <funcdef><function>XDrawRectangle</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1429,7 +1429,7 @@ in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawRectangles</function></funcdef>
+  <funcdef><function>XDrawRectangles</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1500,7 +1500,7 @@ and
 <function>XDrawRectangles</function>
 functions draw the outlines of the specified rectangle or rectangles as
 if a five-point 
-<function>PolyLine </function>
+<function>PolyLine</function>
 protocol request were specified for each rectangle:
 </para>
 <itemizedlist>
@@ -1538,7 +1538,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 </sect2>
@@ -1563,7 +1563,7 @@ To draw a single arc in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawArc</function></funcdef>
+  <funcdef><function>XDrawArc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1683,7 +1683,7 @@ To draw multiple arcs in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawArcs</function></funcdef>
+  <funcdef><function>XDrawArcs</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1869,7 +1869,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 </sect2>
@@ -1921,7 +1921,7 @@ To fill a single rectangular area in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFillRectangle</function></funcdef>
+  <funcdef><function>XFillRectangle</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -2018,7 +2018,7 @@ To fill multiple rectangular areas in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFillRectangles</function></funcdef>
+  <funcdef><function>XFillRectangles</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -2133,7 +2133,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 </sect2>
@@ -2153,7 +2153,7 @@ To fill a polygon area in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFillPolygon</function></funcdef>
+  <funcdef><function>XFillPolygon</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -2249,7 +2249,7 @@ or
 <para>
 <!-- .LP -->
 <!-- .eM -->
-<function>XFillPolygon </function>
+<function>XFillPolygon</function>
 fills the region closed by the specified path.
 The path is closed
 automatically if the last point in the list does not coincide with the
@@ -2284,10 +2284,10 @@ for every pair of points inside the polygon,
 the line segment connecting them does not intersect the path.
 If known by the client,
 specifying 
-<function>Convex </function>
+<function>Convex</function>
 can improve performance.  
 If you specify
-<function>Convex </function>
+<function>Convex</function>
 for a path that is not convex, 
 the graphics results are undefined.
     </para>
@@ -2300,12 +2300,12 @@ the path does not self-intersect, but the shape is not
 wholly convex. 
 If known by the client, 
 specifying 
-<function>Nonconvex </function>
+<function>Nonconvex</function>
 instead of
-<function>Complex </function>
+<function>Complex</function>
 may improve performance.  
 If you specify
-<function>Nonconvex </function>
+<function>Nonconvex</function>
 for a self-intersecting path, the graphics results are undefined.
     </para>
   </listitem>
@@ -2332,7 +2332,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect2>
@@ -2352,7 +2352,7 @@ To fill a single arc in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFillArc</function></funcdef>
+  <funcdef><function>XFillArc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -2472,7 +2472,7 @@ To fill multiple arcs in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFillArcs</function></funcdef>
+  <funcdef><function>XFillArcs</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -2579,7 +2579,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 </sect2>
@@ -2746,7 +2746,7 @@ specified in the structure defines a range of characters.
 <para>
 <!-- .LP -->
 The bounding box of a character is defined by the 
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 of that character.
 When characters are absent from a font,
 the default_char is used.
@@ -2758,18 +2758,18 @@ min and max bounds are used.
 <para>
 <!-- .LP -->
 The members of the 
-<function>XFontStruct </function>
+<function>XFontStruct</function>
 have the following semantics:
 </para>
 <itemizedlist>
   <listitem>
     <para>
 The direction member can be either 
-<function>FontLeftToRight </function>
+<function>FontLeftToRight</function>
 or 
 <function>FontRightToLeft</function>.
 It is just a hint as to whether most 
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 elements 
 have a positive 
 (<function>FontLeftToRight</function>)
@@ -2850,7 +2850,7 @@ no printing is performed for an undefined or nonexistent character.
     <para>
 The min_bounds and max_bounds members contain the most extreme values of
 each individual 
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 component over all elements of this array
 (and ignore nonexistent characters).
 The bounding box of the font (the smallest
@@ -2909,7 +2909,7 @@ For a character origin at [x,y],
 the bounding box of a character (that is, 
 the smallest rectangle that encloses the character's shape)
 described in terms of 
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 components is a rectangle with its upper-left corner at:
 </para>
 <para>
@@ -3007,7 +3007,7 @@ unload fonts, and free font information.
 <indexterm><primary>Fonts</primary><secondary>unloading</secondary></indexterm>
 <indexterm><primary>Fonts</primary><secondary>freeing font information</secondary></indexterm>
 A few font functions use a 
-<function>GContext </function>
+<function>GContext</function>
 resource ID or a font ID interchangeably.
 </para>
 <para>
@@ -3019,7 +3019,7 @@ To load a given font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Font<function> XLoadFont</function></funcdef>
+  <funcdef>Font <function>XLoadFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *name</parameter></paramdef>
 </funcprototype>
@@ -3069,7 +3069,7 @@ If
 <function>XLoadFont</function>
 was unsuccessful at loading the specified font, 
 a 
-<function>BadName </function>
+<function>BadName</function>
 error results.
 Fonts are not associated with a particular screen 
 and can be stored as a component
@@ -3083,7 +3083,7 @@ When the font is no longer needed, call
 can generate
 <function>BadAlloc</function>
 and
-<function>BadName </function>
+<function>BadName</function>
 errors.
 </para>
 <para>
@@ -3095,7 +3095,7 @@ To return information about an available font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XFontStruct<function> *XQueryFont</function></funcdef>
+  <funcdef>XFontStruct *<function>XQueryFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> font_ID</parameter></paramdef>
 </funcprototype>
@@ -3138,7 +3138,7 @@ You can query a font or the font stored in a GC.
 The font ID stored in the 
 <function>XFontStruct</function>
 structure will be the 
-<function>GContext </function>
+<function>GContext</function>
 ID, and you need to be careful when using this ID in other functions
 (see
 <function>XGContextFromGC</function>).
@@ -3161,7 +3161,7 @@ in a single operation, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XFontStruct<function> *XLoadQueryFont</function></funcdef>
+  <funcdef>XFontStruct *<function>XLoadQueryFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *name</parameter></paramdef>
 </funcprototype>
@@ -3212,7 +3212,7 @@ returns NULL.
 <!-- .LP -->
 <function>XLoadQueryFont</function>
 can generate a
-<function>BadAlloc </function>
+<function>BadAlloc</function>
 error.
 </para>
 <para>
@@ -3229,7 +3229,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeFont</function></funcdef>
+  <funcdef><function>XFreeFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
 </funcprototype>
@@ -3274,7 +3274,7 @@ The data and the font should not be referenced again.
 <!-- .LP -->
 <function>XFreeFont</function>
 can generate a
-<function>BadFont </function>
+<function>BadFont</function>
 error.
 </para>
 <para>
@@ -3286,7 +3286,7 @@ To return a given font property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XGetFontProperty</function></funcdef>
+  <funcdef>Bool <function>XGetFontProperty</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
   <paramdef>Atom<parameter> atom</parameter></paramdef>
   <paramdef>unsignedlong<parameter> *value_return</parameter></paramdef>
@@ -3358,7 +3358,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUnloadFont</function></funcdef>
+  <funcdef><function>XUnloadFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Font<parameter> font</parameter></paramdef>
 </funcprototype>
@@ -3400,7 +3400,7 @@ The font should not be referenced again.
 <!-- .LP -->
 <function>XUnloadFont</function>
 can generate a
-<function>BadFont </function>
+<function>BadFont</function>
 error.
 </para>
 </sect2>
@@ -3423,7 +3423,7 @@ To return a list of the available font names, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> **XListFonts</function></funcdef>
+  <funcdef>char **<function>XListFonts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *pattern</parameter></paramdef>
   <paramdef>int<parameter> maxnames</parameter></paramdef>
@@ -3510,7 +3510,7 @@ To free a font name array, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeFontNames</function></funcdef>
+  <funcdef><function>XFreeFontNames</function></funcdef>
   <paramdef>char<parameter> *list[]</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3534,7 +3534,7 @@ Specifies the array of strings you want to free.
 The
 <function>XFreeFontNames</function>
 function frees the array and strings returned by
-<function>XListFonts </function>
+<function>XListFonts</function>
 or
 <function>XListFontsWithInfo</function>.
 </para>
@@ -3547,7 +3547,7 @@ To obtain the names and information about available fonts, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> **XListFontsWithInfo</function></funcdef>
+  <funcdef>char **<function>XListFontsWithInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *pattern</parameter></paramdef>
   <paramdef>int<parameter> maxnames</parameter></paramdef>
@@ -3654,7 +3654,7 @@ To free font structures and font names, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeFontInfo</function></funcdef>
+  <funcdef><function>XFreeFontInfo</function></funcdef>
   <paramdef>char<parameter> **names</parameter></paramdef>
   <paramdef>XFontStruct<parameter> *free_info</parameter></paramdef>
   <paramdef>int<parameter> actual_count</parameter></paramdef>
@@ -3738,7 +3738,7 @@ To determine the width of an 8-bit character string, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XTextWidth</function></funcdef>
+  <funcdef>int <function>XTextWidth</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -3788,7 +3788,7 @@ To determine the width of a 2-byte character string, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XTextWidth16</function></funcdef>
+  <funcdef>int <function>XTextWidth16</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
   <paramdef>XChar2b<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -3846,7 +3846,7 @@ To compute the bounding box of an 8-bit character string in a given font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XTextExtents</function></funcdef>
+  <funcdef><function>XTextExtents</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> nchars</parameter></paramdef>
@@ -3864,7 +3864,7 @@ To compute the bounding box of an 8-bit character string in a given font, use
     <listitem>
       <para>
 Specifies the 
-<function>XFontStruct </function>
+<function>XFontStruct</function>
 structure.
       </para>
     </listitem>
@@ -3929,7 +3929,7 @@ Returns the font descent.
     <listitem>
       <para>
 Returns the overall size in the specified
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 structure.
     </para>
   </listitem>
@@ -3946,7 +3946,7 @@ To compute the bounding box of a 2-byte character string in a given font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XTextExtents16</function></funcdef>
+  <funcdef><function>XTextExtents16</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
   <paramdef>XChar2b<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> nchars</parameter></paramdef>
@@ -3964,7 +3964,7 @@ To compute the bounding box of a 2-byte character string in a given font, use
     <listitem>
       <para>
 Specifies the 
-<function>XFontStruct </function>
+<function>XFontStruct</function>
 structure.
       </para>
     </listitem>
@@ -4029,7 +4029,7 @@ Returns the font descent.
     <listitem>
       <para>
 Returns the overall size in the specified
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 structure.
     </para>
   </listitem>
@@ -4046,7 +4046,7 @@ and
 functions 
 perform the size computation locally and, thereby,
 avoid the round-trip overhead of
-<function>XQueryTextExtents </function>
+<function>XQueryTextExtents</function>
 and
 <function>XQueryTextExtents16</function>.
 Both functions return an
@@ -4072,7 +4072,7 @@ The rbearing member is set to the maximum R.
 <!-- .LP -->
 For fonts defined with linear indexing rather than 2-byte matrix indexing,
 each 
-<function>XChar2b </function>
+<function>XChar2b</function>
 structure is interpreted as a 16-bit number with byte1 as the 
 most significant byte.
 If the font has no defined default character,
@@ -4093,7 +4093,7 @@ given font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XQueryTextExtents</function></funcdef>
+  <funcdef><function>XQueryTextExtents</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> font_ID</parameter></paramdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
@@ -4187,7 +4187,7 @@ Returns the font descent.
     <listitem>
       <para>
 Returns the overall size in the specified
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 structure.
     </para>
   </listitem>
@@ -4205,7 +4205,7 @@ in a given font, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XQueryTextExtents16</function></funcdef>
+  <funcdef><function>XQueryTextExtents16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> font_ID</parameter></paramdef>
   <paramdef>XChar2b<parameter> *string</parameter></paramdef>
@@ -4299,7 +4299,7 @@ Returns the font descent.
     <listitem>
       <para>
 Returns the overall size in the specified
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 structure.
     </para>
   </listitem>
@@ -4322,7 +4322,7 @@ overhead that is avoided by
 and 
 <function>XTextExtents16</function>.
 Both functions return a
-<function>XCharStruct </function>
+<function>XCharStruct</function>
 structure, whose members are set to the values as follows.
 </para>
 <para>
@@ -4344,7 +4344,7 @@ The rbearing member is set to the maximum R.
 <!-- .LP -->
 For fonts defined with linear indexing rather than 2-byte matrix indexing,
 each 
-<function>XChar2b </function>
+<function>XChar2b</function>
 structure is interpreted as a 16-bit number with byte1 as the 
 most significant byte.
 If the font has no defined default character,
@@ -4364,7 +4364,7 @@ and
 can generate
 <function>BadFont</function>
 and
-<function>BadGC </function>
+<function>BadGC</function>
 errors.
 </para>
 </sect2>
@@ -4478,7 +4478,7 @@ To draw 8-bit characters in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawText</function></funcdef>
+  <funcdef><function>XDrawText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -4574,7 +4574,7 @@ To draw 2-byte characters in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawText16</function></funcdef>
+  <funcdef><function>XDrawText16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -4666,7 +4666,7 @@ Specifies the number of text items in the array.
 The
 <function>XDrawText16</function>
 function is similar to
-<function>XDrawText </function>
+<function>XDrawText</function>
 except that it uses 2-byte or 16-bit characters.
 Both functions allow complex spacing and font shifts between counted strings.
 </para>
@@ -4715,7 +4715,7 @@ can generate
 <function>BadFont</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 </sect2>
@@ -4734,7 +4734,7 @@ To draw 8-bit characters in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawString</function></funcdef>
+  <funcdef><function>XDrawString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -4830,7 +4830,7 @@ To draw 2-byte characters in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawString16</function></funcdef>
+  <funcdef><function>XDrawString16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -4945,7 +4945,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 </sect2>
@@ -4974,7 +4974,7 @@ To draw 8-bit image text characters in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawImageString</function></funcdef>
+  <funcdef><function>XDrawImageString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -5070,7 +5070,7 @@ To draw 2-byte image text characters in a given drawable, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDrawImageString16</function></funcdef>
+  <funcdef><function>XDrawImageString16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -5162,7 +5162,7 @@ Specifies the number of characters in the string argument.
 The
 <function>XDrawImageString16</function>
 function is similar to
-<function>XDrawImageString </function>
+<function>XDrawImageString</function>
 except that it uses 2-byte or 16-bit characters.
 Both functions also use both the foreground and background pixels 
 of the GC in the destination.
@@ -5204,7 +5204,7 @@ font-ascent + font-descent
 <!-- .LP -->
 The overall-width, font-ascent, and font-descent
 are as would be returned by 
-<function>XQueryTextExtents </function>
+<function>XQueryTextExtents</function>
 using gc and string.
 The function and fill-style defined in the GC are ignored for these functions. 
 The effective function is 
@@ -5234,7 +5234,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadGC</function>,
 and
-<function>BadMatch </function>
+<function>BadMatch</function>
 errors.
 </para>
 <para>
@@ -5267,7 +5267,7 @@ to an image (see section 16.8).
 <!-- .LP -->
 All the image manipulation functions discussed in this section make use of 
 the 
-<function>XImage </function>
+<function>XImage</function>
 structure,
 which describes an image as it exists in the client's memory.
 </para>
@@ -5315,7 +5315,7 @@ To initialize the image manipulation routines of an image structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XInitImage</function></funcdef>
+  <funcdef>Status <function>XInitImage</function></funcdef>
   <paramdef>XImage<parameter> *image</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5373,7 +5373,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XPutImage</function></funcdef>
+  <funcdef><function>XPutImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -5433,7 +5433,7 @@ Specifies the image you want combined with the rectangle.
       <para>
 Specifies the offset in X from the left edge of the image defined
 by the 
-<function>XImage </function>
+<function>XImage</function>
 structure.
       </para>
     </listitem>
@@ -5446,7 +5446,7 @@ structure.
       <para>
 Specifies the offset in Y from the top edge of the image defined
 by the 
-<function>XImage </function>
+<function>XImage</function>
 structure.
 <!-- .ds Dx , which are relative to the origin of the drawable \ -->
 and are the coordinates of the subimage
@@ -5508,15 +5508,15 @@ combines an image with a rectangle of the specified drawable.
 The section of the image defined by the src_x, src_y, width, and height 
 arguments is drawn on the specified part of the drawable.
 If 
-<function>XYBitmap </function>
+<function>XYBitmap</function>
 format is used, the depth of the image must be one,
 or a
-<function>BadMatch </function>
+<function>BadMatch</function>
 error results.
 The foreground pixel in the GC defines the source for the one bits in the image,
 and the background pixel defines the source for the zero bits.
 For 
-<function>XYPixmap </function>
+<function>XYPixmap</function>
 and 
 <function>ZPixmap</function>,
 the depth of the image must match the depth of the drawable,
@@ -5528,7 +5528,7 @@ error results.
 <!-- .LP -->
 If the characteristics of the image (for example, byte_order and bitmap_unit)
 differ from what the server requires,
-<function>XPutImage </function>
+<function>XPutImage</function>
 automatically makes the appropriate
 conversions.
 </para>
@@ -5548,7 +5548,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -5562,7 +5562,7 @@ This function specifically supports rudimentary screen dumps.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XImage<function> *XGetImage</function></funcdef>
+  <funcdef>XImage *<function>XGetImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -5736,7 +5736,7 @@ can generate
 <function>BadDrawable</function>,
 <function>BadMatch</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 <!-- .sp -->
 </para>
@@ -5749,7 +5749,7 @@ to a location within a preexisting image structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XImage<function> *XGetSubImage</function></funcdef>
+  <funcdef>XImage *<function>XGetSubImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
@@ -5892,7 +5892,7 @@ Specify the x and y coordinates(Dx.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetSubImage </function>
+<function>XGetSubImage</function>
 function updates dest_image with the specified subimage in the same manner as 
 <function>XGetImage</function>.
 If the format argument is 
@@ -5950,7 +5950,7 @@ can generate
 <function>BadGC</function>,
 <function>BadMatch</function>,
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 <!-- .bp -->
 
diff --git a/specs/libX11/CH09.xml b/specs/libX11/CH09.xml
index 9b0778d8..8d32cef6 100644
--- a/specs/libX11/CH09.xml
+++ b/specs/libX11/CH09.xml
@@ -33,7 +33,7 @@ There is no way to move a window between screens.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XReparentWindow</function></funcdef>
+  <funcdef><function>XReparentWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window<parameter> parent</parameter></paramdef>
@@ -130,7 +130,7 @@ request on it.
 The X server performs normal exposure processing on formerly obscured
 windows.
 The X server might not generate 
-<function>Expose </function>
+<function>Expose</function>
 events for regions from the initial
 <function>UnmapWindow</function>
 request that are immediately obscured by the final
@@ -175,7 +175,7 @@ specified window.
 can generate
 <function>BadMatch</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -217,7 +217,7 @@ To add or remove a window from the client's save-set, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeSaveSet</function></funcdef>
+  <funcdef><function>XChangeSaveSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> change_mode</parameter></paramdef>
@@ -254,7 +254,7 @@ Specifies the window (Wi.
       <para>
 Specifies the mode.
 You can pass
-<function>SetModeInsert </function>
+<function>SetModeInsert</function>
 or
 <function>SetModeDelete</function>.
     </para>
@@ -280,7 +280,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -292,7 +292,7 @@ To add a window to the client's save-set, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAddToSaveSet</function></funcdef>
+  <funcdef><function>XAddToSaveSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -339,7 +339,7 @@ error results.
 can generate
 <function>BadMatch</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -351,7 +351,7 @@ To remove a window from the client's save-set, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRemoveFromSaveSet</function></funcdef>
+  <funcdef><function>XRemoveFromSaveSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -396,9 +396,9 @@ error results.
 <!-- .LP -->
 <function>XRemoveFromSaveSet</function>
 can generate
-<function>BadMatch </function>
+<function>BadMatch</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -448,7 +448,7 @@ To install a colormap, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XInstallColormap</function></funcdef>
+  <funcdef><function>XInstallColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Colormap<parameter> colormap</parameter></paramdef>
 </funcprototype>
@@ -509,7 +509,7 @@ event on each window that has that colormap.
 <!-- .LP -->
 <function>XInstallColormap</function>
 can generate a
-<function>BadColor </function>
+<function>BadColor</function>
 error.
 </para>
 <para>
@@ -521,7 +521,7 @@ To uninstall a colormap, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUninstallColormap</function></funcdef>
+  <funcdef><function>XUninstallColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Colormap<parameter> colormap</parameter></paramdef>
 </funcprototype>
@@ -580,7 +580,7 @@ event on each window that has that colormap.
 <!-- .LP -->
 <function>XUninstallColormap</function>
 can generate a
-<function>BadColor </function>
+<function>BadColor</function>
 error.
 </para>
 <para>
@@ -592,7 +592,7 @@ To obtain a list of the currently installed colormaps for a given screen, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Colormap<function> *XListInstalledColormaps</function></funcdef>
+  <funcdef>Colormap *<function>XListInstalledColormaps</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> *num_return</parameter></paramdef>
@@ -650,7 +650,7 @@ free it by using
 <!-- .LP -->
 <function>XListInstalledColormaps</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -674,7 +674,7 @@ To set the font search path, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetFontPath</function></funcdef>
+  <funcdef><function>XSetFontPath</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> **directories</parameter></paramdef>
   <paramdef>int<parameter> ndirs</parameter></paramdef>
@@ -740,7 +740,7 @@ The meaning of an error from this request is implementation-dependent.
 <!-- .LP -->
 <function>XSetFontPath</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -752,7 +752,7 @@ To get the current font search path, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> **XGetFontPath</function></funcdef>
+  <funcdef>char **<function>XGetFontPath</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *npaths_return</parameter></paramdef>
 </funcprototype>
@@ -804,7 +804,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeFontPath</function></funcdef>
+  <funcdef><function>XFreeFontPath</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -860,7 +860,7 @@ To grab the server, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGrabServer</function></funcdef>
+  <funcdef><function>XGrabServer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -896,7 +896,7 @@ To ungrab the server, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUngrabServer</function></funcdef>
+  <funcdef><function>XUngrabServer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -938,7 +938,7 @@ To destroy a client, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XKillClient</function></funcdef>
+  <funcdef><function>XKillClient</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> resource</parameter></paramdef>
 </funcprototype>
@@ -979,15 +979,15 @@ that created the resource
 if a valid resource is specified.
 If the client has already terminated in
 either 
-<function>RetainPermanent </function>
+<function>RetainPermanent</function>
 or 
-<function>RetainTemporary </function>
+<function>RetainTemporary</function>
 mode, all of the client's
 resources are destroyed.
 If 
-<function>AllTemporary </function>
+<function>AllTemporary</function>
 is specified, the resources of all clients that have terminated in
-<function>RetainTemporary </function>
+<function>RetainTemporary</function>
 are destroyed (see section 2.5).
 This permits implementation of window manager facilities that aid debugging.
 A client can set its close-down mode to
@@ -1001,7 +1001,7 @@ and use the window manager to destroy the zombie windows.
 <!-- .LP -->
 <function>XKillClient</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 </sect1>
@@ -1025,7 +1025,7 @@ To set the screen saver mode, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetScreenSaver</function></funcdef>
+  <funcdef><function>XSetScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>inttimeout,<parameter> interval</parameter></paramdef>
   <paramdef>int<parameter> prefer_blanking</parameter></paramdef>
@@ -1121,7 +1121,7 @@ if blanking is preferred and the hardware supports video blanking,
 the screen simply goes blank.  
 Otherwise, if either exposures are allowed or the screen can be regenerated 
 without sending 
-<function>Expose </function>
+<function>Expose</function>
 events to clients, 
 the screen is tiled with the root window background tile randomly 
 re-origined each interval seconds.
@@ -1148,7 +1148,7 @@ periodically.
 <!-- .LP -->
 <function>XSetScreenSaver</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -1160,7 +1160,7 @@ To force the screen saver on or off, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XForceScreenSaver</function></funcdef>
+  <funcdef><function>XForceScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> mode</parameter></paramdef>
 </funcprototype>
@@ -1197,13 +1197,13 @@ or
 <!-- .LP -->
 <!-- .eM -->
 If the specified mode is 
-<function>ScreenSaverActive </function>
+<function>ScreenSaverActive</function>
 and the screen saver currently is deactivated,
 <function>XForceScreenSaver</function>
 activates the screen saver even if the screen saver had been disabled
 with a timeout of zero.
 If the specified mode is 
-<function>ScreenSaverReset </function>
+<function>ScreenSaverReset</function>
 and the screen saver currently is enabled,
 <function>XForceScreenSaver</function>
 deactivates the screen saver if it was activated,
@@ -1214,7 +1214,7 @@ and the activation timer is reset to its initial state
 <!-- .LP -->
 <function>XForceScreenSaver</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -1226,7 +1226,7 @@ To activate the screen saver, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XActivateScreenSaver</function></funcdef>
+  <funcdef><function>XActivateScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1254,7 +1254,7 @@ To reset the screen saver, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XResetScreenSaver</function></funcdef>
+  <funcdef><function>XResetScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1282,7 +1282,7 @@ To get the current screen saver values, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGetScreenSaver</function></funcdef>
+  <funcdef><function>XGetScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int*timeout_return,<parameter> *interval_return</parameter></paramdef>
   <paramdef>int<parameter> *prefer_blanking_return</parameter></paramdef>
@@ -1405,7 +1405,7 @@ The host the window system is running on.
   <listitem>
     <para>
 On <acronym>POSIX</acronym>-conformant systems, each host listed in the
-<function>/etc/X?.hosts </function>
+<function>/etc/X?.hosts</function>
 file.
 The ? indicates the number of the
 display.
@@ -1442,7 +1442,7 @@ see ``X Window System Protocol.''
 Xlib provides functions that you can use to add, get, or remove hosts
 from the access control list.
 All the host access control functions use the 
-<function>XHostAddress </function>
+<function>XHostAddress</function>
 structure, which contains:
 </para>
 <para>
@@ -1529,7 +1529,7 @@ To add a single host, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAddHost</function></funcdef>
+  <funcdef><function>XAddHost</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XHostAddress<parameter> *host</parameter></paramdef>
 </funcprototype>
@@ -1575,7 +1575,7 @@ error results.
 can generate
 <function>BadAccess</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1587,7 +1587,7 @@ To add multiple hosts at one time, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAddHosts</function></funcdef>
+  <funcdef><function>XAddHosts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XHostAddress<parameter> *hosts</parameter></paramdef>
   <paramdef>int<parameter> num_hosts</parameter></paramdef>
@@ -1644,7 +1644,7 @@ error results.
 can generate
 <function>BadAccess</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1656,7 +1656,7 @@ To obtain a host list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XHostAddress<function> *XListHosts</function></funcdef>
+  <funcdef>XHostAddress *<function>XListHosts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *nhosts_return</parameter></paramdef>
   <paramdef>Bool<parameter> *state_return</parameter></paramdef>
@@ -1720,7 +1720,7 @@ To remove a single host, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRemoveHost</function></funcdef>
+  <funcdef><function>XRemoveHost</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XHostAddress<parameter> *host</parameter></paramdef>
 </funcprototype>
@@ -1770,7 +1770,7 @@ and this operation cannot be reversed unless you reset the server.
 can generate
 <function>BadAccess</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1782,7 +1782,7 @@ To remove multiple hosts at one time, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRemoveHosts</function></funcdef>
+  <funcdef><function>XRemoveHosts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XHostAddress<parameter> *hosts</parameter></paramdef>
   <paramdef>int<parameter> num_hosts</parameter></paramdef>
@@ -1843,7 +1843,7 @@ and this operation cannot be reversed unless you reset the server.
 can generate
 <function>BadAccess</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 </sect2>
@@ -1873,7 +1873,7 @@ To change access control, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetAccessControl</function></funcdef>
+  <funcdef><function>XSetAccessControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> mode</parameter></paramdef>
 </funcprototype>
@@ -1920,7 +1920,7 @@ at each connection setup.
 can generate
 <function>BadAccess</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -1932,7 +1932,7 @@ To enable access control, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XEnableAccessControl</function></funcdef>
+  <funcdef><function>XEnableAccessControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1961,7 +1961,7 @@ function enables the use of the access control list at each connection setup.
 <!-- .LP -->
 <function>XEnableAccessControl</function>
 can generate a
-<function>BadAccess </function>
+<function>BadAccess</function>
 error.
 </para>
 <para>
@@ -1973,7 +1973,7 @@ To disable access control, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDisableAccessControl</function></funcdef>
+  <funcdef><function>XDisableAccessControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2002,7 +2002,7 @@ function disables the use of the access control list at each connection setup.
 <!-- .LP -->
 <function>XDisableAccessControl</function>
 can generate a
-<function>BadAccess </function>
+<function>BadAccess</function>
 error.
 <!-- .bp -->
 
diff --git a/specs/libX11/CH10.xml b/specs/libX11/CH10.xml
index 95cb3ae8..db691c72 100644
--- a/specs/libX11/CH10.xml
+++ b/specs/libX11/CH10.xml
@@ -324,9 +324,9 @@ Unless the client has specifically asked for them,
 most events are not reported to clients when they are generated. 
 Unless the client suppresses them by setting graphics-exposures in the GC to
 <function>False</function>,
-<function>GraphicsExpose </function>
+<function>GraphicsExpose</function>
 and 
-<function>NoExpose </function>
+<function>NoExpose</function>
 are reported by default as a result of
 <function>XCopyPlane</function>
 and
@@ -522,7 +522,7 @@ In another case,
 two event masks can map to one event type.
 For example, 
 if you pass either
-<function>PointerMotionMask </function>
+<function>PointerMotionMask</function>
 or
 <function>ButtonMotionMask</function>,
 the X server sends back
@@ -929,7 +929,7 @@ with these client passed arguments:
     </row>
     <row>
       <entry><emphasis remap='I'>keyboard_mode</emphasis></entry>
-      <entry><function>GrabModeAsync </function></entry>
+      <entry><function>GrabModeAsync</function></entry>
     </row>
     <row>
       <entry><emphasis remap='I'>owner_events</emphasis></entry>
@@ -938,15 +938,15 @@ with these client passed arguments:
       <function>OwnerGrabButtonMask</function>
       on the event window,
       otherwise
-      <function>False </function></entry>
+      <function>False</function></entry>
     </row>
     <row>
       <entry><emphasis remap='I'>confine_to</emphasis></entry>
-      <entry><function>None </function></entry>
+      <entry><function>None</function></entry>
     </row>
     <row>
       <entry><emphasis remap='I'>cursor</emphasis></entry>
-      <entry><function>None </function></entry>
+      <entry><function>None</function></entry>
     </row>
   </tbody>
   </tgroup>
@@ -979,7 +979,7 @@ This section discusses the processing that occurs for the
 keyboard events
 <function>KeyPress</function>
 and 
-<function>KeyRelease </function>
+<function>KeyRelease</function>
 and the pointer events
 <function>ButtonPress</function>,
 <function>ButtonRelease</function>,
@@ -1033,13 +1033,13 @@ To receive
 <function>KeyRelease</function>,
 <function>ButtonPress</function>,
 and
-<function>ButtonRelease </function>
+<function>ButtonRelease</function>
 events, set 
 <function>KeyPressMask</function>,
 <function>KeyReleaseMask</function>,
 <function>ButtonPressMask</function>,
 and
-<function>ButtonReleaseMask </function>
+<function>ButtonReleaseMask</function>
 bits in the event-mask attribute of the window.
 </para>
 <para>
@@ -1212,7 +1212,7 @@ relative to the root window's origin at the time of the event.
 The same_screen member is set to indicate whether the event 
 window is on the same screen
 as the root window and can be either
-<function>True </function>
+<function>True</function>
 or
 <function>False</function>.
 If
@@ -1286,7 +1286,7 @@ It represents the pointer button that changed state and can be the
 <function>Button3</function>,
 <function>Button4</function>,
 or
-<function>Button5 </function>
+<function>Button5</function>
 value.
 For the
 <function>XPointerMovedEvent</function>
@@ -1445,14 +1445,14 @@ generated after any hierarchy event
 <function>CirculateNotify</function>)
 caused by that change;
 however, the X protocol does not constrain the ordering of 
-<function>EnterNotify </function>
+<function>EnterNotify</function>
 and 
-<function>LeaveNotify </function>
+<function>LeaveNotify</function>
 events with respect to
 <function>FocusOut</function>,
 <function>VisibilityNotify</function>,
 and 
-<function>Expose </function>
+<function>Expose</function>
 events.
 </para>
 <para>
@@ -1536,14 +1536,14 @@ on which the event occurred.
 <para>
 <!-- .LP -->
 For a
-<function>LeaveNotify </function>
+<function>LeaveNotify</function>
 event,
 if a child of the event window contains the initial position of the pointer,
 the subwindow component is set to that child.
 Otherwise, the X server sets the subwindow member to
 <function>None</function>.
 For an
-<function>EnterNotify </function>
+<function>EnterNotify</function>
 event, if a child of the event window contains the final pointer position, 
 the subwindow component is set to that child or
 <function>None</function>.
@@ -1567,7 +1567,7 @@ root window's origin at the time of the event.
 <!-- .LP -->
 The same_screen member is set to indicate whether the event window is on the same screen
 as the root window and can be either
-<function>True </function>
+<function>True</function>
 or
 <function>False</function>.
 If
@@ -1582,7 +1582,7 @@ the event and root windows are not on the same screen.
 The focus member is set to indicate whether the event window is the focus window or an
 inferior of the focus window.
 The X server can set this member to either
-<function>True </function>
+<function>True</function>
 or
 <function>False</function>.
 If
@@ -2346,7 +2346,7 @@ When the focus moves from window A to
 <function>PointerRoot</function>
 (events sent to the window under the pointer)
 or
-<function>None </function>
+<function>None</function>
 (discard), and the pointer is in window P,
 the X server does the following:
 <!-- .RS -->
@@ -2417,7 +2417,7 @@ When the focus moves from
 <function>PointerRoot</function>
 (events sent to the window under the pointer)
 or
-<function>None </function>
+<function>None</function>
 to window A, and the pointer is in window P, 
 the X server does the following: 
 <!-- .RS -->
@@ -2530,7 +2530,7 @@ event on all root windows,
 with the detail member of each
 <function>XFocusInEvent</function>
 structure set to
-<function>NotifyDetailNone </function>
+<function>NotifyDetailNone</function>
 or
 <function>NotifyPointerRoot</function>.
     </para>
@@ -2572,7 +2572,7 @@ are identified by
 or
 <function>XFocusOutEvent</function>
 structures whose mode member is set to 
-<function>NotifyUngrab </function>
+<function>NotifyUngrab</function>
 (see 
 <function>XGrabKeyboard</function>).
 </para>
@@ -2714,7 +2714,7 @@ restoring the contents of an exposed window region.
 (An exposed window region describes a formerly obscured window whose 
 region becomes visible.) 
 Therefore, the X server sends 
-<function>Expose </function>
+<function>Expose</function>
 events describing the window and the region of the window that has been exposed.
 A naive client application usually redraws the entire window. 
 A more sophisticated client application redraws only the exposed region.
@@ -2757,7 +2757,7 @@ event is generated for each rectangle.
 For any given window,
 the X server guarantees to report contiguously 
 all of the regions exposed by some action that causes 
-<function>Expose </function>
+<function>Expose</function>
 events, such as raising a window.
 </para>
 <para>
@@ -2805,7 +2805,7 @@ If count is zero, no more
 <function>Expose</function>
 events follow for this window.
 However, if count is nonzero, at least that number of 
-<function>Expose </function>
+<function>Expose</function>
 events (and possibly more) follow for this window.
 Simple applications that do not want to optimize redisplay by distinguishing
 between subareas of its window can just ignore all
@@ -2864,7 +2864,7 @@ attribute of the graphics context to
 <function>True</function>.
 You also can set the graphics-expose attribute when creating a graphics
 context using
-<function>XCreateGC </function>
+<function>XCreateGC</function>
 or by calling
 <function>XSetGraphicsExposures</function>.
 </para>
@@ -2985,7 +2985,7 @@ events
   </listitem>
   <listitem>
     <para>
-<function>CreateNotify </function>
+<function>CreateNotify</function>
 events
     </para>
   </listitem>
@@ -3015,7 +3015,7 @@ events
   </listitem>
   <listitem>
     <para>
-<function>ReparentNotify </function>
+<function>ReparentNotify</function>
 events
     </para>
   </listitem>
@@ -3344,7 +3344,7 @@ or
 <para>
 <!-- .LP -->
 The ordering of the 
-<function>DestroyNotify </function>
+<function>DestroyNotify</function>
 events is such that for any given window, 
 <function>DestroyNotify</function>
 is generated on all inferiors of the window
@@ -3644,7 +3644,7 @@ The X server can report
 events to clients wanting information about changing a window's parent.
 The X server generates this event whenever a client
 application calls
-<function>XReparentWindow </function>
+<function>XReparentWindow</function>
 and the window is actually reparented.
 </para>
 <para>
@@ -3763,7 +3763,7 @@ was selected.
 This is the window used by the X server to report the event.
 The window member is set to the window that was unmapped.
 The from_configure member is set to
-<function>True </function>
+<function>True</function>
 if the event was generated as a result of a resizing of the window's parent when
 the window itself had a win_gravity of
 <function>UnmapGravity</function>.
@@ -3801,7 +3801,7 @@ after any hierarchy event
 caused by that change.  Any
 <function>VisibilityNotify</function>
 event on a given window is generated before any
-<function>Expose </function>
+<function>Expose</function>
 events on that window, but it is not required that all
 <function>VisibilityNotify</function>
 events on all windows be generated before all 
@@ -3919,13 +3919,13 @@ events
   </listitem>
   <listitem>
     <para>
-<function>MapRequest </function>
+<function>MapRequest</function>
 events
     </para>
   </listitem>
   <listitem>
     <para>
-<function>ResizeRequest </function>
+<function>ResizeRequest</function>
 events
     </para>
   </listitem>
@@ -4054,7 +4054,7 @@ For example, suppose a client application calls
 <function>XLowerWindow</function>
 to lower a window.
 If you had selected
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent window and if the override-redirect attribute 
 of the window is set to
 <function>False</function>,
@@ -4096,7 +4096,7 @@ The parent member is set to the parent window.
 The window member is set to the window whose size, position, border width, 
 and/or stacking order is to be reconfigured.
 The value_mask member indicates which components were specified in the
-<function>ConfigureWindow </function>
+<function>ConfigureWindow</function>
 protocol request.
 The corresponding values are reported as given in the request.
 The remaining values are filled in from the current geometry of the window,
@@ -4147,7 +4147,7 @@ For example, suppose a client application calls
 <function>XMapWindow</function>
 to map a window.
 If you (usually a window manager) had selected
-<function>SubstructureRedirectMask </function>
+<function>SubstructureRedirectMask</function>
 on the parent window and if the override-redirect attribute 
 of the window is set to
 <function>False</function>,
@@ -4271,7 +4271,7 @@ calling
 <function>XChangeWindowAttributes</function>,
 <function>XFreeColormap</function>,
 or
-<function>XSetWindowColormap </function>
+<function>XSetWindowColormap</function>
     </para>
   </listitem>
   <listitem>
@@ -4279,14 +4279,14 @@ or
 Installs or uninstalls the colormap by calling
 <function>XInstallColormap</function>
 or
-<function>XUninstallColormap </function>
+<function>XUninstallColormap</function>
     </para>
   </listitem>
 </itemizedlist>
 <para>
 <!-- .LP -->
 To receive 
-<function>ColormapNotify </function>
+<function>ColormapNotify</function>
 events, set the
 <function>ColormapChangeMask</function>
 bit in the event-mask attribute of the window. 
@@ -4356,7 +4356,7 @@ This section discusses:
 <itemizedlist>
   <listitem>
     <para>
-<function>ClientMessage </function>
+<function>ClientMessage</function>
 events
     </para>
   </listitem>
@@ -4584,7 +4584,7 @@ The X server reports
 events to the owner of a selection.
 The X server generates this event whenever a client 
 requests a selection conversion by calling 
-<function>XConvertSelection </function>
+<function>XConvertSelection</function>
 for the owned selection.
 </para>
 <para>
@@ -4627,7 +4627,7 @@ the selection is desired in.
 The property member can be a property name or 
 <function>None</function>.
 The time member is set to the timestamp or 
-<function>CurrentTime </function>
+<function>CurrentTime</function>
 value from the
 <function>ConvertSelection</function>
 request.
@@ -4652,7 +4652,7 @@ standard <emphasis remap='I'>Inter-Client Communication Conventions Manual</emph
 <indexterm><primary>Events</primary><secondary>SelectionNotify</secondary></indexterm>
 <indexterm significance="preferred"><primary>SelectionNotify</primary></indexterm>
 This event is generated by the X server in response to a
-<function>ConvertSelection </function>
+<function>ConvertSelection</function>
 protocol request when there is no owner for the selection.
 When there is an owner, it should be generated by the owner
 of the selection by using
diff --git a/specs/libX11/CH11.xml b/specs/libX11/CH11.xml
index a92ba637..b76ca0ba 100644
--- a/specs/libX11/CH11.xml
+++ b/specs/libX11/CH11.xml
@@ -44,7 +44,7 @@ Another way is to use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSelectInput</function></funcdef>
+  <funcdef><function>XSelectInput</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>long<parameter> event_mask</parameter></paramdef>
@@ -140,7 +140,7 @@ the event mask
   <listitem>
     <para>
 Only one client at a time can select a 
-<function>ButtonPress </function>
+<function>ButtonPress</function>
 event, which is associated with
 the event mask
 <function>ButtonPressMask</function>.
@@ -155,7 +155,7 @@ The server reports the event to all interested clients.
 <!-- .LP -->
 <function>XSelectInput</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -182,7 +182,7 @@ To flush the output buffer, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFlush</function></funcdef>
+  <funcdef><function>XFlush</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -228,7 +228,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSync</function></funcdef>
+  <funcdef><function>XSync</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Bool<parameter> discard</parameter></paramdef>
 </funcprototype>
@@ -282,7 +282,7 @@ Finally, if you passed
 does not discard the events in the queue.
 If you passed 
 <function>True</function>,
-<function>XSync </function>
+<function>XSync</function>
 discards all events in the queue,
 including those events that were on the queue before
 <function>XSync</function>
@@ -311,7 +311,7 @@ To check the number of events in the event queue, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XEventsQueued</function></funcdef>
+  <funcdef>int <function>XEventsQueued</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> mode</parameter></paramdef>
 </funcprototype>
@@ -350,7 +350,7 @@ or
 <!-- .eM -->
 If mode is 
 <function>QueuedAlready</function>,
-<function>XEventsQueued </function>
+<function>XEventsQueued</function>
 returns the number of events
 already in the event queue (and never performs a system call).
 If mode is 
@@ -397,7 +397,7 @@ To return the number of events that are pending, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XPending</function></funcdef>
+  <funcdef>int <function>XPending</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -471,7 +471,7 @@ To get the next event and remove it from the queue, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XNextEvent</function></funcdef>
+  <funcdef><function>XNextEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
 </funcprototype>
@@ -521,7 +521,7 @@ To peek at the event queue, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XPeekEvent</function></funcdef>
+  <funcdef><function>XPeekEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
 </funcprototype>
@@ -591,7 +591,7 @@ The predicate procedure and its associated arguments are:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> Bool</function></funcdef>
+  <funcdef><function>Bool</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event</parameter></paramdef>
   <paramdef>XPointer<parameter> arg</parameter></paramdef>
@@ -631,7 +631,7 @@ Specifies the argument passed in from the
 <function>XIfEvent</function>,
 <function>XCheckIfEvent</function>,
 or
-<function>XPeekIfEvent </function>
+<function>XPeekIfEvent</function>
 function.
     </para>
   </listitem>
@@ -658,7 +658,7 @@ and, if found, remove the event from the queue, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XIfEvent</function></funcdef>
+  <funcdef><function>XIfEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
   <paramdef>Bool<parameter> (*predicate)()</parameter></paramdef>
@@ -717,7 +717,7 @@ The
 <function>XIfEvent</function>
 function completes only when the specified predicate
 procedure returns 
-<function>True </function>
+<function>True</function>
 for an event, 
 which indicates an event in the queue matches.
 <function>XIfEvent</function>
@@ -737,7 +737,7 @@ To check the event queue for a matching event without blocking, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XCheckIfEvent</function></funcdef>
+  <funcdef>Bool <function>XCheckIfEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
   <paramdef>Bool<parameter> (*predicate)()</parameter></paramdef>
@@ -816,7 +816,7 @@ without removing the event from the queue, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XPeekIfEvent</function></funcdef>
+  <funcdef><function>XPeekIfEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
   <paramdef>Bool<parameter> (*predicate)()</parameter></paramdef>
@@ -905,7 +905,7 @@ To remove the next event that matches both a window and an event mask, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XWindowEvent</function></funcdef>
+  <funcdef><function>XWindowEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>long<parameter> event_mask</parameter></paramdef>
@@ -982,15 +982,15 @@ use
 <function>XCheckWindowEvent</function>.
 <indexterm><primary>XCheckWindowEvent</primary></indexterm>
 This function is similar to
-<function>XWindowEvent </function>
+<function>XWindowEvent</function>
 except that it never blocks and it returns a 
-<function>Bool </function>
+<function>Bool</function>
 indicating if the event was returned.
 <indexterm significance="preferred"><primary>XCheckWindowEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XCheckWindowEvent</function></funcdef>
+  <funcdef>Bool <function>XCheckWindowEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>long<parameter> event_mask</parameter></paramdef>
@@ -1072,7 +1072,7 @@ To remove the next event that matches an event mask, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XMaskEvent</function></funcdef>
+  <funcdef><function>XMaskEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>long<parameter> event_mask</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
@@ -1135,15 +1135,15 @@ flushes the output buffer and blocks until one is received.
 To return and remove the next event that matches an event mask (if any), use
 <function>XCheckMaskEvent</function>.
 This function is similar to 
-<function>XMaskEvent </function>
+<function>XMaskEvent</function>
 except that it never blocks and it returns a 
-<function>Bool </function>
+<function>Bool</function>
 indicating if the event was returned.
 <indexterm significance="preferred"><primary>XCheckMaskEvent</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XCheckMaskEvent</function></funcdef>
+  <funcdef>Bool <function>XCheckMaskEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>long<parameter> event_mask</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
@@ -1212,7 +1212,7 @@ To return and remove the next event in the queue that matches an event type, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XCheckTypedEvent</function></funcdef>
+  <funcdef>Bool <function>XCheckTypedEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> event_type</parameter></paramdef>
   <paramdef>XEvent<parameter> *event_return</parameter></paramdef>
@@ -1283,7 +1283,7 @@ and a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XCheckTypedWindowEvent</function></funcdef>
+  <funcdef>Bool <function>XCheckTypedWindowEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> event_type</parameter></paramdef>
@@ -1371,7 +1371,7 @@ To push an event back into the event queue, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XPutBackEvent</function></funcdef>
+  <funcdef><function>XPutBackEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XEvent<parameter> *event</parameter></paramdef>
 </funcprototype>
@@ -1434,7 +1434,7 @@ and stored as a property.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XSendEvent</function></funcdef>
+  <funcdef>Status <function>XSendEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Bool<parameter> propagate</parameter></paramdef>
@@ -1523,7 +1523,7 @@ the destination window is the window that contains the pointer.
   <listitem>
     <para>
 If w is
-<function>InputFocus </function>
+<function>InputFocus</function>
 and if the focus window contains the pointer, 
 the destination window is the window that contains the pointer; 
 otherwise, the destination window is the focus window.
@@ -1556,7 +1556,7 @@ types in the event_mask argument.
   <listitem>
     <para>
 If propagate is 
-<function>True </function>
+<function>True</function>
 and no clients have selected on destination any of
 the event types in event-mask, the destination is replaced with the
 closest ancestor of destination for which some client has selected a
@@ -1564,7 +1564,7 @@ type in event-mask and for which no intervening window has that type in its
 do-not-propagate-mask. 
 If no such window exists or if the window is
 an ancestor of the focus window and 
-<function>InputFocus </function>
+<function>InputFocus</function>
 was originally specified
 as the destination, the event is not sent to any clients.
 Otherwise, the event is reported to every client selecting on the final
@@ -1601,7 +1601,7 @@ and returns nonzero otherwise.
 can generate
 <function>BadValue</function>
 and 
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -1632,7 +1632,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned<function> long</function></funcdef>
+  <funcdef>unsigned <function>long</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1670,7 +1670,7 @@ To get the motion history for a specified window and time, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XTimeCoord<function> *XGetMotionEvents</function></funcdef>
+  <funcdef>XTimeCoord *<function>XGetMotionEvents</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Timestart,<parameter> stop</parameter></paramdef>
@@ -1781,7 +1781,7 @@ To free the data returned from this call, use
 <!-- .LP -->
 <function>XGetMotionEvents</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -1811,7 +1811,7 @@ synchronization is enabled.
 <indexterm><primary>_Xdebug</primary></indexterm>
 On <acronym>POSIX</acronym>-conformant systems,
 there is also a global variable 
-<function>_Xdebug </function>
+<function>_Xdebug</function>
 that, if set to nonzero before starting a program under a debugger, will force
 synchronous library behavior.
 </para>
@@ -1826,7 +1826,7 @@ sets which function is to be called.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> int</function></funcdef>
+  <funcdef><function>int</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> (*procedure)()</parameter></paramdef>
 </funcprototype>
@@ -1871,7 +1871,7 @@ To enable or disable synchronization, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> int</function></funcdef>
+  <funcdef><function>int</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Bool<parameter> onoff</parameter></paramdef>
 </funcprototype>
@@ -1914,7 +1914,7 @@ If onoff is
 turns on synchronous behavior.
 If onoff is
 <function>False</function>,
-<function>XSynchronize </function>
+<function>XSynchronize</function>
 turns off synchronous behavior.
 </para>
 </sect2>
@@ -1947,7 +1947,7 @@ To set the error handler, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> *XSetErrorHandler</function></funcdef>
+  <funcdef>int *<function>XSetErrorHandler</function></funcdef>
   <paramdef>int <parameter> *handler</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2022,7 +2022,7 @@ typedef struct {
 The serial member is the number of requests, starting from one, 
 sent over the network connection since it was opened. 
 It is the number that was the value of 
-<function>NextRequest </function>
+<function>NextRequest</function>
 immediately before the failing call was made.  
 The request_code member is a protocol request
 of the procedure that failed, as defined in 
@@ -2119,7 +2119,7 @@ chapter:
     <row>
       <entry><function>BadGC</function></entry>
       <entry>A value for a
-      <function>GContext </function>
+      <function>GContext</function>
       argument does not name a defined 
       <function>GContext</function>.</entry>
     </row>
@@ -2156,7 +2156,7 @@ chapter:
     </row>
     <row>
       <entry></entry>
-      <entry>An <function>InputOnly </function> window is used as a drawable.</entry>
+      <entry>An <function>InputOnly</function> window is used as a drawable.</entry>
     </row>
     <row>
       <entry></entry>
@@ -2166,7 +2166,7 @@ chapter:
     </row>
     <row>
       <entry></entry>
-      <entry>An <function>InputOnly </function>
+      <entry>An <function>InputOnly</function>
       window lacks this attribute.</entry>
     </row>
     <row>
@@ -2237,7 +2237,7 @@ To obtain textual descriptions of the specified error code, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGetErrorText</function></funcdef>
+  <funcdef><function>XGetErrorText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> code</parameter></paramdef>
   <paramdef>char<parameter> *buffer_return</parameter></paramdef>
@@ -2309,7 +2309,7 @@ To obtain error messages from the error database, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGetErrorDatabaseText</function></funcdef>
+  <funcdef><function>XGetErrorDatabaseText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char*name,<parameter> *message</parameter></paramdef>
   <paramdef>char<parameter> *default_string</parameter></paramdef>
@@ -2454,7 +2454,7 @@ To report an error to the user when the requested display does not exist, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XDisplayName</function></funcdef>
+  <funcdef>char *<function>XDisplayName</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2497,7 +2497,7 @@ To handle fatal I/O errors, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> int</function></funcdef>
+  <funcdef><function>int</function></funcdef>
   <paramdef>int(*handler)(Display<parameter> *)</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
diff --git a/specs/libX11/CH12.xml b/specs/libX11/CH12.xml
index 6c870270..14865ffc 100644
--- a/specs/libX11/CH12.xml
+++ b/specs/libX11/CH12.xml
@@ -158,7 +158,7 @@ To grab the pointer, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XGrabPointer</function></funcdef>
+  <funcdef>int <function>XGrabPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> grab_window</parameter></paramdef>
   <paramdef>Bool<parameter> owner_events</parameter></paramdef>
@@ -222,7 +222,7 @@ The mask is the bitwise inclusive OR of the valid pointer event mask bits.
       <para>
 Specifies further processing of pointer events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -236,7 +236,7 @@ or
       <para>
 Specifies further processing of keyboard events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -375,11 +375,11 @@ grabbed the pointer before its request was processed.
 </para>
 <para>
 <!-- .LP -->
-<function>XGrabPointer </function>
+<function>XGrabPointer</function>
 generates
-<function>EnterNotify </function>
+<function>EnterNotify</function>
 and
-<function>LeaveNotify </function>
+<function>LeaveNotify</function>
 events.
 </para>
 <para>
@@ -400,7 +400,7 @@ If the specified time is earlier than the last-pointer-grab time or later
 than the current X server time, it fails and returns
 <function>GrabInvalidTime</function>.
 Otherwise, the last-pointer-grab time is set to the specified time
-(<function>CurrentTime </function>
+(<function>CurrentTime</function>
 is replaced by the current X server time).
 </para>
 <para>
@@ -410,7 +410,7 @@ can generate
 <function>BadCursor</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -424,7 +424,7 @@ To ungrab the pointer, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUngrabPointer</function></funcdef>
+  <funcdef><function>XUngrabPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Time<parameter> time</parameter></paramdef>
 </funcprototype>
@@ -470,12 +470,12 @@ does not release the pointer if the specified
 time is earlier than the last-pointer-grab time or is later than the
 current X server time.
 It also generates 
-<function>EnterNotify </function>
+<function>EnterNotify</function>
 and 
-<function>LeaveNotify </function>
+<function>LeaveNotify</function>
 events.
 The X server performs an 
-<function>UngrabPointer </function>
+<function>UngrabPointer</function>
 request automatically if the event window or confine_to window 
 for an active pointer grab becomes not viewable
 or if window reconfiguration causes the confine_to window to lie completely
@@ -492,7 +492,7 @@ To change an active pointer grab, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeActivePointerGrab</function></funcdef>
+  <funcdef><function>XChangeActivePointerGrab</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedint<parameter> event_mask</parameter></paramdef>
   <paramdef>Cursor<parameter> cursor</parameter></paramdef>
@@ -564,7 +564,7 @@ The interpretation of event_mask and cursor is the same as described in
 <!-- .LP -->
 <function>XChangeActivePointerGrab</function>
 can generate
-<function>BadCursor </function>
+<function>BadCursor</function>
 and
 <function>BadValue</function>
 errors.
@@ -580,7 +580,7 @@ To grab a pointer button, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGrabButton</function></funcdef>
+  <funcdef><function>XGrabButton</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedint<parameter> button</parameter></paramdef>
   <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
@@ -669,7 +669,7 @@ The mask is the bitwise inclusive OR of the valid pointer event mask bits.
       <para>
 Specifies further processing of pointer events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -683,7 +683,7 @@ or
       <para>
 Specifies further processing of keyboard events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -772,13 +772,13 @@ may lag the physical state if device event processing is frozen.
 This request overrides all previous grabs by the same client on the same
 button/key combinations on the same window.
 A modifiers of 
-<function>AnyModifier </function>
+<function>AnyModifier</function>
 is equivalent to issuing the grab request for all
 possible modifier combinations (including the combination of no modifiers).  
 It is not required that all modifiers specified have currently assigned 
 KeyCodes.
 A button of 
-<function>AnyButton </function>
+<function>AnyButton</function>
 is equivalent to
 issuing the request for all possible buttons.
 Otherwise, it is not required that the specified button currently be assigned
@@ -789,10 +789,10 @@ to a physical button.
 If some other client has already issued an
 <function>XGrabButton</function>
 with the same button/key combination on the same window, a
-<function>BadAccess </function>
+<function>BadAccess</function>
 error results.
 When using 
-<function>AnyModifier </function>
+<function>AnyModifier</function>
 or 
 <function>AnyButton</function>,
 the request fails completely,
@@ -810,7 +810,7 @@ can generate
 <function>BadCursor</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -824,7 +824,7 @@ To ungrab a pointer button, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUngrabButton</function></funcdef>
+  <funcdef><function>XUngrabButton</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedint<parameter> button</parameter></paramdef>
   <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
@@ -887,13 +887,13 @@ The
 function releases the passive button/key combination on the specified window if
 it was grabbed by this client.
 A modifiers of 
-<function>AnyModifier </function>
+<function>AnyModifier</function>
 is
 equivalent to issuing 
 the ungrab request for all possible modifier combinations, including 
 the combination of no modifiers.
 A button of 
-<function>AnyButton </function>
+<function>AnyButton</function>
 is equivalent to issuing the
 request for all possible buttons.
 <function>XUngrabButton</function>
@@ -905,7 +905,7 @@ has no effect on an active grab.
 can generate
 <function>BadValue</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -945,7 +945,7 @@ To grab the keyboard, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XGrabKeyboard</function></funcdef>
+  <funcdef>int <function>XGrabKeyboard</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> grab_window</parameter></paramdef>
   <paramdef>Bool<parameter> owner_events</parameter></paramdef>
@@ -994,7 +994,7 @@ are to be reported as usual.
       <para>
 Specifies further processing of pointer events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -1008,7 +1008,7 @@ or
       <para>
 Specifies further processing of keyboard events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -1047,15 +1047,15 @@ If owner_events is
 all generated key events are reported with
 respect to grab_window.  
 If owner_events is 
-<function>True  </function>
+<function>True</function>
 and if a generated
 key event would normally be reported to this client, it is reported
 normally; otherwise, the event is reported with respect to the
 grab_window.  
 Both 
-<function>KeyPress </function>
+<function>KeyPress</function>
 and 
-<function>KeyRelease </function>
+<function>KeyRelease</function>
 events are always reported,
 independent of any event selection made by the client.
 </para>
@@ -1072,7 +1072,7 @@ If the keyboard_mode  argument is
 the state of the keyboard (as seen by client applications) appears to freeze,
 and the X server generates no further keyboard events until the
 grabbing client issues a releasing 
-<function>XAllowEvents </function>
+<function>XAllowEvents</function>
 call or until the keyboard grab is released.
 Actual keyboard changes are not lost while the keyboard is frozen; 
 they are simply queued in the server for later processing.
@@ -1088,7 +1088,7 @@ If pointer_mode is
 the state of the pointer (as seen by client applications) appears to freeze, 
 and the X server generates no further pointer events 
 until the grabbing client issues a releasing 
-<function>XAllowEvents </function>
+<function>XAllowEvents</function>
 call or until the keyboard grab is released.
 Actual pointer changes are not lost while the pointer is frozen; 
 they are simply queued in the server for later processing.
@@ -1110,7 +1110,7 @@ or later than the current X server time,
 it fails and returns
 <function>GrabInvalidTime</function>.
 Otherwise, the last-keyboard-grab time is set to the specified time
-(<function>CurrentTime </function>
+(<function>CurrentTime</function>
 is replaced by the current X server time).
 </para>
 <para>
@@ -1119,7 +1119,7 @@ is replaced by the current X server time).
 can generate
 <function>BadValue</function>
 and 
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -1133,7 +1133,7 @@ To ungrab the keyboard, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUngrabKeyboard</function></funcdef>
+  <funcdef><function>XUngrabKeyboard</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Time<parameter> time</parameter></paramdef>
 </funcprototype>
@@ -1180,12 +1180,12 @@ does not release the keyboard and any queued events
 if the specified time is earlier than
 the last-keyboard-grab time or is later than the current X server time.
 It also generates
-<function>FocusIn </function>
+<function>FocusIn</function>
 and 
-<function>FocusOut </function>
+<function>FocusOut</function>
 events.
 The X server automatically performs an 
-<function>UngrabKeyboard </function>
+<function>UngrabKeyboard</function>
 request if the event window for an
 active keyboard grab becomes not viewable.
 </para>
@@ -1200,7 +1200,7 @@ To passively grab a single key of the keyboard, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGrabKey</function></funcdef>
+  <funcdef><function>XGrabKey</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> keycode</parameter></paramdef>
   <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
@@ -1273,7 +1273,7 @@ are to be reported as usual.
       <para>
 Specifies further processing of pointer events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
       </para>
@@ -1287,7 +1287,7 @@ or
       <para>
 Specifies further processing of keyboard events.
 You can pass 
-<function>GrabModeSync </function>
+<function>GrabModeSync</function>
 or
 <function>GrabModeAsync</function>.
     </para>
@@ -1371,7 +1371,7 @@ error results.
 If some other client has issued a 
 <function>XGrabKey</function>
 with the same key combination on the same window, a 
-<function>BadAccess </function>
+<function>BadAccess</function>
 error results.
 When using
 <function>AnyModifier</function>
@@ -1379,7 +1379,7 @@ or
 <function>AnyKey</function>,
 the request fails completely,
 and a
-<function>BadAccess </function>
+<function>BadAccess</function>
 error results (no grabs are established) 
 if there is a conflicting grab for any combination.
 </para>
@@ -1390,7 +1390,7 @@ can generate
 <function>BadAccess</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -1404,7 +1404,7 @@ To ungrab a key, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUngrabKey</function></funcdef>
+  <funcdef><function>XUngrabKey</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> keycode</parameter></paramdef>
   <paramdef>unsignedint<parameter> modifiers</parameter></paramdef>
@@ -1481,7 +1481,7 @@ is equivalent to issuing the request for all possible key codes.
 can generate
 <function>BadValue</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect1>
@@ -1505,7 +1505,7 @@ To allow further events to be processed when the device has been frozen, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAllowEvents</function></funcdef>
+  <funcdef><function>XAllowEvents</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> event_mode</parameter></paramdef>
   <paramdef>Time<parameter> time</parameter></paramdef>
@@ -1579,25 +1579,25 @@ Depending on the event_mode argument, the following occurs:
       <entry>If the pointer is frozen by the client,
       pointer event processing continues as usual.
       If the pointer is frozen twice by the client on behalf of two separate grabs,
-      <function>AsyncPointer </function>
+      <function>AsyncPointer</function>
       thaws for both.
       <function>AsyncPointer</function>
       has no effect if the pointer is not frozen by the client,
       but the pointer need not be grabbed by the client.</entry>
     </row>
     <row>
-      <entry><function>SyncPointer </function></entry>
+      <entry><function>SyncPointer</function></entry>
       <entry>If the pointer is frozen and actively grabbed by the client,
       pointer event processing continues as usual until the next
-      <function>ButtonPress </function>
+      <function>ButtonPress</function>
       or
-      <function>ButtonRelease </function>
+      <function>ButtonRelease</function>
       event is reported to the client.
       At this time,
       the pointer again appears to freeze.
       However, if the reported event causes the pointer grab to be released,
       the pointer does not freeze.
-      <function>SyncPointer </function>
+      <function>SyncPointer</function>
       has no effect if the pointer is not frozen by the client
       or if the pointer is not grabbed by the client.</entry>
     </row>
@@ -1605,9 +1605,9 @@ Depending on the event_mode argument, the following occurs:
       <entry><function>ReplayPointer</function></entry>
       <entry>If the pointer is actively grabbed by the client and is frozen as the result of
       an event having been sent to the client (either from the activation of an
-      <function>XGrabButton </function>
+      <function>XGrabButton</function>
       or from a previous
-      <function>XAllowEvents </function>
+      <function>XAllowEvents</function>
       with mode
       <function>SyncPointer</function>
       but not from an 
@@ -1619,13 +1619,13 @@ Depending on the event_mode argument, the following occurs:
       or if the pointer is not frozen as the result of an event.</entry>
     </row>
     <row>
-      <entry><function>AsyncKeyboard </function></entry>
+      <entry><function>AsyncKeyboard</function></entry>
       <entry>If the keyboard is frozen by the client,
       keyboard event processing continues as usual.
       If the keyboard is frozen twice by the client on behalf of two separate grabs,
-      <function>AsyncKeyboard </function>
+      <function>AsyncKeyboard</function>
       thaws for both.
-      <function>AsyncKeyboard </function>
+      <function>AsyncKeyboard</function>
       has no effect if the keyboard is not frozen by the client,
       but the keyboard need not be grabbed by the client.</entry>
     </row>
@@ -1633,15 +1633,15 @@ Depending on the event_mode argument, the following occurs:
       <entry><function>SyncKeyboard</function></entry>
       <entry>If the keyboard is frozen and actively grabbed by the client,
       keyboard event processing continues as usual until the next
-      <function>KeyPress </function>
+      <function>KeyPress</function>
       or
-      <function>KeyRelease </function>
+      <function>KeyRelease</function>
       event is reported to the client.
       At this time,
       the keyboard again appears to freeze.
       However, if the reported event causes the keyboard grab to be released,
       the keyboard does not freeze.
-      <function>SyncKeyboard </function>
+      <function>SyncKeyboard</function>
       has no effect if the keyboard is not frozen by the client
       or if the keyboard is not grabbed by the client.</entry>
     </row>
@@ -1650,11 +1650,11 @@ Depending on the event_mode argument, the following occurs:
       <entry>If the keyboard is actively grabbed by the client and is frozen
       as the result of an event having been sent to the client (either from the
       activation of an
-      <function>XGrabKey </function>
+      <function>XGrabKey</function>
       or from a previous
-      <function>XAllowEvents </function>
+      <function>XAllowEvents</function>
       with mode
-      <function>SyncKeyboard </function>
+      <function>SyncKeyboard</function>
       but not from an 
       <function>XGrabKeyboard</function>),
       the keyboard grab is released and that event is completely reprocessed.
@@ -1672,7 +1672,7 @@ Depending on the event_mode argument, the following occurs:
       <function>ButtonRelease</function>,
       <function>KeyPress</function>,
       or 
-      <function>KeyRelease </function>
+      <function>KeyRelease</function>
       event is reported to the client for a grabbed device 
       (button event for the pointer, key event for the keyboard), 
       at which time the devices again appear to freeze.  
@@ -1685,9 +1685,9 @@ Depending on the event_mode argument, the following occurs:
       are frozen by the client.
       If the pointer or keyboard is frozen twice
       by the client on behalf of two separate grabs, 
-      <function>SyncBoth </function>
+      <function>SyncBoth</function>
       thaws for both (but a subsequent freeze for 
-      <function>SyncBoth </function>
+      <function>SyncBoth</function>
       will only freeze each device once).</entry>
     </row>
     <row>
@@ -1695,9 +1695,9 @@ Depending on the event_mode argument, the following occurs:
       <entry>If the pointer and the keyboard are frozen by the
       client, event processing for both devices continues as usual.
       If a device is frozen twice by the client on behalf of two separate grabs,
-      <function>AsyncBoth </function>
+      <function>AsyncBoth</function>
       thaws for both.
-      <function>AsyncBoth </function>
+      <function>AsyncBoth</function>
       has no effect unless both
       pointer and keyboard are frozen by the client.</entry>
     </row>
@@ -1710,13 +1710,13 @@ Depending on the event_mode argument, the following occurs:
 <function>AsyncPointer</function>,
 <function>SyncPointer</function>,
 and 
-<function>ReplayPointer </function>
+<function>ReplayPointer</function>
 have no effect on the
 processing of keyboard events.
 <function>AsyncKeyboard</function>,
 <function>SyncKeyboard</function>,
 and 
-<function>ReplayKeyboard </function>
+<function>ReplayKeyboard</function>
 have no effect on the
 processing of pointer events.
 It is possible for both a pointer grab and a keyboard grab (by the same 
@@ -1736,7 +1736,7 @@ releases both.
 <!-- .LP -->
 <function>XAllowEvents</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 </sect1>
@@ -1760,7 +1760,7 @@ To move the pointer to an arbitrary point in a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XWarpPointer</function></funcdef>
+  <funcdef><function>XWarpPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Windowsrc_w,<parameter> dest_w</parameter></paramdef>
   <paramdef>intsrc_x,<parameter> src_y</parameter></paramdef>
@@ -1908,7 +1908,7 @@ confine_to window.
 <!-- .LP -->
 <function>XWarpPointer</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect1>
@@ -1934,7 +1934,7 @@ To set the input focus, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetInputFocus</function></funcdef>
+  <funcdef><function>XSetInputFocus</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> focus</parameter></paramdef>
   <paramdef>int<parameter> revert_to</parameter></paramdef>
@@ -2005,13 +2005,13 @@ function changes the input focus and the last-focus-change time.
 It has no effect if the specified time is earlier than the current
 last-focus-change time or is later than the current X server time.
 Otherwise, the last-focus-change time is set to the specified time
-(<function>CurrentTime </function>
+(<function>CurrentTime</function>
 is replaced by the current X server time).
 <function>XSetInputFocus</function>
 causes the X server to generate
-<function>FocusIn </function>
+<function>FocusIn</function>
 and 
-<function>FocusOut </function>
+<function>FocusOut</function>
 events.
 </para>
 <para>
@@ -2072,7 +2072,7 @@ and the new revert_to value is taken to be
   <listitem>
     <para>
 If revert_to is
-<function>RevertToPointerRoot </function>
+<function>RevertToPointerRoot</function>
 or 
 <function>RevertToNone</function>,
 the focus reverts to
@@ -2096,7 +2096,7 @@ can generate
 <function>BadMatch</function>,
 <function>BadValue</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2108,7 +2108,7 @@ To obtain the current input focus, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGetInputFocus</function></funcdef>
+  <funcdef><function>XGetInputFocus</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> *focus_return</parameter></paramdef>
   <paramdef>int<parameter> *revert_to_return</parameter></paramdef>
@@ -2323,7 +2323,7 @@ If an error is generated, a subset of the controls may have been altered.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeKeyboardControl</function></funcdef>
+  <funcdef><function>XChangeKeyboardControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedlong<parameter> value_mask</parameter></paramdef>
   <paramdef>XKeyboardControl<parameter> *values</parameter></paramdef>
@@ -2380,7 +2380,7 @@ The value_mask argument specifies which values are to be changed.
 can generate
 <function>BadMatch</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -2392,7 +2392,7 @@ To obtain the current control values for the keyboard, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGetKeyboardControl</function></funcdef>
+  <funcdef><function>XGetKeyboardControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XKeyboardState<parameter> *values_return</parameter></paramdef>
 </funcprototype>
@@ -2416,7 +2416,7 @@ Specifies the connection to the X server.
     <listitem>
       <para>
 Returns the current keyboard controls in the specified
-<function>XKeyboardState </function>
+<function>XKeyboardState</function>
 structure.
     </para>
   </listitem>
@@ -2476,7 +2476,7 @@ To turn on keyboard auto-repeat, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAutoRepeatOn</function></funcdef>
+  <funcdef><function>XAutoRepeatOn</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2510,7 +2510,7 @@ To turn off keyboard auto-repeat, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAutoRepeatOff</function></funcdef>
+  <funcdef><function>XAutoRepeatOff</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2544,7 +2544,7 @@ To ring the bell, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XBell</function></funcdef>
+  <funcdef><function>XBell</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> percent</parameter></paramdef>
 </funcprototype>
@@ -2616,7 +2616,7 @@ To change the base volume of the bell, use
 <!-- .LP -->
 <function>XBell</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -2628,7 +2628,7 @@ To obtain a bit vector that describes the state of the keyboard, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XQueryKeymap</function></funcdef>
+  <funcdef><function>XQueryKeymap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> keys_return[32]</parameter></paramdef>
 </funcprototype>
@@ -2684,7 +2684,7 @@ To set the mapping of the pointer buttons, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XSetPointerMapping</function></funcdef>
+  <funcdef>int <function>XSetPointerMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedchar<parameter> map[]</parameter></paramdef>
   <paramdef>int<parameter> nmap</parameter></paramdef>
@@ -2760,7 +2760,7 @@ and the mapping is not changed.
 <!-- .LP -->
 <function>XSetPointerMapping</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -2772,7 +2772,7 @@ To get the pointer mapping, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XGetPointerMapping</function></funcdef>
+  <funcdef>int <function>XGetPointerMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>unsignedchar<parameter> map_return[]</parameter></paramdef>
   <paramdef>int<parameter> nmap</parameter></paramdef>
@@ -2835,7 +2835,7 @@ To control the pointer's interactive feel, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangePointerControl</function></funcdef>
+  <funcdef><function>XChangePointerControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Booldo_accel,<parameter> do_threshold</parameter></paramdef>
   <paramdef>intaccel_numerator,<parameter> accel_denominator</parameter></paramdef>
@@ -2924,7 +2924,7 @@ only takes effect if the pointer moves more than threshold pixels at
 once and only applies to the amount beyond the value in the threshold argument.
 Setting a value to -1 restores the default.
 The values of the do_accel and do_threshold arguments must be 
-<function>True </function>
+<function>True</function>
 for the pointer values to be set,
 or the parameters are unchanged.
 Negative values (other than -1) generate a
@@ -2936,7 +2936,7 @@ for the accel_denominator argument.
 <!-- .LP -->
 <function>XChangePointerControl</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -2948,7 +2948,7 @@ To get the current pointer parameters, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XGetPointerControl</function></funcdef>
+  <funcdef><function>XGetPointerControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int*accel_numerator_return,<parameter> *accel_denominator_return</parameter></paramdef>
   <paramdef>int<parameter> *threshold_return</parameter></paramdef>
@@ -3114,9 +3114,9 @@ modifier.  The
 <function>Lock</function>
 modifier is interpreted as ShiftLock when the KeySym named XK_Shift_Lock
 is attached to some KeyCode and that KeyCode is attached to the
-<function>Lock </function>
+<function>Lock</function>
 modifier.  If the
-<function>Lock </function>
+<function>Lock</function>
 modifier could be interpreted as both
 CapsLock and ShiftLock, the CapsLock interpretation is used.
 </para>
@@ -3125,7 +3125,7 @@ CapsLock and ShiftLock, the CapsLock interpretation is used.
 The operation of keypad keys is controlled by the KeySym named XK_Num_Lock,
 by attaching that KeySym to some KeyCode and attaching that KeyCode to any
 one of the modifiers
-<function>Mod1 </function>
+<function>Mod1</function>
 through
 <function>Mod5</function>.
 This modifier is called the
@@ -3146,9 +3146,9 @@ rule that is satisfied from the following list:
     <para>
 The numlock modifier is on and the second KeySym is a keypad KeySym.  In
 this case, if the
-<function>Shift </function>
+<function>Shift</function>
 modifier is on, or if the
-<function>Lock </function>
+<function>Lock</function>
 modifier is on and
 is interpreted as ShiftLock, then the first KeySym is used, otherwise the
 second KeySym is used.
@@ -3157,9 +3157,9 @@ second KeySym is used.
   <listitem>
     <para>
 The
-<function>Shift </function>
+<function>Shift</function>
 and
-<function>Lock </function>
+<function>Lock</function>
 modifiers are both off.  In this case, the first
 KeySym is used.
     </para>
@@ -3167,9 +3167,9 @@ KeySym is used.
   <listitem>
     <para>
 The
-<function>Shift </function>
+<function>Shift</function>
 modifier is off, and the
-<function>Lock </function>
+<function>Lock</function>
 modifier is on and is
 interpreted as CapsLock.  In this case, the first KeySym is used, but if
 that KeySym is lowercase alphabetic, then the corresponding uppercase
@@ -3179,9 +3179,9 @@ KeySym is used instead.
   <listitem>
     <para>
 The
-<function>Shift </function>
+<function>Shift</function>
 modifier is on, and the
-<function>Lock </function>
+<function>Lock</function>
 modifier is on and is interpreted
 as CapsLock.  In this case, the second KeySym is used, but if that KeySym
 is lowercase alphabetic, then the corresponding uppercase KeySym is used
@@ -3191,9 +3191,9 @@ instead.
   <listitem>
     <para>
 The
-<function>Shift </function>
+<function>Shift</function>
 modifier is on, or the
-<function>Lock </function>
+<function>Lock</function>
 modifier is on and is interpreted
 as ShiftLock, or both.  In this case, the second KeySym is used.
     </para>
@@ -3217,7 +3217,7 @@ To obtain the legal KeyCodes for a display, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDisplayKeycodes</function></funcdef>
+  <funcdef><function>XDisplayKeycodes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int*min_keycodes_return,<parameter> *max_keycodes_return</parameter></paramdef>
 </funcprototype>
@@ -3276,7 +3276,7 @@ To obtain the symbols for the specified KeyCodes, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>KeySym<function> *XGetKeyboardMapping</function></funcdef>
+  <funcdef>KeySym *<function>XGetKeyboardMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>KeyCode<parameter> first_keycode</parameter></paramdef>
   <paramdef>int<parameter> keycode_count</parameter></paramdef>
@@ -3339,7 +3339,7 @@ The value specified in first_keycode must be greater than
 or equal to min_keycode as returned by
 <function>XDisplayKeycodes</function>,
 or a
-<function>BadValue </function>
+<function>BadValue</function>
 error results.
 In addition, the following expression must be less than or equal 
 to max_keycode as returned by
@@ -3354,7 +3354,7 @@ first_keycode + keycode_count - 1
 <para>
 <!-- .LP -->
 If this is not the case, a 
-<function>BadValue </function>
+<function>BadValue</function>
 error results. 
 The number of elements in the KeySyms list is:
 </para>
@@ -3377,7 +3377,7 @@ in the list, counting from zero:
 The X server arbitrarily chooses the keysyms_per_keycode_return value 
 to be large enough to report all requested symbols. 
 A special KeySym value of 
-<function>NoSymbol </function>
+<function>NoSymbol</function>
 is used to fill in unused elements for
 individual KeyCodes.
 To free the storage returned by 
@@ -3389,7 +3389,7 @@ use
 <!-- .LP -->
 <function>XGetKeyboardMapping</function>
 can generate a
-<function>BadValue </function>
+<function>BadValue</function>
 error.
 </para>
 <para>
@@ -3401,7 +3401,7 @@ To change the keyboard mapping, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XChangeKeyboardMapping</function></funcdef>
+  <funcdef><function>XChangeKeyboardMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> first_keycode</parameter></paramdef>
   <paramdef>int<parameter> keysyms_per_keycode</parameter></paramdef>
@@ -3486,13 +3486,13 @@ The specified first_keycode must be greater than or equal to min_keycode
 returned by
 <function>XDisplayKeycodes</function>,
 or a 
-<function>BadValue </function>
+<function>BadValue</function>
 error results.
 In addition, the following expression must be less than or equal to 
 max_keycode as returned by
 <function>XDisplayKeycodes</function>,
 or a
-<function>BadValue </function>
+<function>BadValue</function>
 error results:
 </para>
 <para>
@@ -3517,16 +3517,16 @@ in keysyms, counting from zero:
 The specified keysyms_per_keycode can be chosen arbitrarily by the client
 to be large enough to hold all desired symbols. 
 A special KeySym value of 
-<function>NoSymbol </function>
+<function>NoSymbol</function>
 should be used to fill in unused elements 
 for individual KeyCodes.  
 It is legal for 
-<function>NoSymbol </function>
+<function>NoSymbol</function>
 to appear in nontrailing positions
 of the effective list for a KeyCode.
 <function>XChangeKeyboardMapping</function>
 generates a 
-<function>MappingNotify </function>
+<function>MappingNotify</function>
 event.
 </para>
 <para>
@@ -3538,9 +3538,9 @@ It is merely stored for reading and writing by clients.
 <!-- .LP -->
 <function>XChangeKeyboardMapping</function>
 can generate
-<function>BadAlloc </function>
+<function>BadAlloc</function>
 and
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3573,7 +3573,7 @@ structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XModifierKeymap<function> *XNewModifiermap</function></funcdef>
+  <funcdef>XModifierKeymap *<function>XNewModifiermap</function></funcdef>
   <paramdef>int<parameter> max_keys_per_mod</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3612,7 +3612,7 @@ structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XModifierKeymap<function> *XInsertModifiermapEntry</function></funcdef>
+  <funcdef>XModifierKeymap *<function>XInsertModifiermapEntry</function></funcdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
   <paramdef>KeyCode<parameter> keycode_entry</parameter></paramdef>
   <paramdef>int<parameter> modifier</parameter></paramdef>
@@ -3675,7 +3675,7 @@ structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XModifierKeymap<function> *XDeleteModifiermapEntry</function></funcdef>
+  <funcdef>XModifierKeymap *<function>XDeleteModifiermapEntry</function></funcdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
   <paramdef>KeyCode<parameter> keycode_entry</parameter></paramdef>
   <paramdef>int<parameter> modifier</parameter></paramdef>
@@ -3738,7 +3738,7 @@ structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XFreeModifiermap</function></funcdef>
+  <funcdef><function>XFreeModifiermap</function></funcdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3776,7 +3776,7 @@ To set the KeyCodes to be used as modifiers, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XSetModifierMapping</function></funcdef>
+  <funcdef>int <function>XSetModifierMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
 </funcprototype>
@@ -3847,10 +3847,10 @@ Only nonzero KeyCodes have meaning in each set,
 and zero KeyCodes are ignored.
 In addition, all of the nonzero KeyCodes must be in the range specified by 
 min_keycode and max_keycode in the 
-<function>Display </function>
+<function>Display</function>
 structure,
 or a 
-<function>BadValue </function>
+<function>BadValue</function>
 error results.
 </para>
 <para>
@@ -3878,7 +3878,7 @@ and none of the modifiers is changed.
 can generate
 <function>BadAlloc</function>
 and 
-<function>BadValue </function>
+<function>BadValue</function>
 errors.
 </para>
 <para>
@@ -3890,7 +3890,7 @@ To obtain the KeyCodes used as modifiers, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XModifierKeymap<function> *XGetModifierMapping</function></funcdef>
+  <funcdef>XModifierKeymap *<function>XGetModifierMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
diff --git a/specs/libX11/CH13.xml b/specs/libX11/CH13.xml
index b1f5195e..cd75496e 100644
--- a/specs/libX11/CH13.xml
+++ b/specs/libX11/CH13.xml
@@ -110,7 +110,7 @@ if Xlib functions are capable of operating under the current locale.
 If it returns 
 <function>False</function>,
 Xlib locale-dependent functions for which the 
-<function>XLocaleNotSupported </function>
+<function>XLocaleNotSupported</function>
 return status is defined will return 
 <function>XLocaleNotSupported</function>.
 Other Xlib locale-dependent routines will operate in the ``C'' locale.
@@ -145,7 +145,7 @@ To configure Xlib locale modifiers for the current locale, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XSetLocaleModifiers</function></funcdef>
+  <funcdef>char *<function>XSetLocaleModifiers</function></funcdef>
   <paramdef>char<parameter> *modifier_list</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -544,7 +544,7 @@ To allocate a nested variable argument list dynamically, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XVaNestedList<function> XVaCreateNestedList</function></funcdef>
+  <funcdef>XVaNestedList <function>XVaCreateNestedList</function></funcdef>
   <paramdef>int<parameter> dummy</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -731,7 +731,7 @@ To open an output method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XOM<function> XOpenOM</function></funcdef>
+  <funcdef>XOM <function>XOpenOM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XrmDatabase<parameter> db</parameter></paramdef>
   <paramdef>char<parameter> *res_name</parameter></paramdef>
@@ -849,7 +849,7 @@ To close an output method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XCloseOM</function></funcdef>
+  <funcdef>Status <function>XCloseOM</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -883,7 +883,7 @@ To set output method attributes, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XSetOMValues</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -936,7 +936,7 @@ To query an output method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XGetOMValues</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -984,7 +984,7 @@ To obtain the display associated with an output method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Display<function> *</function></funcdef>
+  <funcdef>Display *<function>XDisplayOfOM</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1018,7 +1018,7 @@ To get the locale associated with an output method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XLocaleOfOM</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1219,31 +1219,31 @@ The possible value for XOrientation may be:
 <itemizedlist>
   <listitem>
     <para>
-<function>XOMOrientation_LTR_TTB  </function>
+<function>XOMOrientation_LTR_TTB</function>
 left-to-right, top-to-bottom global orientation
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XOMOrientation_RTL_TTB  </function>
+<function>XOMOrientation_RTL_TTB</function>
 right-to-left, top-to-bottom global orientation
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XOMOrientation_TTB_LTR  </function>
+<function>XOMOrientation_TTB_LTR</function>
 top-to-bottom, left-to-right global orientation
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XOMOrientation_TTB_RTL  </function>
+<function>XOMOrientation_TTB_RTL</function>
 top-to-bottom, right-to-left global orientation
     </para>
   </listitem>
   <listitem>
     <para>
-<function>XOMOrientation_Context  </function>
+<function>XOMOrientation_Context</function>
 contextual global orientation
     </para>
   </listitem>
@@ -1354,7 +1354,7 @@ To create an output context, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XOC<function> XCreateOC</function></funcdef>
+  <funcdef>XOC <function>XCreateOC</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1387,7 +1387,7 @@ Specifies the variable-length argument list(Al.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XCreateOC </function>
+<function>XCreateOC</function>
 function creates an output context within the specified output method.
 </para>
 <para>
@@ -1440,7 +1440,7 @@ To destroy an output context, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XDestroyOC</function></funcdef>
+  <funcdef>void <function>XDestroyOC</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1474,7 +1474,7 @@ To get the output method associated with an output context, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XOM<function> XOMOfOC</function></funcdef>
+  <funcdef>XOM <function>XOMOfOC</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1521,7 +1521,7 @@ To set <acronym>XOC</acronym> values, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XSetOCValues</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1586,7 +1586,7 @@ matching the data type imposed by the semantics of the argument.
 <!-- .LP -->
 <function>XSetOCValues</function>
 can generate a
-<function>BadAtom </function>
+<function>BadAtom</function>
 error.
 </para>
 <para>
@@ -1598,7 +1598,7 @@ To obtain <acronym>XOC</acronym> values, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XGetOCValues</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2098,7 +2098,7 @@ Before a client destroys the output context,
 it can query whether
 <function>XNOMAutomatic</function>
 is set to determine whether 
-<function>XFreeFontSet </function>
+<function>XFreeFontSet</function>
 or 
 <function>XDestroyOC</function>
 should be used to destroy the output context.
@@ -2146,7 +2146,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XFontSet<function> XCreateFontSet</function></funcdef>
+  <funcdef>XFontSet <function>XCreateFontSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *base_font_name_list</parameter></paramdef>
   <paramdef>char<parameter> ***missing_charset_list_return</parameter></paramdef>
@@ -2476,7 +2476,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XFontsOfFontSet</function></funcdef>
+  <funcdef>int <function>XFontsOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>XFontStruct<parameter> ***font_struct_list_return</parameter></paramdef>
   <paramdef>char<parameter> ***font_name_list_return</parameter></paramdef>
@@ -2585,7 +2585,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XBaseFontNameListOfFontSet</function></funcdef>
+  <funcdef>char *<function>XBaseFontNameListOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2647,7 +2647,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *XLocaleOfFontSet</function></funcdef>
+  <funcdef>char *<function>XLocaleOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2691,7 +2691,7 @@ Until freed, it will not be modified by Xlib.
 The 
 <function>XFreeFontSet</function>
 function is a convenience function for freeing an output context.
-<function>XFreeFontSet </function>
+<function>XFreeFontSet</function>
 also frees its associated 
 <function>XOM</function>
 if the output context was created by
@@ -2700,7 +2700,7 @@ if the output context was created by
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XFreeFontSet</function></funcdef>
+  <funcdef>void <function>XFreeFontSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
@@ -2804,7 +2804,7 @@ To find out about direction-dependent rendering, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XDirectionalDependentDrawing</function></funcdef>
+  <funcdef>Bool <function>XDirectionalDependentDrawing</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2842,7 +2842,7 @@ To find out about context-dependent rendering, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XContextualDrawing</function></funcdef>
+  <funcdef>Bool <function>XContextualDrawing</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2880,7 +2880,7 @@ To find out about context-dependent or direction-dependent rendering, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XContextDependentDrawing</function></funcdef>
+  <funcdef>Bool <function>XContextDependentDrawing</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -2994,7 +2994,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XFontSetExtents<function> *XExtentsOfFontSet</function></funcdef>
+  <funcdef>XFontSetExtents *<function>XExtentsOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3047,7 +3047,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XmbTextEscapement</function></funcdef>
+  <funcdef>int <function>XmbTextEscapement</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_bytes</parameter></paramdef>
@@ -3056,7 +3056,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XwcTextEscapement</function></funcdef>
+  <funcdef>int <function>XwcTextEscapement</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>wchar_t<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_wchars</parameter></paramdef>
@@ -3139,7 +3139,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XmbTextExtents</function></funcdef>
+  <funcdef>int <function>XmbTextExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_bytes</parameter></paramdef>
@@ -3150,7 +3150,7 @@ use
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XwcTextExtents</function></funcdef>
+  <funcdef>int <function>XwcTextExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>wchar_t<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_wchars</parameter></paramdef>
@@ -3269,7 +3269,7 @@ When the
 has missing charsets,
 metrics for each unavailable character are taken 
 from the default string returned by 
-<function>XCreateFontSet </function>
+<function>XCreateFontSet</function>
 so that the metrics represent the text as it will actually be drawn.
 The behavior for an invalid codepoint is undefined.
 </para>
@@ -3299,7 +3299,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XmbTextPerCharExtents</function></funcdef>
+  <funcdef>Status <function>XmbTextPerCharExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_bytes</parameter></paramdef>
@@ -3314,7 +3314,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XwcTextPerCharExtents</function></funcdef>
+  <funcdef>Status <function>XwcTextPerCharExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
   <paramdef>wchar_t<parameter> *string</parameter></paramdef>
   <paramdef>int<parameter> num_wchars</parameter></paramdef>
@@ -3581,7 +3581,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XmbDrawText</function></funcdef>
+  <funcdef>void <function>XmbDrawText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -3593,7 +3593,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XwcDrawText</function></funcdef>
+  <funcdef>void <function>XwcDrawText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -3684,7 +3684,7 @@ Specifies the number of text items in the array.
 The
 <function>XmbDrawText</function>
 and 
-<function>XwcDrawText </function>
+<function>XwcDrawText</function>
 functions allow complex spacing and font set shifts between text strings.
 Each text item is processed in turn, with the origin of a text
 element advanced in the primary draw direction by the escapement of the
@@ -3732,7 +3732,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XmbDrawString</function></funcdef>
+  <funcdef>void <function>XmbDrawString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3745,7 +3745,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XwcDrawString</function></funcdef>
+  <funcdef>void <function>XwcDrawString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3878,7 +3878,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XmbDrawImageString</function></funcdef>
+  <funcdef>void <function>XmbDrawImageString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3891,7 +3891,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XwcDrawImageString</function></funcdef>
+  <funcdef>void <function>XwcDrawImageString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -4694,7 +4694,7 @@ to capture X events transparently to clients.
 It is expected that toolkits (or clients) using
 <function>XmbLookupString</function>
 or
-<function>XwcLookupString </function>
+<function>XwcLookupString</function>
 will call this filter at some point in the event processing mechanism
 to make sure that events needed by an input method can be filtered
 by that input method.
@@ -4921,7 +4921,7 @@ functions.
 String conversion support is dependent on the availability of the 
 <function>XNStringConversion</function>
 or 
-<function>XNStringConversionCallback </function>
+<function>XNStringConversionCallback</function>
 <acronym>XIC</acronym> values.
 Because the input method may not support string conversions,
 clients have to query the availability of string conversion
@@ -5184,7 +5184,7 @@ To open a connection, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XIM<function> XOpenIM</function></funcdef>
+  <funcdef>XIM <function>XOpenIM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XrmDatabase<parameter> db</parameter></paramdef>
   <paramdef>char<parameter> *res_name</parameter></paramdef>
@@ -5305,7 +5305,7 @@ To close a connection, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XCloseIM</function></funcdef>
+  <funcdef>Status <function>XCloseIM</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5339,7 +5339,7 @@ To set input method attributes, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XSetIMValues</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5392,7 +5392,7 @@ To query an input method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XGetIMValues</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5455,7 +5455,7 @@ To obtain the display associated with an input method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Display<function> *</function></funcdef>
+  <funcdef>Display *<function>XDisplayOfIM</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5489,7 +5489,7 @@ To get the locale associated with an input method, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XLocaleOfIM</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -5523,7 +5523,7 @@ To register an input method instantiate callback, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XRegisterIMInstantiateCallback</function></funcdef>
+  <funcdef>Bool <function>XRegisterIMInstantiateCallback</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XrmDatabase<parameter> db</parameter></paramdef>
   <paramdef>char<parameter> *res_name</parameter></paramdef>
@@ -5619,7 +5619,7 @@ The generic prototype is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> IMInstantiateCallback</function></funcdef>
+  <funcdef>void <function>IMInstantiateCallback</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -5668,7 +5668,7 @@ To unregister an input method instantiation callback, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XUnregisterIMInstantiateCallback</function></funcdef>
+  <funcdef>Bool <function>XUnregisterIMInstantiateCallback</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XrmDatabase<parameter> db</parameter></paramdef>
   <paramdef>char<parameter> *res_name</parameter></paramdef>
@@ -5965,7 +5965,7 @@ by the input method for preedit information.
   <colspec colname='c2'/>
   <tbody>
     <row>
-      <entry><function>XIMPreeditArea </function></entry>
+      <entry><function>XIMPreeditArea</function></entry>
       <entry>If chosen,
       the input method would require the client to provide some area values
       for it to do its preediting.
@@ -6089,7 +6089,7 @@ set as resources.
 <para>
 <!-- .LP -->
 The 
-<function>XNDestroyCallback </function>
+<function>XNDestroyCallback</function>
 argument is a pointer to a structure of type
 <function>XIMCallback</function>.
 <function>XNDestroyCallback</function>
@@ -6108,7 +6108,7 @@ The generic prototype of this callback function is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> DestroyCallback</function></funcdef>
+  <funcdef>void <function>DestroyCallback</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -6344,7 +6344,7 @@ To create an input context, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XIC<function> XCreateIC</function></funcdef>
+  <funcdef>XIC <function>XCreateIC</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6377,7 +6377,7 @@ Specifies the variable length argument list(Al.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XCreateIC </function>
+<function>XCreateIC</function>
 function creates a context within the specified input method.
 </para>
 <para>
@@ -6437,7 +6437,7 @@ To destroy an input context, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XDestroyIC</function></funcdef>
+  <funcdef>void <function>XDestroyIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6474,7 +6474,7 @@ and
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetICFocus</function></funcdef>
+  <funcdef>void <function>XSetICFocus</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6515,7 +6515,7 @@ does not affect the focus window value.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XUnsetICFocus</function></funcdef>
+  <funcdef>void <function>XUnsetICFocus</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6564,14 +6564,14 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XmbResetIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>wchar_t<function> *</function></funcdef>
+  <funcdef>wchar_t *<function>XwcResetIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6639,7 +6639,7 @@ To get the input method associated with an input context, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XIM<function> XIMOfIC</function></funcdef>
+  <funcdef>XIM <function>XIMOfIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6684,7 +6684,7 @@ To set <acronym>XIC</acronym> values, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XSetICValues</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -6755,7 +6755,7 @@ can generate
 <function>BadCursor</function>,
 <function>BadPixmap</function>,
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -6767,7 +6767,7 @@ To obtain <acronym>XIC</acronym> values, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char<function> *</function></funcdef>
+  <funcdef>char *<function>XGetICValues</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -7406,7 +7406,7 @@ and the client window will not be changed.
 If the client window is not a valid window ID on the display
 attached to the input method,
 a 
-<function>BadWindow </function>
+<function>BadWindow</function>
 error can be generated when this value is used by the input method.
 </para>
 </sect3>
@@ -7503,7 +7503,7 @@ set as resources.
 The 
 <function>XNGeometryCallback</function>
 argument is a structure of type 
-<function>XIMCallback </function>
+<function>XIMCallback</function>
 (see section 13.5.6.13.12).
 </para>
 <para>
@@ -7556,9 +7556,9 @@ Setting this value will cause an error.
 <para>
 <!-- .LP -->
 The 
-<function>XNDestroyCallback </function>
+<function>XNDestroyCallback</function>
 argument is a pointer to a structure of type
-<function>XIMCallback </function>
+<function>XIMCallback</function>
 (see section 13.5.6.13.12).  This callback is triggered when the input method 
 stops its service for any reason; for example, when a connection to an IM
 server is broken.  After the destroy callback is called, 
@@ -7582,7 +7582,7 @@ and
 The
 <function>XNStringConversionCallback</function>
 argument is a structure of type
-<function>XIMCallback </function>
+<function>XIMCallback</function>
 (see section 13.5.6.13.12).
 </para>
 <para>
@@ -8047,7 +8047,7 @@ The
 <function>XNSpotLocation</function>
 argument specifies to the input method the coordinates of the spot
 to be used by an input method executing with 
-<function>XNInputStyle </function>
+<function>XNInputStyle</function>
 set to 
 <function>XIMPreeditPosition</function>.
 When specified to any input method other than 
@@ -8320,7 +8320,7 @@ The generic prototype is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> PreeditStateNotifyCallback</function></funcdef>
+  <funcdef>void <function>PreeditStateNotifyCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XIMPreeditStateNotifyCallbackStruct<parameter> *call_data</parameter></paramdef>
@@ -8538,7 +8538,7 @@ All callback procedures follow the generic prototype:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> CallbackPrototype</function></funcdef>
+  <funcdef>void <function>CallbackPrototype</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>SomeType<parameter> call_data</parameter></paramdef>
@@ -8610,7 +8610,7 @@ The generic prototype is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> GeometryCallback</function></funcdef>
+  <funcdef>void <function>GeometryCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -8671,7 +8671,7 @@ The generic prototype is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> DestroyCallback</function></funcdef>
+  <funcdef>void <function>DestroyCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -8733,7 +8733,7 @@ The callback prototype is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> StringConversionCallback</function></funcdef>
+  <funcdef>void <function>StringConversionCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XIMStringConversionCallbackStruct<parameter> *call_data</parameter></paramdef>
@@ -8842,9 +8842,9 @@ the direction and factor members.  Specifically, it is the character position
 relative to the starting point as defined by the
 <function>XIMCaretDirection</function>.
 The factor member of 
-<function>XIMStringConversionCallbackStruct </function>
+<function>XIMStringConversionCallbackStruct</function>
 specifies the number of
-<function>XIMCaretDirection </function>
+<function>XIMCaretDirection</function>
 positions to be applied.  For example, if the direction specifies
 <function>XIMLineEnd</function>
 and factor is 1, then all characters from the starting position to 
@@ -8894,7 +8894,7 @@ or the cleanup for the preedit region.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> PreeditStartCallback</function></funcdef>
+  <funcdef>int <function>PreeditStartCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -8948,7 +8948,7 @@ and a value of -1 indicates there is no limit.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> PreeditDoneCallback</function></funcdef>
+  <funcdef>void <function>PreeditDoneCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -9029,7 +9029,7 @@ is as follows:
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> PreeditDrawCallback</function></funcdef>
+  <funcdef>void <function>PreeditDrawCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XIMPreeditDrawCallbackStruct<parameter> *call_data</parameter></paramdef>
@@ -9415,7 +9415,7 @@ It then calls the PreeditCaretCallback.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> PreeditCaretCallback</function></funcdef>
+  <funcdef>void <function>PreeditCaretCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XIMPreeditCaretCallbackStruct<parameter> *call_data</parameter></paramdef>
@@ -9631,7 +9631,7 @@ the input method calls the StatusStartCallback callback.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> StatusStartCallback</function></funcdef>
+  <funcdef>void <function>StatusStartCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -9688,7 +9688,7 @@ is destroyed or when it loses focus, the input method calls StatusDoneCallback.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> StatusDoneCallback</function></funcdef>
+  <funcdef>void <function>StatusDoneCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XPointer<parameter> call_data</parameter></paramdef>
@@ -9743,7 +9743,7 @@ StatusDrawCallback.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> StatusDrawCallback</function></funcdef>
+  <funcdef>void <function>StatusDrawCallback</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XPointer<parameter> client_data</parameter></paramdef>
   <paramdef>XIMStatusDrawCallbackStruct<parameter> *call_data</parameter></paramdef>
@@ -9881,7 +9881,7 @@ To filter an event, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool<function> XFilterEvent</function></funcdef>
+  <funcdef>Bool <function>XFilterEvent</function></funcdef>
   <paramdef>XEvent<parameter> *event</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -9917,7 +9917,7 @@ Specifies the window (Wi.
 <!-- .eM -->
 If the window argument is
 <function>None</function>,
-<function>XFilterEvent </function>
+<function>XFilterEvent</function>
 applies the filter to the window specified in the
 <function>XEvent</function>
 structure.
@@ -9965,7 +9965,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XmbLookupString</function></funcdef>
+  <funcdef>int <function>XmbLookupString</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XKeyPressedEvent<parameter> *event</parameter></paramdef>
   <paramdef>char<parameter> *buffer_return</parameter></paramdef>
@@ -9977,7 +9977,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XwcLookupString</function></funcdef>
+  <funcdef>int <function>XwcLookupString</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
   <paramdef>XKeyPressedEvent<parameter> *event</parameter></paramdef>
   <paramdef>wchar_t<parameter> *buffer_return</parameter></paramdef>
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index 5b25ca43..d2c5f9c8 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -258,7 +258,7 @@ To request that a top-level window be iconified, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XIconifyWindow</function></funcdef>
+  <funcdef>Status <function>XIconifyWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
@@ -302,11 +302,11 @@ Specifies the appropriate screen number on the host server.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XIconifyWindow </function>
+<function>XIconifyWindow</function>
 function sends a WM_CHANGE_STATE 
-<function>ClientMessage </function>
+<function>ClientMessage</function>
 event with a format of 32 and a first data element of 
-<function>IconicState </function>
+<function>IconicState</function>
 (as described in section 4.1.4 of the 
 <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>)
 and a window of w
@@ -332,7 +332,7 @@ To request that a top-level window be withdrawn, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XWithdrawWindow</function></funcdef>
+  <funcdef>Status <function>XWithdrawWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
@@ -376,17 +376,17 @@ Specifies the appropriate screen number on the host server.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XWithdrawWindow </function>
+<function>XWithdrawWindow</function>
 function unmaps the specified window 
 and sends a synthetic 
-<function>UnmapNotify </function>
+<function>UnmapNotify</function>
 event to the root window of the specified screen.
 Window managers may elect to receive this message 
 and may treat it as a request to change the window's state to withdrawn.
 When a window is in the withdrawn state, 
 neither its normal nor its iconic representations is visible.
 It returns a nonzero status if the 
-<function>UnmapNotify </function>
+<function>UnmapNotify</function>
 event is successfully sent; 
 otherwise, it returns a zero status.
 </para>
@@ -406,7 +406,7 @@ To request that a top-level window be reconfigured, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XReconfigureWMWindow</function></funcdef>
+  <funcdef>Status <function>XReconfigureWMWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>int<parameter> screen_number</parameter></paramdef>
@@ -465,7 +465,7 @@ This mask is the bitwise inclusive OR of the valid configure window values bits.
     <listitem>
       <para>
 Specifies the 
-<function>XWindowChanges </function>
+<function>XWindowChanges</function>
 structure.
     </para>
   </listitem>
@@ -476,15 +476,15 @@ structure.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XReconfigureWMWindow </function>
+<function>XReconfigureWMWindow</function>
 function issues a 
-<function>ConfigureWindow </function>
+<function>ConfigureWindow</function>
 request on the specified top-level window.
 If the stacking mode is changed and the request fails with a 
-<function>BadMatch </function>
+<function>BadMatch</function>
 error, 
 the error is trapped by Xlib and a synthetic 
-<function>ConfigureRequestEvent </function>
+<function>ConfigureRequestEvent</function>
 containing the same configuration parameters is sent to the root 
 of the specified window.
 Window managers may elect to receive this event 
@@ -494,11 +494,11 @@ otherwise, it returns a zero status.
 </para>
 <para>
 <!-- .LP -->
-<function>XReconfigureWMWindow </function>
+<function>XReconfigureWMWindow</function>
 can generate
-<function>BadValue </function>
+<function>BadValue</function>
 and 
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect2>
@@ -580,7 +580,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XmbTextListToTextProperty</function></funcdef>
+  <funcdef>int <function>XmbTextListToTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -591,7 +591,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XwcTextListToTextProperty</function></funcdef>
+  <funcdef>int <function>XwcTextListToTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>wchar_t<parameter> **list</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
@@ -672,7 +672,7 @@ of text_prop_return but is not included in the nitems member.
 <para>
 <!-- .LP -->
 The functions set the encoding field of text_prop_return to an
-<function>Atom </function>
+<function>Atom</function>
 for the specified display 
 naming the encoding determined by the specified style
 and convert the specified text list to this encoding for storage in
@@ -732,7 +732,7 @@ To free the storage for the value field, use
 <para>
 <!-- .LP -->
 To obtain a list of text strings from an 
-<function>XTextProperty </function>
+<function>XTextProperty</function>
 structure, use
 <function>XmbTextPropertyToTextList</function>
 or
@@ -742,7 +742,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XmbTextPropertyToTextList</function></funcdef>
+  <funcdef>int <function>XmbTextPropertyToTextList</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
   <paramdef>char<parameter> ***list_return</parameter></paramdef>
@@ -752,7 +752,7 @@ or
 <!-- .FN -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int<function> XwcTextPropertyToTextList</function></funcdef>
+  <funcdef>int <function>XwcTextPropertyToTextList</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
   <paramdef>wchar_t<parameter> ***list_return</parameter></paramdef>
@@ -844,7 +844,7 @@ the functions return
 For supported locales,
 existence of a converter from COMPOUND_TEXT, STRING
 or the encoding of the current locale is guaranteed if
-<function>XSupportsLocale </function>
+<function>XSupportsLocale</function>
 returns 
 <function>True</function>
 for the current locale (but the actual text
@@ -900,7 +900,7 @@ wide character string list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XwcFreeStringList</function></funcdef>
+  <funcdef>void <function>XwcFreeStringList</function></funcdef>
   <paramdef>wchar_t<parameter> **list</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -984,7 +984,7 @@ structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XStringListToTextProperty</function></funcdef>
+  <funcdef>Status <function>XStringListToTextProperty</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
   <paramdef>int<parameter> count</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop_return</parameter></paramdef>
@@ -1031,7 +1031,7 @@ structure.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XStringListToTextProperty </function>
+<function>XStringListToTextProperty</function>
 function sets the specified 
 <function>XTextProperty</function>
 to be of type STRING (format 8) with a value representing the
@@ -1059,7 +1059,7 @@ structure in the STRING encoding, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XTextPropertyToStringList</function></funcdef>
+  <funcdef>Status <function>XTextPropertyToStringList</function></funcdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
   <paramdef>char<parameter> ***list_return</parameter></paramdef>
   <paramdef>int<parameter> *count_return</parameter></paramdef>
@@ -1106,7 +1106,7 @@ Returns the number of (Cn.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XTextPropertyToStringList </function>
+<function>XTextPropertyToStringList</function>
 function returns a list of strings representing the null-separated elements 
 of the specified
 <function>XTextProperty</function>
@@ -1132,7 +1132,7 @@ To free the in-memory data associated with the specified string list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XFreeStringList</function></funcdef>
+  <funcdef>void <function>XFreeStringList</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1154,7 +1154,7 @@ Specifies the list of strings to be freed.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XFreeStringList </function>
+<function>XFreeStringList</function>
 function releases memory allocated by 
 <function>XmbTextPropertyToTextList</function>
 and
@@ -1189,7 +1189,7 @@ To set one of a window's text properties, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetTextProperty</function></funcdef>
+  <funcdef>void <function>XSetTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
@@ -1265,7 +1265,7 @@ can generate
 <function>BadAtom</function>,
 <function>BadValue</function>,
 and 
-<function>BadWindow  </function>
+<function>BadWindow</function>
 errors.
 <!-- .sp -->
 </para>
@@ -1277,7 +1277,7 @@ To read one of a window's text properties, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetTextProperty</function></funcdef>
+  <funcdef>Status <function>XGetTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop_return</parameter></paramdef>
@@ -1334,7 +1334,7 @@ Specifies the property name.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XGetTextProperty </function>
+<function>XGetTextProperty</function>
 function reads the specified property from the window
 and stores the data in the returned
 <function>XTextProperty</function>
@@ -1368,9 +1368,9 @@ otherwise, it returns a zero status.
 <!-- .LP -->
 <function>XGetTextProperty</function>
 can generate
-<function>BadAtom </function>
+<function>BadAtom</function>
 and 
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 </sect2>
@@ -1393,7 +1393,7 @@ To set a window's WM_NAME property with the supplied convenience function, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetWMName</function></funcdef>
+  <funcdef>void <function>XSetWMName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
@@ -1441,7 +1441,7 @@ structure to be used.
 The
 <function>XSetWMName</function>
 convenience function calls
-<function>XSetTextProperty </function>
+<function>XSetTextProperty</function>
 to set the WM_NAME property.
 <!-- .sp -->
 </para>
@@ -1453,7 +1453,7 @@ To read a window's WM_NAME property with the supplied convenience function, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMName</function></funcdef>
+  <funcdef>Status <function>XGetWMName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop_return</parameter></paramdef>
@@ -1499,9 +1499,9 @@ structure.
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XGetWMName </function>
+<function>XGetWMName</function>
 convenience function calls
-<function>XGetTextProperty </function>
+<function>XGetTextProperty</function>
 to obtain the WM_NAME property.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
@@ -1526,7 +1526,7 @@ To assign a name to a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XStoreName</function></funcdef>
+  <funcdef><function>XStoreName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> *window_name</parameter></paramdef>
@@ -1599,7 +1599,7 @@ To get the name of a window, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XFetchName</function></funcdef>
+  <funcdef>Status <function>XFetchName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> **window_name_return</parameter></paramdef>
@@ -1687,7 +1687,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetWMIconName</function></funcdef>
+  <funcdef>void <function>XSetWMIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
@@ -1748,7 +1748,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMIconName</function></funcdef>
+  <funcdef>Status <function>XGetWMIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop_return</parameter></paramdef>
@@ -1794,9 +1794,9 @@ structure.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetWMIconName </function>
+<function>XGetWMIconName</function>
 convenience function calls
-<function>XGetTextProperty </function>
+<function>XGetTextProperty</function>
 to obtain the WM_ICON_NAME property.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
@@ -1822,7 +1822,7 @@ To set the name to be displayed in a window's icon, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetIconName</function></funcdef>
+  <funcdef><function>XSetIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> *icon_name</parameter></paramdef>
@@ -1884,7 +1884,7 @@ To get the name a window wants displayed in its icon, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetIconName</function></funcdef>
+  <funcdef>Status <function>XGetIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> **icon_name_return</parameter></paramdef>
@@ -1962,7 +1962,7 @@ error.
 Xlib provides functions that you can use to set and read 
 the WM_HINTS property for a given window.
 These functions use the flags and the
-<function>XWMHints </function>
+<function>XWMHints</function>
 structure, as defined in the
 <!-- .hN X11/Xutil.h -->
 header file.
@@ -2067,10 +2067,10 @@ applications whose input member is
 Push model window managers should
 make sure that pull model applications do not break them 
 by resetting input focus to 
-<function>PointerRoot </function>
+<function>PointerRoot</function>
 when it is appropriate (for example, whenever an application whose
 input member is 
-<function>False </function>
+<function>False</function>
 sets input focus to one of its subwindows).
 </para>
 <para>
@@ -2119,7 +2119,7 @@ To set a window's WM_HINTS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetWMHints</function></funcdef>
+  <funcdef><function>XSetWMHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XWMHints<parameter> *wmhints</parameter></paramdef>
@@ -2176,7 +2176,7 @@ window manager to get keyboard input.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -2188,7 +2188,7 @@ To read a window's WM_HINTS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XWMHints<function> *XGetWMHints</function></funcdef>
+  <funcdef>XWMHints *<function>XGetWMHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
 </funcprototype>
@@ -2225,7 +2225,7 @@ The
 function reads the window manager hints and 
 returns NULL if no WM_HINTS property was set on the window 
 or returns a pointer to an 
-<function>XWMHints </function>
+<function>XWMHints</function>
 structure if it succeeds.
 When finished with the data,
 free the space used for it by calling
@@ -2235,7 +2235,7 @@ free the space used for it by calling
 <!-- .LP -->
 <function>XGetWMHints</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect2>
@@ -2249,7 +2249,7 @@ error.
 Xlib provides functions that you can use to set or read 
 the WM_NORMAL_HINTS property for a given window.
 The functions use the flags and the
-<function>XSizeHints </function>
+<function>XSizeHints</function>
 structure, as defined in the
 <!-- .hN X11/Xutil.h -->
 header file.
@@ -2382,7 +2382,7 @@ To set a window's WM_NORMAL_HINTS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetWMNormalHints</function></funcdef>
+  <funcdef>void <function>XSetWMNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints</parameter></paramdef>
@@ -2426,7 +2426,7 @@ Specifies the size hints for the window in its normal state.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XSetWMNormalHints </function>
+<function>XSetWMNormalHints</function>
 function replaces the size hints for the WM_NORMAL_HINTS property 
 on the specified window.
 If the property does not already exist,
@@ -2452,7 +2452,7 @@ To read a window's WM_NORMAL_HINTS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMNormalHints</function></funcdef>
+  <funcdef>Status <function>XGetWMNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints_return</parameter></paramdef>
@@ -2507,7 +2507,7 @@ Returns the hints that were supplied by the user.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetWMNormalHints </function>
+<function>XGetWMNormalHints</function>
 function returns the size hints stored in the WM_NORMAL_HINTS property 
 on the specified window.
 If the property is of type WM_SIZE_HINTS, is of format 32,
@@ -2563,7 +2563,7 @@ To set a window's WM_SIZE_HINTS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetWMSizeHints</function></funcdef>
+  <funcdef>void <function>XSetWMSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints</parameter></paramdef>
@@ -2620,7 +2620,7 @@ Specifies the property name.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XSetWMSizeHints </function>
+<function>XSetWMSizeHints</function>
 function replaces the size hints for the specified property 
 on the named window.
 If the specified property does not already exist,
@@ -2652,7 +2652,7 @@ To read a window's WM_SIZE_HINTS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMSizeHints</function></funcdef>
+  <funcdef>Status <function>XGetWMSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XSizeHints<parameter> *hints_return</parameter></paramdef>
@@ -2736,7 +2736,7 @@ and returns a nonzero status.
 Otherwise, it returns a zero status.
 To get a window's normal size hints, 
 you can use the 
-<function>XGetWMNormalHints </function>
+<function>XGetWMNormalHints</function>
 function.
 </para>
 <para>
@@ -2769,7 +2769,7 @@ PBaseSize|PWinGravity
 <!-- .LP -->
 <function>XGetWMSizeHints</function>
 can generate
-<function>BadAtom </function>
+<function>BadAtom</function>
 and 
 <function>BadWindow</function>
 errors.
@@ -2785,7 +2785,7 @@ errors.
 Xlib provides functions that you can use to set and get 
 the WM_CLASS property for a given window.
 These functions use the
-<function>XClassHint </function>
+<function>XClassHint</function>
 structure, which is defined in the
 <!-- .hN X11/Xutil.h -->
 header file.
@@ -2865,7 +2865,7 @@ To set a window's WM_CLASS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetClassHint</function></funcdef>
+  <funcdef><function>XSetClassHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XClassHint<parameter> *class_hints</parameter></paramdef>
@@ -2934,7 +2934,7 @@ To read a window's WM_CLASS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetClassHint</function></funcdef>
+  <funcdef>Status <function>XGetClassHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XClassHint<parameter> *class_hints_return</parameter></paramdef>
@@ -2997,7 +2997,7 @@ on each individually.
 <!-- .LP -->
 <function>XGetClassHint</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect2>
@@ -3020,7 +3020,7 @@ To set a window's WM_TRANSIENT_FOR property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetTransientForHint</function></funcdef>
+  <funcdef><function>XSetTransientForHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window<parameter> prop_window</parameter></paramdef>
@@ -3086,7 +3086,7 @@ To read a window's WM_TRANSIENT_FOR property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetTransientForHint</function></funcdef>
+  <funcdef>Status <function>XGetTransientForHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window<parameter> *prop_window_return</parameter></paramdef>
@@ -3139,7 +3139,7 @@ otherwise, it returns a zero status.
 <!-- .LP -->
 <function>XGetTransientForHint</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect2>
@@ -3162,7 +3162,7 @@ To set a window's WM_PROTOCOLS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XSetWMProtocols</function></funcdef>
+  <funcdef>Status <function>XSetWMProtocols</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Atom<parameter> *protocols</parameter></paramdef>
@@ -3218,7 +3218,7 @@ Specifies the number of (Cn.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XSetWMProtocols </function>
+<function>XSetWMProtocols</function>
 function replaces the WM_PROTOCOLS property on the specified window 
 with the list of atoms specified by the protocols argument.
 If the property does not already exist,
@@ -3249,7 +3249,7 @@ To read a window's WM_PROTOCOLS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMProtocols</function></funcdef>
+  <funcdef>Status <function>XGetWMProtocols</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Atom<parameter> **protocols_return</parameter></paramdef>
@@ -3305,7 +3305,7 @@ Returns the number of (Cn.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetWMProtocols </function>
+<function>XGetWMProtocols</function>
 function returns the list of atoms stored in the WM_PROTOCOLS property 
 on the specified window.
 These atoms describe window manager protocols in which the owner 
@@ -3348,7 +3348,7 @@ To set a window's WM_COLORMAP_WINDOWS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XSetWMColormapWindows</function></funcdef>
+  <funcdef>Status <function>XSetWMColormapWindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window<parameter> *colormap_windows</parameter></paramdef>
@@ -3404,7 +3404,7 @@ Specifies the number of (Cn.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XSetWMColormapWindows </function>
+<function>XSetWMColormapWindows</function>
 function replaces the WM_COLORMAP_WINDOWS property on the specified
 window with the list of windows specified by the colormap_windows argument.
 If the property does not already exist,
@@ -3435,7 +3435,7 @@ To read a window's WM_COLORMAP_WINDOWS property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMColormapWindows</function></funcdef>
+  <funcdef>Status <function>XGetWMColormapWindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>Window<parameter> **colormap_windows_return</parameter></paramdef>
@@ -3491,7 +3491,7 @@ Returns the number of (Cn.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetWMColormapWindows </function>
+<function>XGetWMColormapWindows</function>
 function returns the list of window identifiers stored 
 in the WM_COLORMAP_WINDOWS property on the specified window.
 These identifiers indicate the colormaps that the window manager
@@ -3525,7 +3525,7 @@ error.
 Xlib provides functions that you can use to set and read 
 the WM_ICON_SIZE property for a given window.
 These functions use the 
-<function>XIconSize </function>
+<function>XIconSize</function>
 <indexterm><primary>XIconSize</primary></indexterm>
 structure, which is defined in the
 <!-- .hN X11/Xutil.h -->
@@ -3548,9 +3548,9 @@ structure, use
 <!-- .LP -->
 <!-- .eM -->
 The
-<function>XAllocIconSize </function>
+<function>XAllocIconSize</function>
 function allocates and returns a pointer to an
-<function>XIconSize </function>
+<function>XIconSize</function>
 structure.
 Note that all fields in the
 <function>XIconSize</function>
@@ -3597,7 +3597,7 @@ To set a window's WM_ICON_SIZE property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetIconSizes</function></funcdef>
+  <funcdef><function>XSetIconSizes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XIconSize<parameter> *size_list</parameter></paramdef>
@@ -3661,7 +3661,7 @@ function is used only by window managers to set the supported icon sizes.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 </para>
 <para>
@@ -3673,7 +3673,7 @@ To read a window's WM_ICON_SIZE property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetIconSizes</function></funcdef>
+  <funcdef>Status <function>XGetIconSizes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XIconSize<parameter> **size_list_return</parameter></paramdef>
@@ -3747,7 +3747,7 @@ To free the data allocated in size_list_return, use
 <!-- .LP -->
 <function>XGetIconSizes</function>
 can generate a
-<function>BadWindow </function>
+<function>BadWindow</function>
 error.
 </para>
 </sect2>
@@ -3770,7 +3770,7 @@ WM_COMMAND, WM_CLIENT_MACHINE, and WM_LOCALE_NAME.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XmbSetWMProperties</function></funcdef>
+  <funcdef>void <function>XmbSetWMProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> *window_name</parameter></paramdef>
@@ -3930,7 +3930,7 @@ An argc of zero indicates a zero-length command.
 <para>
 <!-- .LP -->
 The hostname of the machine is stored using 
-<function>XSetWMClientMachine </function>
+<function>XSetWMClientMachine</function>
 (see section 14.2.2).
 </para>
 <para>
@@ -3988,7 +3988,7 @@ WM_COMMAND, and WM_CLIENT_MACHINE.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetWMProperties</function></funcdef>
+  <funcdef>void <function>XSetWMProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *window_name</parameter></paramdef>
@@ -4104,7 +4104,7 @@ structure to be used.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XSetWMProperties </function>
+<function>XSetWMProperties</function>
 convenience function provides a single programming interface 
 for setting those essential window properties that are used 
 for communicating with other clients (particularly window and session
@@ -4129,7 +4129,7 @@ calls
 which sets the WM_COMMAND property (see section 14.2.1).
 Note that an argc of zero is allowed to indicate a zero-length command.
 Note also that the hostname of this machine is stored using
-<function>XSetWMClientMachine </function>
+<function>XSetWMClientMachine</function>
 (see section 14.2.2).
 </para>
 <para>
@@ -4214,7 +4214,7 @@ To set a window's WM_COMMAND property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetCommand</function></funcdef>
+  <funcdef><function>XSetCommand</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> **argv</parameter></paramdef>
@@ -4282,7 +4282,7 @@ the result is implementation-dependent.
 can generate
 <function>BadAlloc</function>
 and
-<function>BadWindow </function>
+<function>BadWindow</function>
 errors.
 <!-- .sp -->
 </para>
@@ -4294,7 +4294,7 @@ To read a window's WM_COMMAND property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetCommand</function></funcdef>
+  <funcdef>Status <function>XGetCommand</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>char<parameter> ***argv_return</parameter></paramdef>
@@ -4349,7 +4349,7 @@ Returns the number of arguments returned.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XGetCommand </function>
+<function>XGetCommand</function>
 function reads the WM_COMMAND property from the specified window 
 and returns a string list.
 If the WM_COMMAND property exists, 
@@ -4385,7 +4385,7 @@ To set a window's WM_CLIENT_MACHINE property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetWMClientMachine</function></funcdef>
+  <funcdef>void <function>XSetWMClientMachine</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
@@ -4445,7 +4445,7 @@ To read a window's WM_CLIENT_MACHINE property, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetWMClientMachine</function></funcdef>
+  <funcdef>Status <function>XGetWMClientMachine</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XTextProperty<parameter> *text_prop_return</parameter></paramdef>
@@ -4493,7 +4493,7 @@ structure.
 The
 <function>XGetWMClientMachine</function>
 convenience function performs an 
-<function>XGetTextProperty </function>
+<function>XGetTextProperty</function>
 on the WM_CLIENT_MACHINE property.
 It returns a nonzero status on success;
 otherwise, it returns a zero status.
@@ -4634,7 +4634,7 @@ use
 <para>
 <!-- .LP -->
 The 
-<function>XStandardColormap </function>
+<function>XStandardColormap</function>
 structure contains:
 </para>
 <literallayout class="monospaced">
@@ -4713,7 +4713,7 @@ only the colormap, red_max, red_mult,
 and base_pixel members are defined. 
 The other members are ignored.  
 To compute a 
-<function>GrayScale </function>
+<function>GrayScale</function>
 pixel value, use the following expression:
 </para>
 <para>
@@ -4748,7 +4748,7 @@ function on the indicated resource.
 <para>
 <!-- .LP -->
 The properties containing the 
-<function>XStandardColormap </function>
+<function>XStandardColormap</function>
 information have 
 the type RGB_COLOR_MAP.
 </para>
@@ -4827,11 +4827,11 @@ red, as well as more green or red than blue.
       </para>
       <para>
 For an 8-plane 
-<function>PseudoColor </function>
+<function>PseudoColor</function>
 visual, 
 RGB_BEST_MAP is likely to be a 3/3/2 allocation.  
 For a 24-plane 
-<function>DirectColor </function>
+<function>DirectColor</function>
 visual, 
 RGB_BEST_MAP is normally an 8/8/8 allocation.  
       </para>
@@ -4867,13 +4867,13 @@ The value of the property is an
       </para>
       <para>
 The property describes the best 
-<function>GrayScale </function>
+<function>GrayScale</function>
 colormap available on the screen.  
 As previously mentioned, 
 only the colormap, red_max, red_mult, and base_pixel members of the
-<function>XStandardColormap </function>
+<function>XStandardColormap</function>
 structure are used for 
-<function>GrayScale </function>
+<function>GrayScale</function>
 colormaps.
       </para>
     </listitem>
@@ -4904,7 +4904,7 @@ structure, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void<function> XSetRGBColormaps</function></funcdef>
+  <funcdef>void <function>XSetRGBColormaps</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XStandardColormap<parameter> *std_colormap</parameter></paramdef>
@@ -4973,7 +4973,7 @@ Specifies the property name.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XSetRGBColormaps </function>
+<function>XSetRGBColormaps</function>
 function replaces the <acronym>RGB</acronym> colormap definition in the specified property 
 on the named window.
 If the property does not already exist,
@@ -5077,14 +5077,14 @@ errors.
 <para>
 <!-- .LP -->
 To obtain the 
-<function>XStandardColormap </function>
+<function>XStandardColormap</function>
 structure associated with the specified property, use
 <function>XGetRGBColormaps</function>.
 <indexterm significance="preferred"><primary>XGetRGBColormaps</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status<function> XGetRGBColormaps</function></funcdef>
+  <funcdef>Status <function>XGetRGBColormaps</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Window<parameter> w</parameter></paramdef>
   <paramdef>XStandardColormap<parameter> **std_colormap_return</parameter></paramdef>
@@ -5162,7 +5162,7 @@ and is long enough to contain a colormap definition,
 allocates and fills in space for the returned colormaps
 and returns a nonzero status.
 If the visualid is not present, 
-<function>XGetRGBColormaps </function>
+<function>XGetRGBColormaps</function>
 assumes the default visual for the screen on which the window is located; 
 if the killid is not present, 
 <function>None</function>
diff --git a/specs/libX11/CH15.xml b/specs/libX11/CH15.xml
index 7f3de6e9..7cf78edc 100644
--- a/specs/libX11/CH15.xml
+++ b/specs/libX11/CH15.xml
@@ -473,7 +473,7 @@ To convert a quark to a string, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char <function> *XrmQuarkToString</function></funcdef>
+  <funcdef>char *<function>XrmQuarkToString</function></funcdef>
   <paramdef>XrmQuark<parameter> quark</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -520,7 +520,7 @@ To convert a string with one or more components to a quark list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmStringToQuarkList</function></funcdef>
+  <funcdef>void <function>XrmStringToQuarkList</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>XrmQuarkList<parameter> quarks_return</parameter></paramdef>
 </funcprototype>
@@ -594,7 +594,7 @@ and a quark list, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XrmStringToBindingQuarkList</function></funcdef>
+  <funcdef><function>XrmStringToBindingQuarkList</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
   <paramdef>XrmBindingList<parameter> bindings_return</parameter></paramdef>
   <paramdef>XrmQuarkList<parameter> quarks_return</parameter></paramdef>
@@ -670,7 +670,7 @@ bindings:     loose     tight     loose
 A resource database is an opaque type,
 <function>XrmDatabase</function>.
 Each database value is stored in an
-<function>XrmValue </function>
+<function>XrmValue</function>
 structure.
 This structure consists of a size, an address, and a representation type.
 The size is specified in bytes.
@@ -678,7 +678,7 @@ The representation type is a way for you to store data tagged by some
 application-defined type (for example, the strings ``font'' or ``color'').
 It has nothing to do with the C data type or with its class. 
 The
-<function>XrmValue </function>
+<function>XrmValue</function>
 structure is defined as:
 </para>
 <para>
@@ -704,7 +704,7 @@ To initialize the resource manager, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmInitialize</function></funcdef>
+  <funcdef>void <function>XrmInitialize</function></funcdef>
   <paramdef>void<parameter> XrmInitialize(\|)</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -719,7 +719,7 @@ To retrieve a database from disk, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XrmDatabase <function> XrmGetFileDatabase</function></funcdef>
+  <funcdef>XrmDatabase <function>XrmGetFileDatabase</function></funcdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -763,7 +763,7 @@ To store a copy of a database to disk, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmPutFileDatabase</function></funcdef>
+  <funcdef>void <function>XrmPutFileDatabase</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
   <paramdef>char<parameter> *stored_db</parameter></paramdef>
 </funcprototype>
@@ -816,7 +816,7 @@ To obtain a pointer to the screen-independent resources of a display, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XResourceManagerString</function></funcdef>
+  <funcdef>char *<function>XResourceManagerString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -860,7 +860,7 @@ To obtain a pointer to the screen-specific resources of a screen, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XScreenResourceString</function></funcdef>
+  <funcdef>char *<function>XScreenResourceString</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -904,7 +904,7 @@ To create a database from a string, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XrmDatabase <function> XrmGetStringDatabase</function></funcdef>
+  <funcdef>XrmDatabase <function>XrmGetStringDatabase</function></funcdef>
   <paramdef>char<parameter> *data</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -949,7 +949,7 @@ To obtain the locale name of a database, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XrmLocaleOfDatabase</function></funcdef>
+  <funcdef>char *<function>XrmLocaleOfDatabase</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -989,7 +989,7 @@ To destroy a resource database and free its allocated memory, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmDestroyDatabase</function></funcdef>
+  <funcdef>void <function>XrmDestroyDatabase</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1023,7 +1023,7 @@ To associate a resource database with a display, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmSetDatabase</function></funcdef>
+  <funcdef>void <function>XrmSetDatabase</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
 </funcprototype>
@@ -1072,7 +1072,7 @@ To get the resource database associated with a display, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XrmDatabase <function> XrmGetDatabase</function></funcdef>
+  <funcdef>XrmDatabase <function>XrmGetDatabase</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1112,7 +1112,7 @@ To merge the contents of a resource file into a database, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status <function> XrmCombineFileDatabase</function></funcdef>
+  <funcdef>Status <function>XrmCombineFileDatabase</function></funcdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
   <paramdef>XrmDatabase<parameter> *target_db</parameter></paramdef>
   <paramdef>Bool<parameter> override</parameter></paramdef>
@@ -1186,7 +1186,7 @@ To merge the contents of one database into another database, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmCombineDatabase</function></funcdef>
+  <funcdef>void <function>XrmCombineDatabase</function></funcdef>
   <paramdef>XrmDatabasesource_db,<parameter> *target_db</parameter></paramdef>
   <paramdef>Bool<parameter> override</parameter></paramdef>
 </funcprototype>
@@ -1256,7 +1256,7 @@ semantics, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmMergeDatabases</function></funcdef>
+  <funcdef>void <function>XrmMergeDatabases</function></funcdef>
   <paramdef>XrmDatabasesource_db,<parameter> *target_db</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1316,7 +1316,7 @@ or
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XrmGetResource</function></funcdef>
+  <funcdef>Bool <function>XrmGetResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
   <paramdef>char<parameter> *str_name</parameter></paramdef>
   <paramdef>char<parameter> *str_class</parameter></paramdef>
@@ -1386,7 +1386,7 @@ Returns the value in the database.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XrmQGetResource</function></funcdef>
+  <funcdef>Bool <function>XrmQGetResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
   <paramdef>XrmNameList<parameter> quark_name</parameter></paramdef>
   <paramdef>XrmClassList<parameter> quark_class</parameter></paramdef>
@@ -1452,9 +1452,9 @@ Returns the value in the database.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XrmGetResource </function>
+<function>XrmGetResource</function>
 and 
-<function>XrmQGetResource </function>
+<function>XrmQGetResource</function>
 functions retrieve a resource from the specified database.
 Both take a fully qualified name/class pair, a destination
 resource representation, and the address of a value
@@ -1473,9 +1473,9 @@ A client that is not storing new values into the database or
 is not merging the database should be safe using the address passed 
 back at any time until it exits.
 If a resource was found, both
-<function>XrmGetResource </function>
+<function>XrmGetResource</function>
 and
-<function>XrmQGetResource </function>
+<function>XrmQGetResource</function>
 return 
 <function>True</function>;
 otherwise, they return 
@@ -1493,7 +1493,7 @@ The X toolkit access pattern for a resource database is quite stylized.
 A series of from 1 to 20 probes is made with only the 
 last name/class differing in each probe.
 The 
-<function>XrmGetResource </function>
+<function>XrmGetResource</function>
 function is at worst a %2 sup n% algorithm,  <!-- FIXME: log(n) ?  -->
 where <emphasis remap='I'>n</emphasis> is the length of the name/class list.
 This can be improved upon by the application programmer by prefetching a list
@@ -1508,7 +1508,7 @@ To obtain a list of database levels, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XrmQGetSearchResource</function></funcdef>
+  <funcdef>Bool <function>XrmQGetSearchResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
   <paramdef>XrmNameList<parameter> names</parameter></paramdef>
   <paramdef>XrmClassList<parameter> classes</parameter></paramdef>
@@ -1581,7 +1581,7 @@ function takes a list of names and classes
 and returns a list of database levels where a match might occur.
 The returned list is in best-to-worst order and
 uses the same algorithm as 
-<function>XrmGetResource </function>
+<function>XrmGetResource</function>
 for determining precedence.
 If list_return was large enough for the search list,
 <function>XrmQGetSearchList</function>
@@ -1601,7 +1601,7 @@ where <emphasis remap='I'>n</emphasis> is the number of name or class components
 <para>
 <!-- .LP -->
 When using 
-<function>XrmQGetSearchList </function>
+<function>XrmQGetSearchList</function>
 followed by multiple probes for resources with a common name and class prefix,
 only the common prefix should be specified in the name and class list to 
 <function>XrmQGetSearchList</function>.
@@ -1615,7 +1615,7 @@ To search resource database levels for a given resource, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XrmQGetSearchResource</function></funcdef>
+  <funcdef>Bool <function>XrmQGetSearchResource</function></funcdef>
   <paramdef>XrmSearchList<parameter> list</parameter></paramdef>
   <paramdef>XrmName<parameter> name</parameter></paramdef>
   <paramdef>XrmClass<parameter> class</parameter></paramdef>
@@ -1688,7 +1688,7 @@ that is fully identified by the specified name and class.
 The search stops with the first match.
 <function>XrmQGetSearchResource</function>
 returns 
-<function>True </function>
+<function>True</function>
 if the resource was found;
 otherwise, it returns
 <function>False</function>.
@@ -1696,14 +1696,14 @@ otherwise, it returns
 <para>
 <!-- .LP -->
 A call to 
-<function>XrmQGetSearchList </function>
+<function>XrmQGetSearchList</function>
 with a name and class list containing all but the last component 
 of a resource name followed by a call to 
-<function>XrmQGetSearchResource </function>
+<function>XrmQGetSearchResource</function>
 with the last component name and class returns the same database entry as 
-<function>XrmGetResource </function>
+<function>XrmGetResource</function>
 and 
-<function>XrmQGetResource </function>
+<function>XrmQGetResource</function>
 with the fully qualified name and class.
 </para>
 </sect1>
@@ -1715,7 +1715,7 @@ with the fully qualified name and class.
 <para>
 <!-- .LP -->
 To store resources into the database, use
-<function>XrmPutResource </function>
+<function>XrmPutResource</function>
 or
 <function>XrmQPutResource</function>.
 Both functions take a partial resource specification, a
@@ -1729,7 +1729,7 @@ This value is copied into the specified database.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmPutResource</function></funcdef>
+  <funcdef>void <function>XrmPutResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> *database</parameter></paramdef>
   <paramdef>char<parameter> *specifier</parameter></paramdef>
   <paramdef>char<parameter> *type</parameter></paramdef>
@@ -1807,7 +1807,7 @@ The value is stored in the database without modification.
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmQPutResource</function></funcdef>
+  <funcdef>void <function>XrmQPutResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> *database</parameter></paramdef>
   <paramdef>XrmBindingList<parameter> bindings</parameter></paramdef>
   <paramdef>XrmQuarkList<parameter> quarks</parameter></paramdef>
@@ -1889,7 +1889,7 @@ To add a resource that is specified as a string, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmPutStringResource</function></funcdef>
+  <funcdef>void <function>XrmPutStringResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> *database</parameter></paramdef>
   <paramdef>char<parameter> *specifier</parameter></paramdef>
   <paramdef>char<parameter> *value</parameter></paramdef>
@@ -1956,7 +1956,7 @@ To add a string resource using quarks as a specification, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmQPutStringResource</function></funcdef>
+  <funcdef>void <function>XrmQPutStringResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> *database</parameter></paramdef>
   <paramdef>XrmBindingList<parameter> bindings</parameter></paramdef>
   <paramdef>XrmQuarkList<parameter> quarks</parameter></paramdef>
@@ -2034,7 +2034,7 @@ both a name and a value, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmPutLineResource</function></funcdef>
+  <funcdef>void <function>XrmPutLineResource</function></funcdef>
   <paramdef>XrmDatabase<parameter> *database</parameter></paramdef>
   <paramdef>char<parameter> *line</parameter></paramdef>
 </funcprototype>
@@ -2103,7 +2103,7 @@ To enumerate the entries of a database, use
 
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XrmEnumerateDatabase</function></funcdef>
+  <funcdef>Bool <function>XrmEnumerateDatabase</function></funcdef>
   <paramdef>XrmDatabase<parameter> database</parameter></paramdef>
   <paramdef>XrmNameList<parameter> name_prefix</parameter></paramdef>
   <paramdef>XrmClassList<parameter> class_prefix</parameter></paramdef>
@@ -2307,7 +2307,7 @@ To load a resource database from a C command line, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XrmParseCommand</function></funcdef>
+  <funcdef>void <function>XrmParseCommand</function></funcdef>
   <paramdef>XrmDatabase<parameter> *database</parameter></paramdef>
   <paramdef>XrmOptionDescList<parameter> table</parameter></paramdef>
   <paramdef>int<parameter> table_count</parameter></paramdef>
diff --git a/specs/libX11/CH16.xml b/specs/libX11/CH16.xml
index 5fa2cd07..6857a85a 100644
--- a/specs/libX11/CH16.xml
+++ b/specs/libX11/CH16.xml
@@ -99,7 +99,7 @@ To obtain a KeySym for the KeyCode of an event, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>KeySym <function> XLookupKeysym</function></funcdef>
+  <funcdef>KeySym <function>XLookupKeysym</function></funcdef>
   <paramdef>XKeyEvent<parameter> *key_event</parameter></paramdef>
   <paramdef>int<parameter> index</parameter></paramdef>
 </funcprototype>
@@ -157,7 +157,7 @@ To obtain a KeySym for a specific KeyCode, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>KeySym <function> XKeycodeToKeysym</function></funcdef>
+  <funcdef>KeySym <function>XKeycodeToKeysym</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>KeyCode<parameter> keycode</parameter></paramdef>
   <paramdef>int<parameter> index</parameter></paramdef>
@@ -219,7 +219,7 @@ To obtain a KeyCode for a key having a specific KeySym, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>KeyCode <function> XKeysymToKeycode</function></funcdef>
+  <funcdef>KeyCode <function>XKeysymToKeycode</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
 </funcprototype>
@@ -267,7 +267,7 @@ To refresh the stored modifier and keymap information, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRefreshKeyboardMapping</function></funcdef>
+  <funcdef><function>XRefreshKeyboardMapping</function></funcdef>
   <paramdef>XMappingEvent<parameter> *event_map</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -309,7 +309,7 @@ To obtain the uppercase and lowercase forms of a KeySym, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>void <function> XConvertCase</function></funcdef>
+  <funcdef>void <function>XConvertCase</function></funcdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
   <paramdef>KeySym<parameter> *lower_return</parameter></paramdef>
   <paramdef>KeySym<parameter> *upper_return</parameter></paramdef>
@@ -372,7 +372,7 @@ To convert the name of the KeySym to the KeySym code, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>KeySym <function> XStringToKeysym</function></funcdef>
+  <funcdef>KeySym <function>XStringToKeysym</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -419,7 +419,7 @@ To convert a KeySym code to the name of the KeySym, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XKeysymToString</function></funcdef>
+  <funcdef>char *<function>XKeysymToString</function></funcdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -667,7 +667,7 @@ To map a key event to an ISO Latin-1 string, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XLookupString</function></funcdef>
+  <funcdef>int <function>XLookupString</function></funcdef>
   <paramdef>XKeyEvent<parameter> *event_struct</parameter></paramdef>
   <paramdef>char<parameter> *buffer_return</parameter></paramdef>
   <paramdef>int<parameter> bytes_buffer</parameter></paramdef>
@@ -729,7 +729,7 @@ Returns the KeySym computed from the event if this argument is not NULL.
     <listitem>
       <para>
 Specifies or returns the 
-<function>XComposeStatus </function>
+<function>XComposeStatus</function>
 structure or NULL.
     </para>
   </listitem>
@@ -789,7 +789,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRebindKeysym</function></funcdef>
+  <funcdef><function>XRebindKeysym</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
   <paramdef>KeySym<parameter> list[\^]\^</parameter></paramdef>
@@ -894,7 +894,7 @@ To allocate some memory you will never give back, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> Xpermalloc</function></funcdef>
+  <funcdef>char *<function>Xpermalloc</function></funcdef>
   <paramdef>unsignedint<parameter> size</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -928,7 +928,7 @@ To parse standard window geometry strings, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XParseGeometry</function></funcdef>
+  <funcdef>int <function>XParseGeometry</function></funcdef>
   <paramdef>char<parameter> *parsestring</parameter></paramdef>
   <paramdef>int*x_return,<parameter> *y_return</parameter></paramdef>
   <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
@@ -1044,9 +1044,9 @@ or one of the signs is set.
 <para>
 <!-- .LP -->
 If the function returns either the 
-<function>XValue </function>
+<function>XValue</function>
 or 
-<function>YValue </function>
+<function>YValue</function>
 flag,
 you should place the window at the requested position.
 <!-- .sp -->
@@ -1059,7 +1059,7 @@ To construct a window's geometry information, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XWMGeometry</function></funcdef>
+  <funcdef>int <function>XWMGeometry</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen</parameter></paramdef>
   <paramdef>char<parameter> *user_geom</parameter></paramdef>
@@ -1192,7 +1192,7 @@ Returns the window gravity.
 <!-- .LP -->
 <!-- .eM -->
 The 
-<function>XWMGeometry </function>
+<function>XWMGeometry</function>
 function combines any geometry information (given in the format used by 
 <function>XParseGeometry</function>)
 specified by the user and by the calling program with size hints 
@@ -1295,7 +1295,7 @@ To generate a region from a polygon, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Region <function> XPolygonRegion</function></funcdef>
+  <funcdef>Region <function>XPolygonRegion</function></funcdef>
   <paramdef>XPoint<parameter> points[]</parameter></paramdef>
   <paramdef>int<parameter> n</parameter></paramdef>
   <paramdef>int<parameter> fill_rule</parameter></paramdef>
@@ -1358,7 +1358,7 @@ To set the clip-mask of a GC to a region, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSetRegion</function></funcdef>
+  <funcdef><function>XSetRegion</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -1418,7 +1418,7 @@ To deallocate the storage associated with a specified region, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDestroyRegion</function></funcdef>
+  <funcdef><function>XDestroyRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1454,7 +1454,7 @@ To move a region by a specified amount, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XOffsetRegion</function></funcdef>
+  <funcdef><function>XOffsetRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
   <paramdef>intdx,<parameter> dy</parameter></paramdef>
 </funcprototype>
@@ -1506,7 +1506,7 @@ To reduce a region by a specified amount, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XShrinkRegion</function></funcdef>
+  <funcdef><function>XShrinkRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
   <paramdef>intdx,<parameter> dy</parameter></paramdef>
 </funcprototype>
@@ -1569,7 +1569,7 @@ To generate the smallest rectangle enclosing a region, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XClipBox</function></funcdef>
+  <funcdef><function>XClipBox</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
   <paramdef>XRectangle<parameter> *rect_return</parameter></paramdef>
 </funcprototype>
@@ -1614,7 +1614,7 @@ To compute the intersection of two regions, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XIntersectRegion</function></funcdef>
+  <funcdef><function>XIntersectRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1663,7 +1663,7 @@ To compute the union of two regions, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUnionRegion</function></funcdef>
+  <funcdef><function>XUnionRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1712,7 +1712,7 @@ To create a union of a source region and a rectangle, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XUnionRectWithRegion</function></funcdef>
+  <funcdef><function>XUnionRectWithRegion</function></funcdef>
   <paramdef>XRectangle<parameter> *rectangle</parameter></paramdef>
   <paramdef>Region<parameter> src_region</parameter></paramdef>
   <paramdef>Region<parameter> dest_region_return</parameter></paramdef>
@@ -1769,7 +1769,7 @@ To subtract two regions, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XSubtractRegion</function></funcdef>
+  <funcdef><function>XSubtractRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1825,7 +1825,7 @@ of two regions, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XXorRegion</function></funcdef>
+  <funcdef><function>XXorRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1882,7 +1882,7 @@ To determine if the specified region is empty, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XEmptyRegion</function></funcdef>
+  <funcdef>Bool <function>XEmptyRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1918,7 +1918,7 @@ To determine if two regions have the same offset, size, and shape, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XEqualRegion</function></funcdef>
+  <funcdef>Bool <function>XEqualRegion</function></funcdef>
   <paramdef>Regionr1,<parameter> r2</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -1970,7 +1970,7 @@ To determine if a specified point resides in a specified region, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Bool <function> XPointInRegion</function></funcdef>
+  <funcdef>Bool <function>XPointInRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
 </funcprototype>
@@ -2029,7 +2029,7 @@ To determine if a specified rectangle is inside a region, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XRectInRegion</function></funcdef>
+  <funcdef>int <function>XRectInRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
   <paramdef>intx,<parameter> y</parameter></paramdef>
   <paramdef>unsignedintwidth,<parameter> height</parameter></paramdef>
@@ -2141,7 +2141,7 @@ To store data in cut buffer 0, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XStoreBytes</function></funcdef>
+  <funcdef><function>XStoreBytes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *bytes</parameter></paramdef>
   <paramdef>int<parameter> \^nbytes</parameter></paramdef>
@@ -2206,7 +2206,7 @@ To store data in a specified cut buffer, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XStoreBuffer</function></funcdef>
+  <funcdef><function>XStoreBuffer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *bytes</parameter></paramdef>
   <paramdef>int<parameter> \^nbytes</parameter></paramdef>
@@ -2269,7 +2269,7 @@ and need not be null-terminated.
 <!-- .LP -->
 <function>XStoreBuffer</function>
 can generate a
-<function>BadAlloc </function>
+<function>BadAlloc</function>
 error.
 </para>
 <para>
@@ -2281,7 +2281,7 @@ To return data from cut buffer 0, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XFetchBytes</function></funcdef>
+  <funcdef>char *<function>XFetchBytes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *nbytes_return</parameter></paramdef>
 </funcprototype>
@@ -2333,7 +2333,7 @@ To return data from a specified cut buffer, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>char *<function> XFetchBuffer</function></funcdef>
+  <funcdef>char *<function>XFetchBuffer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> *nbytes_return</parameter></paramdef>
   <paramdef>int<parameter> buffer</parameter></paramdef>
@@ -2392,7 +2392,7 @@ To rotate the cut buffers, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XRotateBuffers</function></funcdef>
+  <funcdef><function>XRotateBuffers</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> rotate</parameter></paramdef>
 </funcprototype>
@@ -2453,7 +2453,7 @@ which visual to use for your application.
 <para>
 <!-- .LP -->
 The functions in this section use the visual information masks and the
-<function>XVisualInfo </function>
+<function>XVisualInfo</function>
 structure,
 which is defined in
 <!-- .hN X11/Xutil.h -->
@@ -2509,7 +2509,7 @@ template, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XVisualInfo *<function> XGetVisualInfo</function></funcdef>
+  <funcdef>XVisualInfo *<function>XGetVisualInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>long<parameter> vinfo_mask</parameter></paramdef>
   <paramdef>XVisualInfo<parameter> *vinfo_template</parameter></paramdef>
@@ -2584,7 +2584,7 @@ class of the screen, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Status <function> XMatchVisualInfo</function></funcdef>
+  <funcdef>Status <function>XMatchVisualInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>int<parameter> screen</parameter></paramdef>
   <paramdef>int<parameter> depth</parameter></paramdef>
@@ -2672,7 +2672,7 @@ returns zero.
 <!-- .LP -->
 Xlib provides several functions that perform basic operations on images.
 All operations on images are defined using an 
-<function>XImage </function>
+<function>XImage</function>
 structure, 
 as defined in
 <!-- .hN X11/Xlib.h . -->
@@ -2701,7 +2701,7 @@ to and from disk files.
 <para>
 <!-- .LP -->
 The
-<function>XImage </function>
+<function>XImage</function>
 structure describes an image as it exists in the client's memory.  
 The user can request that some of the members such as height, width, 
 and xoffset be changed when the image is sent to the server.
@@ -2711,12 +2711,12 @@ Other members (for example, byte order, bitmap_unit, and so forth)
 are characteristics of both the image and the server.  
 If these members
 differ between the image and the server, 
-<function>XPutImage </function>
+<function>XPutImage</function>
 makes the appropriate conversions.
 The first byte of the first line of
 plane n must be located at the address (data + (n * height * bytes_per_line)).
 For a description of the 
-<function>XImage </function>
+<function>XImage</function>
 structure,
 see section 8.7.
 </para>
@@ -2724,14 +2724,14 @@ see section 8.7.
 <!-- .LP -->
 <!-- .sp -->
 To allocate an 
-<function>XImage </function>
+<function>XImage</function>
 structure and initialize it with image format values from a display, use
 <function>XCreateImage</function>.
 <indexterm significance="preferred"><primary>XCreateImage</primary></indexterm>
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XImage *<function> XCreateImage</function></funcdef>
+  <funcdef>XImage *<function>XCreateImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Visual<parameter> *visual</parameter></paramdef>
   <paramdef>unsignedint<parameter> depth</parameter></paramdef>
@@ -2869,11 +2869,11 @@ structure for the
 specified display but does not allocate space for the image itself.
 Rather, it initializes the structure byte-order, bit-order, and bitmap-unit
 values from the display and returns a pointer to the 
-<function>XImage </function>
+<function>XImage</function>
 structure.
 The red, green, and blue mask values are defined for Z format images only
 and are derived from the 
-<function>Visual </function>
+<function>Visual</function>
 structure passed in.
 Other values also are passed in.
 The offset permits the rapid displaying of the image without requiring each 
@@ -2911,7 +2911,7 @@ To obtain a pixel value in an image, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>unsigned long <function> XGetPixel</function></funcdef>
+  <funcdef>unsigned long <function>XGetPixel</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
   <paramdef>int<parameter> x</parameter></paramdef>
   <paramdef>int<parameter> y</parameter></paramdef>
@@ -2972,7 +2972,7 @@ To set a pixel value in an image, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XPutPixel</function></funcdef>
+  <funcdef><function>XPutPixel</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
   <paramdef>int<parameter> x</parameter></paramdef>
   <paramdef>int<parameter> y</parameter></paramdef>
@@ -3044,7 +3044,7 @@ To create a subimage, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>XImage *<function> XSubImage</function></funcdef>
+  <funcdef>XImage *<function>XSubImage</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
   <paramdef>int<parameter> x</parameter></paramdef>
   <paramdef>int<parameter> y</parameter></paramdef>
@@ -3130,7 +3130,7 @@ To increment each pixel in an image by a constant value, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XAddPixel</function></funcdef>
+  <funcdef><function>XAddPixel</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
   <paramdef>long<parameter> value</parameter></paramdef>
 </funcprototype>
@@ -3179,7 +3179,7 @@ use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef><function> XDestroyImage</function></funcdef>
+  <funcdef><function>XDestroyImage</function></funcdef>
   <paramdef>XImage<parameter> *\^ximage</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
@@ -3266,7 +3266,7 @@ To read a bitmap from a file and store it in a pixmap, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XReadBitmapFile</function></funcdef>
+  <funcdef>int <function>XReadBitmapFile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
@@ -3373,7 +3373,7 @@ The file is parsed in the encoding of the current locale.
 The ability to read other than the standard format 
 is implementation-dependent.
 If the file cannot be opened, 
-<function>XReadBitmapFile </function>
+<function>XReadBitmapFile</function>
 returns 
 <function>BitmapOpenFailed</function>.
 If the file can be opened but does not contain valid bitmap data, 
@@ -3388,17 +3388,17 @@ it returns
 </para>
 <para>
 <!-- .LP -->
-<function>XReadBitmapFile </function>
+<function>XReadBitmapFile</function>
 returns the bitmap's height and width, as read
 from the file, to width_return and height_return.
 It then creates a pixmap of the appropriate size, 
 reads the bitmap data from the file into the pixmap,
 and assigns the pixmap to the caller's variable bitmap.  
 The caller must free the bitmap using 
-<function>XFreePixmap </function>
+<function>XFreePixmap</function>
 when finished.
 If <emphasis remap='I'>name</emphasis>_x_hot and <emphasis remap='I'>name</emphasis>_y_hot exist,
-<function>XReadBitmapFile </function>
+<function>XReadBitmapFile</function>
 returns them to x_hot_return and y_hot_return;
 otherwise, it returns \-1,\-1.
 </para>
@@ -3421,7 +3421,7 @@ To read a bitmap from a file and return it as data, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XReadBitmapFileData</function></funcdef>
+  <funcdef>int <function>XReadBitmapFileData</function></funcdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
   <paramdef>unsignedint*width_return,<parameter> *height_return</parameter></paramdef>
   <paramdef>unsignedchar<parameter> *data_return</parameter></paramdef>
@@ -3518,7 +3518,7 @@ To write out a bitmap from a pixmap to a file, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XWriteBitmapFile</function></funcdef>
+  <funcdef>int <function>XWriteBitmapFile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
   <paramdef>Pixmap<parameter> bitmap</parameter></paramdef>
@@ -3645,7 +3645,7 @@ To create a pixmap and then store bitmap-format data into it, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Pixmap <function> XCreatePixmapFromBitmapData</function></funcdef>
+  <funcdef>Pixmap <function>XCreatePixmapFromBitmapData</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>char<parameter> *data</parameter></paramdef>
@@ -3769,7 +3769,7 @@ errors.
 <!-- .LP -->
 <!-- .sp -->
 To include a bitmap written out by 
-<function>XWriteBitmapFile </function>
+<function>XWriteBitmapFile</function>
 <indexterm><primary>XWriteBitmapFile</primary></indexterm>
 in a program directly, as opposed to reading it in every time at run time, use
 <function>XCreateBitmapFromData</function>.
@@ -3777,7 +3777,7 @@ in a program directly, as opposed to reading it in every time at run time, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>Pixmap <function> XCreateBitmapFromData</function></funcdef>
+  <funcdef>Pixmap <function>XCreateBitmapFromData</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>Drawable<parameter> d</parameter></paramdef>
   <paramdef>char<parameter> *data</parameter></paramdef>
@@ -3920,7 +3920,7 @@ To save a data value that corresponds to a resource ID and context type, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XSaveContext</function></funcdef>
+  <funcdef>int <function>XSaveContext</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> rid</parameter></paramdef>
   <paramdef>XContext<parameter> context</parameter></paramdef>
@@ -3994,7 +3994,7 @@ To get the data associated with a resource ID and type, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XFindContext</function></funcdef>
+  <funcdef>int <function>XFindContext</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> rid</parameter></paramdef>
   <paramdef>XContext<parameter> context</parameter></paramdef>
@@ -4067,7 +4067,7 @@ To delete an entry for a given resource ID and type, use
 <!-- .sM -->
 <funcsynopsis>
 <funcprototype>
-  <funcdef>int <function> XDeleteContext</function></funcdef>
+  <funcdef>int <function>XDeleteContext</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
   <paramdef>XID<parameter> rid</parameter></paramdef>
   <paramdef>XContext<parameter> context</parameter></paramdef>
@@ -4124,7 +4124,7 @@ does not free the data whose address was saved.
 <!-- .LP -->
 <!-- .sp -->
 To create a unique context type that may be used in subsequent calls to
-<function>XSaveContext </function>
+<function>XSaveContext</function>
 and
 <function>XFindContext</function>,
 use
diff --git a/specs/libX11/glossary.xml b/specs/libX11/glossary.xml
index 037ea8d0..125baf38 100644
--- a/specs/libX11/glossary.xml
+++ b/specs/libX11/glossary.xml
@@ -481,7 +481,7 @@ Both windows and pixmaps can be used as sources and destinations
 in graphics operations.  
 These windows and pixmaps are collectively known as drawables.
 However, an 
-<function>InputOnly </function>
+<function>InputOnly</function>
 window cannot be used as a source or destination in a
 graphics operation.
 <!-- .KE -->
@@ -739,7 +739,7 @@ See <function>Bit gravity</function> and <function>Window gravity</function>.
   <glossdef>
 <indexterm significance="preferred"><primary>GrayScale</primary></indexterm>
     <para>
-<function>GrayScale </function>
+<function>GrayScale</function>
 can be viewed as a degenerate case of 
 <function>PseudoColor</function>,
 in which the red, green, and blue values in any given colormap entry 
@@ -835,12 +835,12 @@ client, which usually is part of a window manager.
 An
 <function>InputOnly</function>
 window is a window that cannot be used for graphics requests.  
-<function>InputOnly </function>
+<function>InputOnly</function>
 windows are invisible and are used to control such things as cursors,
 input event generation, and grabbing.
-<function>InputOnly </function>
+<function>InputOnly</function>
 windows cannot have 
-<function>InputOutput </function>
+<function>InputOutput</function>
 windows as inferiors.
 <!-- .KE -->
     </para>
@@ -854,11 +854,11 @@ windows as inferiors.
 An
 <function>InputOutput</function>
 window is the normal kind of window that is used for both input and output.
-<function>InputOutput </function>
+<function>InputOutput</function>
 windows can have both 
-<function>InputOutput </function>
+<function>InputOutput</function>
 and 
-<function>InputOnly </function>
+<function>InputOnly</function>
 windows as inferiors.
 <!-- .KE -->
     </para>
@@ -1066,7 +1066,7 @@ imply only that the strings <emphasis remap='I'>may</emphasis> contain multibyte
 A window is obscured if some other window obscures it.
 A window can be partially obscured and so still have visible regions.
 Window A obscures window B if both are viewable 
-<function>InputOutput </function>
+<function>InputOutput</function>
 windows, if A is higher in the global stacking order, 
 and if the rectangle defined by the outside
 edges of A intersects the rectangle defined by the outside edges of B.
@@ -1444,7 +1444,7 @@ which typically have physically independent monitors.
 This would be the expected configuration when there is only a single keyboard 
 and pointer shared among the screens.
 A 
-<function>Screen </function>
+<function>Screen</function>
 <indexterm><primary>Screen</primary><secondary>structure</secondary></indexterm>
 structure contains the information about that screen
 and is linked to the 
@@ -1586,7 +1586,7 @@ this means use of at most single shifts, not locking shifts.
   <glossdef>
 <indexterm significance="preferred"><primary>StaticColor</primary></indexterm>
     <para>
-<function>StaticColor </function>
+<function>StaticColor</function>
 can be viewed as a degenerate case of 
 <function>PseudoColor</function>
 in which the <acronym>RGB</acronym> values are predefined and read-only.
@@ -1599,7 +1599,7 @@ in which the <acronym>RGB</acronym> values are predefined and read-only.
   <glossdef>
 <indexterm significance="preferred"><primary>StaticGray</primary></indexterm>
     <para>
-<function>StaticGray </function>
+<function>StaticGray</function>
 can be viewed as a degenerate case of 
 <function>GrayScale</function>
 in which the gray values are predefined and read-only.