Add id attributes to functions.

17 files changed, 567 insertions, 569 deletions

diff --git a/configure.ac b/configure.ac
index ce86c93..8512071 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@ XORG_MACROS_VERSION(1.12)
 XORG_DEFAULT_OPTIONS
 XORG_ENABLE_SPECS
 XORG_WITH_XMLTO(0.0.22)
-XORG_WITH_FOP([no])
+XORG_WITH_FOP()
 XORG_WITH_XSLTPROC
 XORG_CHECK_SGML_DOCTOOLS(1.7)
 XORG_PROG_RAWCPP
diff --git a/specs/libX11/AppC.xml b/specs/libX11/AppC.xml
index f9371d2..606aae0 100644
--- a/specs/libX11/AppC.xml
+++ b/specs/libX11/AppC.xml
@@ -48,7 +48,7 @@ and
 </para>
 <indexterm significance="preferred"><primary>XQueryExtension</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xqueryextension'>
 <funcprototype>
   <funcdef>Bool <function>XQueryExtension</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -133,7 +133,7 @@ the strings ``thing'', ``Thing'', and ``thinG''
 are all considered different names.
 <indexterm significance="preferred"><primary>XListExtensions</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlistextensions'>
 <funcprototype>
   <funcdef>char **<function>XListExtensions</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -175,7 +175,7 @@ then the returned strings are in the Host Portable Character Encoding.
 Otherwise, the result is implementation-dependent.
 <indexterm significance="preferred"><primary>XFreeExtensionList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreeextensionlist'>
 <funcprototype>
   <funcdef><function>XFreeExtensionList</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
@@ -258,7 +258,7 @@ typedef struct _XExtCodes {	/* public to extension, cannot be changed */
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XInitExtension</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xinitextension'>
 <funcprototype>
   <funcdef>XExtCodes *<function>XInitExtension</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -324,7 +324,7 @@ This extension number is unique only to a single connection.
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XAddExtension</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xaddextension'>
 <funcprototype>
   <funcdef>XExtCodes *<function>XAddExtension</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -372,7 +372,7 @@ All of these functions return the previous procedure defined for this
 extension.
 <indexterm significance="preferred"><primary>XESetCloseDisplay</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetclosedisplay'>
 <funcprototype>
   <funcdef>int <function>XESetCloseDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -442,7 +442,7 @@ with these arguments:
 <para>
 <indexterm significance="preferred"><primary>XESetCreateGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetcreategc'>
 <funcprototype>
   <funcdef>int *<function>XESetCreateGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -510,7 +510,7 @@ your procedure is called with these arguments:
 </para>
 <indexterm significance="preferred"><primary>XESetCopyGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetcopygc'>
 <funcprototype>
   <funcdef>int *<function>XESetCopyGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -573,7 +573,7 @@ your procedure is called with these arguments:
 </funcprototype>
 </funcsynopsis>
 </para>
-<funcsynopsis>
+<funcsynopsis id='xesetfreegc'>
 <funcprototype>
   <funcdef>int *<function>XESetFreeGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -645,7 +645,7 @@ your procedure is called with these arguments:
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XESetCreateFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetcreatefont'>
 <funcprototype>
   <funcdef>int *<function>XESetCreateFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -726,7 +726,7 @@ your procedure is called with these arguments:
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XESetFreeFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetfreefont'>
 <funcprototype>
   <funcdef>int *<function>XESetFreeFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -838,7 +838,7 @@ in the structure will be fully portable between machines.
 <!-- .NE -->
 <indexterm significance="preferred"><primary>XESetWireToEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetwiretoevent'>
 <funcprototype>
   <funcdef>int *<function>XESetWireToEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -948,7 +948,7 @@ with the event and use the return value.
 <!-- .LP -->
 <indexterm significance="preferred"><primary>_XSetLastRequestRead</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xsetlastrequestread'>
 <funcprototype>
   <funcdef>unsigned long<function>_XSetLastRequestRead</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -992,7 +992,7 @@ serial number in the event.
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XESetEventToWire</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xeseteventtowire'>
 <funcprototype>
   <funcdef>Status *<function>XESetEventToWire</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1084,7 +1084,7 @@ All other members then should be copied from the host format to the
 structure.
 <indexterm significance="preferred"><primary>XESetWireToError</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetwiretoerror'>
 <funcprototype>
   <funcdef>Bool *<function>XESetWireToError</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1179,7 +1179,7 @@ otherwise, it should return
 <symbol>True</symbol>.
 <indexterm significance="preferred"><primary>XESetError</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xeseterror'>
 <funcprototype>
   <funcdef>int *<function>XESetError</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1269,7 +1269,7 @@ the error is suppressed, and
 returns the value of ret_code.
 <indexterm significance="preferred"><primary>XESetErrorString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xeseterrorstring'>
 <funcprototype>
   <funcdef>char *<function>XESetErrorString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1345,7 +1345,7 @@ You should copy nbytes of a null-terminated string containing the
 error message into buffer.
 <indexterm significance="preferred"><primary>XESetPrintErrorValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetprinterrorvalues'>
 <funcprototype>
   <funcdef>void *<function>XESetPrintErrorValues</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1427,7 +1427,7 @@ The underlying type of the fp argument is system dependent;
 on a <acronym>POSIX</acronym>-compliant system, fp should be cast to type FILE*.
 <indexterm significance="preferred"><primary>XESetFlushGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xesetflushgc'>
 <funcprototype>
   <funcdef>int *<function>XESetFlushGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1617,7 +1617,7 @@ union {	Display *display;
 <!-- .eM -->
 <indexterm significance="preferred"><primary>XEHeadOfExtensionList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xeheadofextensionlist'>
 <funcprototype>
   <funcdef>XExtData **<function>XEHeadOfExtensionList</function></funcdef>
   <paramdef>XEDataObject<parameter> object</parameter></paramdef>
@@ -1655,7 +1655,7 @@ of types contained in
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XAddToExtensionList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xaddtoextensionlist'>
 <funcprototype>
   <funcdef><function>XAddToExtensionList</function></funcdef>
   <paramdef>XExtData<parameter> **structure</parameter></paramdef>
@@ -1695,7 +1695,7 @@ You must initialize ext_data-&gt;number with the extension number
 before calling this function.
 <indexterm significance="preferred"><primary>XFindOnExtensionList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfindonextensionlist'>
 <funcprototype>
   <funcdef>XExtData *<function>XFindOnExtensionList</function></funcdef>
   <paramdef>struct_XExtData<parameter> **structure</parameter></paramdef>
@@ -1746,7 +1746,7 @@ 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>
+<funcsynopsis id='xallocid'>
 <funcprototype>
   <funcdef><function>XAllocID</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1781,7 +1781,7 @@ The
 macro allocates and returns an array of resource ID.
 <indexterm significance="preferred"><primary>XAllocIDs</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xallocids'>
 <funcprototype>
   <funcdef><function>XAllocIDs</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1858,7 +1858,7 @@ The
 macro is defined as follows:
 <indexterm significance="preferred"><primary>FlushGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='flushgc'>
 <funcprototype>
   <funcdef><function>FlushGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1908,7 +1908,7 @@ procedure
 is defined as follows:
 <indexterm significance="preferred"><primary>_XFlushGCCache</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xflushgccache'>
 <funcprototype>
   <funcdef><function>_XFlushGCCache</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2331,7 +2331,7 @@ architecture.
 Two calls, which are generally implemented as macros, have been provided.
 <indexterm significance="preferred"><primary>LockDisplay</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='lockdisplay'>
 <funcprototype>
   <funcdef><function>LockDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2342,7 +2342,7 @@ Two calls, which are generally implemented as macros, have been provided.
 <para>
 <!-- .LP -->
 <indexterm significance="preferred"><primary>UnlockDisplay</primary></indexterm>
-<funcsynopsis>
+<funcsynopsis id='unlockdisplay'>
 <funcprototype>
   <funcdef><function>UnlockDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2526,7 +2526,7 @@ macros take three arguments:
 the display, a pointer to the beginning of the data, 
 and the number of bytes to be sent.
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='data'>
 <funcprototype>
   <funcdef><function>Data</function></funcdef>
   <paramdef><parameter> display</parameter></paramdef>
@@ -2582,7 +2582,7 @@ If any events arrive in the meantime,
 places them in the queue for later use.
 <indexterm significance="preferred"><primary>_XReply</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xreply'>
 <funcprototype>
   <funcdef>Status <function>_XReply</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2750,7 +2750,7 @@ function to read the variable-length data.
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xread'>
 <funcprototype>
   <funcdef><function>_XRead</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2802,7 +2802,7 @@ function reads the specified number of bytes into data_return.
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xread16'>
 <funcprototype>
   <funcdef><function>_XRead16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2856,7 +2856,7 @@ into the specified array as shorts.
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xread32'>
 <funcprototype>
   <funcdef><function>_XRead32</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2910,7 +2910,7 @@ into the specified array as longs.
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xread16pad'>
 <funcprototype>
   <funcdef><function>_XRead16Pad</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2967,7 +2967,7 @@ reads and discards up to two additional pad bytes.
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xreadpad'>
 <funcprototype>
   <funcdef><function>_XReadPad</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3067,7 +3067,7 @@ The following function returns a scratch buffer for use within a
 critical section:
 <indexterm significance="preferred"><primary>_XAllocScratch</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xallocscratch'>
 <funcprototype>
   <funcdef>char *<function>_XAllocScratch</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3124,7 +3124,7 @@ The following function returns a scratch buffer for use across
 critical sections:
 <indexterm significance="preferred"><primary>_XAllocTemp</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xalloctemp'>
 <funcprototype>
   <funcdef>char *<function>_XAllocTemp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3163,7 +3163,7 @@ execute inside Xlib.  The storage must be explicitly returned to Xlib.
 The following function returns the storage:
 <indexterm significance="preferred"><primary>_XFreeTemp</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='_xfreetemp'>
 <funcprototype>
   <funcdef>void <function>_XFreeTemp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/AppD.xml b/specs/libX11/AppD.xml
index 15b39cb..afe6590 100644
--- a/specs/libX11/AppD.xml
+++ b/specs/libX11/AppD.xml
@@ -55,7 +55,7 @@ and sets all or portions of the
 and <property>WM_NORMAL_HINTS</property> properties.
 <indexterm significance="preferred"><primary>XSetStandardProperties</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetstandardproperties'>
 <funcprototype>
   <funcdef><function>XSetStandardProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -204,7 +204,7 @@ This function has been superseded by
 <function>XSetWMNormalHints</function>.
 <indexterm significance="preferred"><primary>XSetNormalHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetnormalhints'>
 <funcprototype>
   <funcdef><function>XSetNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -293,7 +293,7 @@ This function has been superseded by
 <function>XGetWMNormalHints</function>.
 <indexterm significance="preferred"><primary>XGetNormalHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetnormalhints'>
 <funcprototype>
   <funcdef>Status <function>XGetNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -364,7 +364,7 @@ This function is no longer supported by the
 <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
 <indexterm significance="preferred"><primary>XSetZoomHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetzoomhints'>
 <funcprototype>
   <funcdef><function>XSetZoomHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -434,7 +434,7 @@ This function is no longer supported by the
 <emphasis remap='I'>Inter-Client Communication Conventions Manual</emphasis>.
 <indexterm significance="preferred"><primary>XGetZoomHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetzoomhints'>
 <funcprototype>
   <funcdef>Status <function>XGetZoomHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -501,7 +501,7 @@ This function has been superseded by
 <function>XSetWMSizeHints</function>.
 <indexterm significance="preferred"><primary>XSetSizeHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetsizehints'>
 <funcprototype>
   <funcdef><function>XSetSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -588,7 +588,7 @@ This function has been superseded by
 <function>XGetWMSizeHints</function>.
 <indexterm significance="preferred"><primary>XGetSizeHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetsizehints'>
 <funcprototype>
   <funcdef>Status <function>XGetSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -681,7 +681,7 @@ This function has been superseded by
 <function>XGetRGBColormaps</function>.
 <indexterm significance="preferred"><primary>XGetStandardColormap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetstandardcolormap'>
 <funcprototype>
   <funcdef>Status <function>XGetStandardColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -773,7 +773,7 @@ This function has been superseded by
 <function>XSetRGBColormaps</function>.
 <indexterm significance="preferred"><primary>XSetStandardColormap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetstandardcolormap'>
 <funcprototype>
   <funcdef><function>XSetStandardColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -856,7 +856,7 @@ This function has been superseded by
 <indexterm><primary>Window</primary><secondary>determining location</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGeometry</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgeometry'>
 <funcprototype>
   <funcdef>int <function>XGeometry</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1058,7 +1058,7 @@ It is only useful in very simple applications.
 <!-- .sp -->
 <indexterm significance="preferred"><primary>XGetDefault</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetdefault'>
 <funcprototype>
   <funcdef>char *<function>XGetDefault</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1253,7 +1253,7 @@ use
 #include &lt;X11/X10.h&gt;
 </para>
 
-<funcsynopsis>
+<funcsynopsis id='xdraw'>
 <funcprototype>
   <funcdef>Status <function>XDraw</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1460,7 +1460,7 @@ use
 
 <para>#include &lt;X11/X10.h&gt;</para>
 
-<funcsynopsis>
+<funcsynopsis id='xdrawfilled'>
 <funcprototype>
   <funcdef>Status <function>XDrawFilled</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1616,7 +1616,7 @@ use
 <indexterm significance="preferred"><primary>XCreateAssocTable</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xcreateassoctable'>
 <funcprototype>
   <funcdef>XAssocTable *<function>XCreateAssocTable</function></funcdef>
   <paramdef>int<parameter> size</parameter></paramdef>
@@ -1662,7 +1662,7 @@ use
 <indexterm significance="preferred"><primary>XMakeAssoc</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xmakeassoc'>
 <funcprototype>
   <funcdef><function>XMakeAssoc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1736,7 +1736,7 @@ use
 <function>XLookUpAssoc</function>.
 <indexterm significance="preferred"><primary>XLookUpAssoc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlookupassoc'>
 <funcprototype>
   <funcdef>char *<function>XLookUpAssoc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1801,7 +1801,7 @@ use
 <function>XDeleteAssoc</function>.
 <indexterm significance="preferred"><primary>XDeleteAssoc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdeleteassoc'>
 <funcprototype>
   <funcdef><function>XDeleteAssoc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1865,7 +1865,7 @@ use
 </para>
 <indexterm significance="preferred"><primary>XDestroyAssocTable</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroyassoctable'>
 <funcprototype>
   <funcdef><function>XDestroyAssocTable</function></funcdef>
   <paramdef>XAssocTable<parameter> *table</parameter></paramdef>
diff --git a/specs/libX11/CH02.xml b/specs/libX11/CH02.xml
index e3bfedb..e14ec4d 100644
--- a/specs/libX11/CH02.xml
+++ b/specs/libX11/CH02.xml
@@ -66,16 +66,14 @@ To open a connection to the X server that controls a display, use
 <function>XOpenDisplay</function>.
 <indexterm significance="preferred"><primary>XOpenDisplay</primary></indexterm>
 </para>
-<para>
-<!-- .LP -->
-<!-- .sM -->
-</para>
-<para>
-AllPlanes()
-</para>
-<para>
-XAllPlanes
-</para>
+
+<funcsynopsis id='xopendisplay'>
+<funcprototype>
+  <funcdef>Display <function>XOpenDisplay</function></funcdef>
+  <paramdef>char <parameter>*display_name</parameter></paramdef>
+</funcprototype>
+</funcsynopsis>
+
 
 <variablelist>
   <varlistentry>
@@ -361,7 +359,7 @@ The names are intended to convey the expected relative intensity of the colors.
 <para>
 BlackPixel(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xblackpixel'>
 <funcprototype>
   <funcdef>unsigned long <function>XBlackPixel</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -406,7 +404,7 @@ Both return the black pixel value for the specified screen.
 <para>
 WhitePixel(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xwhitepixel'>
 <funcprototype>
   <funcdef>unsigned long <function>XWhitePixel</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -451,7 +449,7 @@ Both return the white pixel value for the specified screen.
 <para>
 ConnectionNumber(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xconnectionnumber'>
 <funcprototype>
   <funcdef>int <function>XConnectionNumber</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -488,7 +486,7 @@ this is the file descriptor of the connection.
 <para>
 DefaultColormap(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultcolormap'>
 <funcprototype>
   <funcdef>Colormap <function>XDefaultColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -534,7 +532,7 @@ Most routine allocations of color should be made out of this colormap.
 <para>
 DefaultDepth(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultdepth'>
 <funcprototype>
   <funcdef>int <function>XDefaultDepth</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -585,7 +583,7 @@ To determine the number of depths that are available on a given screen, use
 <para>
 DefaultGC(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultgc'>
 <funcprototype>
   <funcdef>GC <function>XDefaultGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -703,7 +701,7 @@ This GC should never be freed.
 <para>
 DefaultRootWindow(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultrootwindow'>
 <funcprototype>
   <funcdef>Window <function>XDefaultRootWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -737,7 +735,7 @@ Both return the root window for the default screen.
 <para>
 DefaultScreenOfDisplay(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultscreenofdisplay'>
 <funcprototype>
   <funcdef>Screen *<function>XDefaultScreenOfDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -771,7 +769,7 @@ Both return a pointer to the default screen.
 <para>
 ScreenOfDisplay(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xscreenofdisplay'>
 <funcprototype>
   <funcdef>Screen *<function>XScreenOfDisplay</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -816,7 +814,7 @@ Both return a pointer to the indicated screen.
 <para>
 DefaultScreen(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultscreen'>
 <funcprototype>
   <funcdef>int <function>XDefaultScreen</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -854,7 +852,7 @@ in applications that will use only a single screen.
 <para>
 DefaultVisual(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultvisual'>
 <funcprototype>
   <funcdef>Visual *<function>XDefaultVisual</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -901,7 +899,7 @@ see section 3.1.
 <para>
 DisplayCells(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplaycells'>
 <funcprototype>
   <funcdef>int <function>XDisplayCells</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -946,7 +944,7 @@ Both return the number of entries in the default colormap.
 <para>
 DisplayPlanes(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplayplanes'>
 <funcprototype>
   <funcdef>int <function>XDisplayPlanes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -993,7 +991,7 @@ see the glossary.
 <para>
 DisplayString(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplaystring'>
 <funcprototype>
   <funcdef>char *<function>XDisplayString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1037,7 +1035,7 @@ child process as well as for printing error messages.
 <para>
 LastKnownRequestProcessed(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xlastknownrequestprocessed'>
 <funcprototype>
   <funcdef>unsigned long <function>XLastKnownRequestProcessed</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1180,7 +1178,7 @@ are received.
 <para>
 NextRequest(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xnextrequest'>
 <funcprototype>
   <funcdef>unsigned long <function>XNextRequest</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1216,7 +1214,7 @@ Serial numbers are maintained separately for each display connection.
 <para>
 ProtocolVersion(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xprotocolversion'>
 <funcprototype>
   <funcdef>int <function>XProtocolVersion</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1251,7 +1249,7 @@ the connected display.
 <para>
 ProtocolRevision(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xprotocolrevision'>
 <funcprototype>
   <funcdef>int <function>XProtocolRevision</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1285,7 +1283,7 @@ Both return the minor protocol revision number of the X server.
 <para>
 QLength(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xqlenth'>
 <funcprototype>
   <funcdef>int <function>XQLength</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1322,7 +1320,7 @@ the queue yet (see
 <para>
 RootWindow(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xrootwindow'>
 <funcprototype>
   <funcdef>Window <function>XRootWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1371,7 +1369,7 @@ and for creating top-level windows.
 <para>
 ScreenCount(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xscreencount'>
 <funcprototype>
   <funcdef>int <function>XScreenCount</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1405,7 +1403,7 @@ Both return the number of available screens.
 <para>
 ServerVendor(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xservervendor'>
 <funcprototype>
   <funcdef>char *<function>XServerVendor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1443,7 +1441,7 @@ Otherwise, the contents of the string are implementation-dependent.
 <para>
 VendorRelease(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xvendorrelease'>
 <funcprototype>
   <funcdef>int <function>XVendorRelease</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1516,7 +1514,7 @@ To obtain the pixmap format information for a given display, use
 <para>
 ImageByteOrder(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='ximagebyteorder'>
 <funcprototype>
   <funcdef>int <function>XImageByteOrder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1619,7 +1617,7 @@ or
 <para>
 BitmapUnit(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xbitmapunit'>
 <funcprototype>
   <funcdef>int <function>XBitmapUnit</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1654,7 +1652,7 @@ The scanline is calculated in multiples of this value.
 <para>
 BitmapBitOrder(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xbitmapbitorder'>
 <funcprototype>
   <funcdef>int <function>XBitmapBitOrder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1694,7 +1692,7 @@ or
 <para>
 BitmapPad(<emphasis remap='I'>display</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xbitmappad'>
 <funcprototype>
   <funcdef>int <function>XBitmapPad</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1729,7 +1727,7 @@ by this macro or function.
 <para>
 DisplayHeight(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplayheight'>
 <funcprototype>
   <funcdef>int <function>XDisplayHeight</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1775,7 +1773,7 @@ in pixels.
 <para>
 DisplayHeightMM(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplayheightmm'>
 <funcprototype>
   <funcdef>int <function>XDisplayHeightMM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1820,7 +1818,7 @@ Both return the height of the specified screen in millimeters.
 <para>
 DisplayWidth(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplaywidth'>
 <funcprototype>
   <funcdef>int <function>XDisplayWidth</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1865,7 +1863,7 @@ Both return the width of the screen in pixels.
 <para>
 DisplayWidthMM(<emphasis remap='I'>display</emphasis>, <emphasis remap='I'>screen_number</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplaywidthmm'>
 <funcprototype>
   <funcdef>int <function>XDisplayWidthMM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1924,7 +1922,7 @@ structure.
 <para>
 BlackPixelOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xblackpixelofscreen'>
 <funcprototype>
   <funcdef>unsigned long <function>XBlackPixelOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -1960,7 +1958,7 @@ Both return the black pixel value of the specified screen.
 <para>
 WhitePixelOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xwhitepixelofscreen'>
 <funcprototype>
   <funcdef>unsigned long <function>XWhitePixelOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -1996,7 +1994,7 @@ Both return the white pixel value of the specified screen.
 <para>
 CellsOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xcellsofscreen'>
 <funcprototype>
   <funcdef>int <function>XCellsOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2033,7 +2031,7 @@ of the specified screen.
 <para>
 DefaultColormapOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultcolormapofscreen'>
 <funcprototype>
   <funcdef>Colormap <function>XDefaultColormapOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2069,7 +2067,7 @@ Both return the default colormap of the specified screen.
 <para>
 DefaultDepthOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultdepthofscreen'>
 <funcprototype>
   <funcdef>int <function>XDefaultDepthOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2105,7 +2103,7 @@ Both return the depth of the root window.
 <para>
 DefaultGCOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultgcofscreen'>
 <funcprototype>
   <funcdef>GC <function>XDefaultGCOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2143,7 +2141,7 @@ The GC must never be freed.
 <para>
 DefaultVisualOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdefaultvisualofscreen'>
 <funcprototype>
   <funcdef>Visual *<function>XDefaultVisualOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2181,7 +2179,7 @@ see section 3.1.
 <para>
 DoesBackingStore(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdoesbackingstore'>
 <funcprototype>
   <funcdef>int <function>XDoesBackingStore</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2224,7 +2222,7 @@ or
 <para>
 DoesSaveUnders(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdoessaveunders'>
 <funcprototype>
   <funcdef>Bool <function>XDoesSaveUnders</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2267,7 +2265,7 @@ the screen does not support save unders (see section 3.2.5).
 <para>
 DisplayOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xdisplayofscreen'>
 <funcprototype>
   <funcdef>Display *<function>XDisplayOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2304,7 +2302,7 @@ Both return the display of the specified screen.
 <para>
 EventMaskOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xeventmaskofscreen'>
 <funcprototype>
   <funcdef>long <function>XEventMaskOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2377,7 +2375,7 @@ at connection setup time.
 <para>
 WidthOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xwidthofscreen'>
 <funcprototype>
   <funcdef>int <function>XWidthOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2413,7 +2411,7 @@ Both return the width of the specified screen in pixels.
 <para>
 HeightOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xheightofscreen'>
 <funcprototype>
   <funcdef>int <function>XHeightOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2449,7 +2447,7 @@ Both return the height of the specified screen in pixels.
 <para>
 WidthMMOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xwidthmmofscreen'>
 <funcprototype>
   <funcdef>int <function>XWidthMMOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2485,7 +2483,7 @@ Both return the width of the specified screen in millimeters.
 <para>
 HeightMMOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xheightmmofscreen'>
 <funcprototype>
   <funcdef>int <function>XHeightMMOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2521,7 +2519,7 @@ Both return the height of the specified screen in millimeters.
 <para>
 MaxCmapsOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xmaxcmapsofscreen'>
 <funcprototype>
   <funcdef>int <function>XMaxCmapsOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2558,7 +2556,7 @@ by the specified screen (see section 9.3).
 <para>
 MinCmapsOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xmincmapsofscreen'>
 <funcprototype>
   <funcdef>int <function>XMinCmapsOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2595,7 +2593,7 @@ by the specified screen (see section 9.3).
 <para>
 PlanesOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xplanesofscreen'>
 <funcprototype>
   <funcdef>int <function>XPlanesOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2631,7 +2629,7 @@ Both return the depth of the root window.
 <para>
 RootWindowOfScreen(<emphasis remap='I'>screen</emphasis>)
 </para>
-<funcsynopsis>
+<funcsynopsis id='xrootwindowofscreen'>
 <funcprototype>
   <funcdef>Window <function>XRootWindowOfScreen</function></funcdef>
   <paramdef>Screen<parameter> *screen</parameter></paramdef>
@@ -2675,7 +2673,7 @@ protocol request, use
 <indexterm significance="preferred"><primary>XNoOp</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xnoop'>
 <funcprototype>
   <funcdef><function>XNoOp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2713,7 +2711,7 @@ To free in-memory data that was created by an Xlib function, use
 <indexterm significance="preferred"><primary>XFree</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xfree'>
 <funcprototype>
   <funcdef>XFree</funcdef>
   <paramdef>void<parameter> *data</parameter></paramdef>
@@ -2759,7 +2757,7 @@ To close a display or disconnect from the X server, use
 <!-- .LP -->
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xclosedisplay'>
 <funcprototype>
   <funcdef>XCloseDisplay</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2827,7 +2825,7 @@ To change a client's close-down mode, use
 <indexterm significance="preferred"><primary>XSetCloseDownMode</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xsetclosedownmode'>
 <funcprototype>
   <funcdef>XSetCloseDownMode</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3112,7 +3110,7 @@ To lock a display across several Xlib calls, use
 <indexterm significance="preferred"><primary>XLockDisplay</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xlockdisplay'>
 <funcprototype>
   <funcdef>XLockDisplay</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3157,7 +3155,7 @@ To unlock a display, use
 <indexterm significance="preferred"><primary>XUnlockDisplay</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xunlockdisplay'>
 <funcprototype>
   <funcdef>XUnlockDisplay</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3216,7 +3214,7 @@ facilities.
 To track internal connections for a display, use
 <function>XAddConnectionWatch</function>.
 </para>
-<funcsynopsis>
+<funcsynopsis id='xconnectionwatchproc'>
 <funcprototype>
   <funcdef>type void XConnectionWatchProc</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3227,7 +3225,7 @@ To track internal connections for a display, use
 </funcprototype>
 </funcsynopsis>
 
-<funcsynopsis>
+<funcsynopsis id='xaddconnectionwatch'>
 <funcprototype>
   <funcdef>Status XAddConnectionWatch</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3318,7 +3316,7 @@ To stop tracking internal connections for a display, use
 <para>
 ()
 </para>
-<funcsynopsis>
+<funcsynopsis id='xremoveconnectionwatch'>
 <funcprototype>
   <funcdef>Status <function>XRemoveConnectionWatch</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3380,7 +3378,7 @@ To process input on an internal connection, use
 <para>
 ()
 </para>
-<funcsynopsis>
+<funcsynopsis id='xprocessinternalconnection'>
 <funcprototype>
   <funcdef>void <function>XProcessInternalConnection</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3435,7 +3433,7 @@ To obtain all of the current internal connections for a display, use
 <para>
 ()
 </para>
-<funcsynopsis>
+<funcsynopsis id='xinternalconnectionnumbers'>
 <funcprototype>
   <funcdef>Status <function>XInternalConnectionNumbers</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index 700c7cb..8d4c5ea 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -176,7 +176,7 @@ use
 <function>XVisualIDFromVisual</function>.
 <indexterm significance="preferred"><primary>XVisualIDFromVisual</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xvisualidfromvisual'>
 <funcprototype>
   <funcdef>VisualID <function>XVisualIDFromVisual</function></funcdef>
   <paramdef>Visual *<parameter>visual</parameter></paramdef>
@@ -1241,7 +1241,7 @@ To create an unmapped window and set its window attributes, use
 <function>XCreateWindow</function>.
 <indexterm significance="preferred"><primary>XCreateWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatewindow'>
 <funcprototype>
   <funcdef>Window <function>XCreateWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1506,7 +1506,7 @@ subwindow of a given parent window, use
 <function>XCreateSimpleWindow</function>.
 <indexterm significance="preferred"><primary>XCreateSimpleWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatesimplewindow'>
 <funcprototype>
   <funcdef>Window <function>XCreateSimpleWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1676,7 +1676,7 @@ To destroy a window and all of its subwindows, use
 <function>XDestroyWindow</function>.
 <indexterm significance="preferred"><primary>XDestroyWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroywindow'>
 <funcprototype>
   <funcdef><function>XDestroyWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1746,7 +1746,7 @@ To destroy all subwindows of a specified window, use
 <function>XDestroySubwindows</function>.
 <indexterm significance="preferred"><primary>XDestroySubwindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroysubwindows'>
 <funcprototype>
   <funcdef><function>XDestroySubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1889,7 +1889,7 @@ To map a given window, use
 <function>XMapWindow</function>.
 <indexterm significance="preferred"><primary>XMapWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmapwindow'>
 <funcprototype>
   <funcdef><function>XMapWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2015,7 +2015,7 @@ To map and raise a window, use
 <function>XMapRaised</function>.
 <indexterm significance="preferred"><primary>XMapRaised</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmapraised'>
 <funcprototype>
   <funcdef><function>XMapRaised</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2075,7 +2075,7 @@ To map all subwindows for a specified window, use
 <function>XMapSubwindows</function>.
 <indexterm significance="preferred"><primary>XMapSubwindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmapsubwindows'>
 <funcprototype>
   <funcdef><function>XMapSubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2145,7 +2145,7 @@ To unmap a window, use
 <function>XUnmapWindow</function>.
 <indexterm significance="preferred"><primary>XUnmapWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunmapwindow'>
 <funcprototype>
   <funcdef><function>XUnmapWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2212,7 +2212,7 @@ To unmap all subwindows for a specified window, use
 <function>XUnmapSubwindows</function>.
 <indexterm significance="preferred"><primary>XUnmapSubwindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunmapsubwindow'>
 <funcprototype>
   <funcdef><function>XUnmapSubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2517,7 +2517,7 @@ To configure a window's size, location, stacking, or border, use
 <function>XConfigureWindow</function>.
 <indexterm significance="preferred"><primary>XConfigureWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xconfigurewindow'>
 <funcprototype>
   <funcdef><function>XConfigureWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2623,7 +2623,7 @@ To move a window without changing its size, use
 <function>XMoveWindow</function>.
 <indexterm significance="preferred"><primary>XMoveWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmovewindow'>
 <funcprototype>
   <funcdef><function>XMoveWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2725,7 +2725,7 @@ To change a window's size without changing the upper-left coordinate, use
 <function>XResizeWindow</function>.
 <indexterm significance="preferred"><primary>XResizeWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xresizewindow'>
 <funcprototype>
   <funcdef><function>XResizeWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2828,7 +2828,7 @@ To change the size and location of a window, use
 <function>XMoveResizeWindow</function>.
 <indexterm significance="preferred"><primary>XMoveResizeWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmoveresizewindow'>
 <funcprototype>
   <funcdef><function>XMoveResizeWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2949,7 +2949,7 @@ To change the border width of a given window, use
 <function>XSetWindowBorderWidth</function>.
 <indexterm significance="preferred"><primary>XSetWindowBorderWidth</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwindowborderwidth'>
 <funcprototype>
   <funcdef><function>XSetWindowBorderWidth</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3026,7 +3026,7 @@ To raise a window so that no sibling window obscures it, use
 <function>XRaiseWindow</function>.
 <indexterm significance="preferred"><primary>XRaiseWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xraisewindow'>
 <funcprototype>
   <funcdef><function>XRaiseWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3099,7 +3099,7 @@ To lower a window so that it does not obscure any sibling windows, use
 <function>XLowerWindow</function>.
 <indexterm significance="preferred"><primary>XLowerWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlowerwindow'>
 <funcprototype>
   <funcdef><function>XLowerWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3173,7 +3173,7 @@ To circulate a subwindow up or down, use
 <function>XCirculateSubwindows</function>.
 <indexterm significance="preferred"><primary>XCirculateSubwindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcirculatesubwindows'>
 <funcprototype>
   <funcdef><function>XCirculateSubwindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3265,7 +3265,7 @@ occluded by another child, use
 <function>XCirculateSubwindowsUp</function>.
 <indexterm significance="preferred"><primary>XCirculateSubwindowsUp</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcirculatesubwindowsup'>
 <funcprototype>
   <funcdef><function>XCirculateSubwindowsUp</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3327,7 +3327,7 @@ completely occludes another child, use
 <function>XCirculateSubwindowsDown</function>.
 <indexterm significance="preferred"><primary>XCirculateSubwindowsDown</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcirculatesubwindowsdown'>
 <funcprototype>
   <funcdef><function>XCirculateSubwindowsDown</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3386,7 +3386,7 @@ To restack a set of windows from top to bottom, use
 <function>XRestackWindows</function>.
 <indexterm significance="preferred"><primary>XRestackWindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrestackwindows'>
 <funcprototype>
   <funcdef><function>XRestackWindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3491,7 +3491,7 @@ To change one or more attributes for a given window, use
 <function>XChangeWindowAttributes</function>.
 <indexterm significance="preferred"><primary>XChangeWindowAttributes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangewindowattributes'>
 <funcprototype>
   <funcdef><function>XChangeWindowAttributes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3649,7 +3649,7 @@ To set the background of a window to a given pixel, use
 <function>XSetWindowBackground</function>.
 <indexterm significance="preferred"><primary>XSetWindowBackground</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwindowbackground'>
 <funcprototype>
   <funcdef><function>XSetWindowBackground</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3726,7 +3726,7 @@ To set the background of a window to a given pixmap, use
 <indexterm><primary>Window</primary><secondary>background</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSetWindowBackgroundPixmap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwindowbackgroundpixmap'>
 <funcprototype>
   <funcdef><function>XSetWindowBackgroundPixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3818,7 +3818,7 @@ To change and repaint a window's border to a given pixel, use
 <function>XSetWindowBorder</function>.
 <indexterm significance="preferred"><primary>XSetWindowBorder</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwindowborder'>
 <funcprototype>
   <funcdef><function>XSetWindowBorder</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3888,7 +3888,7 @@ To change and repaint the border tile of a given window, use
 <function>XSetWindowBorderPixmap</function>.
 <indexterm significance="preferred"><primary>XSetWindowBorderPixmap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwindowborderpixmap'>
 <funcprototype>
   <funcdef><function>XSetWindowBorderPixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3967,7 +3967,7 @@ To set the colormap of a given window, use
 <function>XSetWindowColormap</function>.
 <indexterm significance="preferred"><primary>XSetWindowColormap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwindowcolormap'>
 <funcprototype>
   <funcdef><function>XSetWindowColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4038,7 +4038,7 @@ To define which cursor will be used in a window, use
 <indexterm><primary>Window</primary><secondary>defining the cursor</secondary></indexterm>
 <indexterm significance="preferred"><primary>XDefineCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdefinecursor'>
 <funcprototype>
   <funcdef><function>XDefineCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4107,7 +4107,7 @@ To undefine the cursor in a given window, use
 <indexterm><primary>Window</primary><secondary>undefining the cursor</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUndefineCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xundefinecursor'>
 <funcprototype>
   <funcdef><function>XUndefineCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH04.xml b/specs/libX11/CH04.xml
index 8a3e8c5..d224216 100644
--- a/specs/libX11/CH04.xml
+++ b/specs/libX11/CH04.xml
@@ -40,7 +40,7 @@ a given window, use
 <indexterm><primary>Parent Window</primary></indexterm>
 <indexterm significance="preferred"><primary>XQueryTree</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerytree'>
 <funcprototype>
   <funcdef>Status <function>XQueryTree</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -147,7 +147,7 @@ To obtain the current attributes of a given window, use
 <function>XGetWindowAttributes</function>.
 <indexterm significance="preferred"><primary>XGetWindowAttributes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwindowattributes'>
 <funcprototype>
   <funcdef>Status <function>XGetWindowAttributes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -372,7 +372,7 @@ To obtain the current geometry of a given drawable, use
 <function>XGetGeometry</function>.
 <indexterm significance="preferred"><primary>XGetGeometry</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetgeometry'>
 <funcprototype>
   <funcdef>Status <function>XGetGeometry</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -533,7 +533,7 @@ space of another window, use
 <function>XTranslateCoordinates</function>.
 <indexterm significance="preferred"><primary>XTranslateCoordinates</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xtranslatecoordinates'>
 <funcprototype>
   <funcdef>Bool <function>XTranslateCoordinates</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -667,7 +667,7 @@ or to determine the pointer coordinates relative to a specified window, use
 <function>XQueryPointer</function>.
 <indexterm significance="preferred"><primary>XQueryPointer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerypointer'>
 <funcprototype>
   <funcdef>Bool <function>XQueryPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1050,7 +1050,7 @@ To return an atom for a given name, use
 <indexterm><primary>Atom</primary><secondary>interning</secondary></indexterm>
 <indexterm significance="preferred"><primary>XInternAtom</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xinternatom'>
 <funcprototype>
   <funcdef>Atom <function>XInternAtom</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1132,7 +1132,7 @@ To return atoms for an array of names, use
 <indexterm><primary>Atom</primary><secondary>interning</secondary></indexterm>
 <indexterm significance="preferred"><primary>XInternAtoms</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xinternatoms'>
 <funcprototype>
   <funcdef>Status <function>XInternAtoms</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1233,7 +1233,7 @@ To return a name for a given atom identifier, use
 <indexterm><primary>Atom</primary><secondary>getting name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGetAtomName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetatomname'>
 <funcprototype>
   <funcdef>char *<function>XGetAtomName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1292,7 +1292,7 @@ To return the names for an array of atom identifiers, use
 <indexterm><primary>Atom</primary><secondary>getting name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGetAtomNames</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetatomnames'>
 <funcprototype>
   <funcdef>Status <function>XGetAtomNames</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1409,7 +1409,7 @@ To obtain the type, format, and value of a property of a given window, use
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XGetWindowProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwindowproperty'>
 <funcprototype>
   <funcdef>int <function>XGetWindowProperty</function></funcdef>
   <paramdef><parameter> display</parameter></paramdef>
@@ -1689,7 +1689,7 @@ To obtain a given window's property list, use
 <indexterm><primary>Property</primary><secondary>listing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XListProperties</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlistproperties'>
 <funcprototype>
   <funcdef>Atom *<function>XListProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1762,7 +1762,7 @@ To change a property of a given window, use
 <indexterm><primary>Property</primary><secondary>type</secondary></indexterm>
 <indexterm significance="preferred"><primary>XChangeProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangeproperty'>
 <funcprototype>
   <funcdef><function>XChangeProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1963,7 +1963,7 @@ To rotate a window's property list, use
 <!-- .LP -->
 <indexterm significance="preferred"><primary>XRotateWindowProperties</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrotatewindowproperties'>
 <funcprototype>
   <funcdef><function>XRotateWindowProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2077,7 +2077,7 @@ To delete a property on a given window, use
 <indexterm><primary>Property</primary><secondary>deleting</secondary></indexterm>
 <indexterm significance="preferred"><primary>XDeleteProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdeleteproperty'>
 <funcprototype>
   <funcdef><function>XDeleteProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2200,7 +2200,7 @@ To set the selection owner, use
 <indexterm><primary>Selection</primary><secondary>setting the owner</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSetSelectionOwner</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetselectionowner'>
 <funcprototype>
   <funcdef><function>XSetSelectionOwner</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2323,7 +2323,7 @@ To return the selection owner, use
 <indexterm><primary>Selection</primary><secondary>getting the owner</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGetSelectionOwner</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetselectionowner'>
 <funcprototype>
   <funcdef>Window <function>XGetSelectionOwner</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2385,7 +2385,7 @@ To request conversion of a selection, use
 <indexterm><primary>Selection</primary><secondary>converting</secondary></indexterm>
 <indexterm significance="preferred"><primary>XConvertSelection</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xconvertselection'>
 <funcprototype>
   <funcdef><function>XConvertSelection</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH05.xml b/specs/libX11/CH05.xml
index c5dcdca..3ad7076 100644
--- a/specs/libX11/CH05.xml
+++ b/specs/libX11/CH05.xml
@@ -24,7 +24,7 @@ To create a pixmap of a given size, use
 <function>XCreatePixmap</function>.
 <indexterm significance="preferred"><primary>XCreatePixmap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatepixmap'>
 <funcprototype>
   <funcdef>Pixmap <function>XCreatePixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -136,7 +136,7 @@ To free all storage associated with a specified pixmap, use
 <function>XFreePixmap</function>.
 <indexterm significance="preferred"><primary>XFreePixmap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreepixmap'>
 <funcprototype>
   <funcdef><function>XFreePixmap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -228,7 +228,7 @@ To create a cursor from the standard cursor font, use
 
 <indexterm significance="preferred"><primary>XCreateFontCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatefontcursor'>
 <funcprototype>
   <funcdef>Cursor <function>XCreateFontCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -295,7 +295,7 @@ To create a cursor from font glyphs, use
 <function>XCreateGlyphCursor</function>.
 <indexterm significance="preferred"><primary>XCreateGlyphCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreateglyphcursor'>
 <funcprototype>
   <funcdef>Cursor <function>XCreateGlyphCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -434,7 +434,7 @@ use
 <function>XCreatePixmapCursor</function>.
 <indexterm significance="preferred"><primary>XCreatePixmapCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatepixmapcursor'>
 <funcprototype>
   <funcdef>Cursor <function>XCreatePixmapCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -581,7 +581,7 @@ To determine useful cursor sizes, use
 <function>XQueryBestCursor</function>.
 <indexterm significance="preferred"><primary>XQueryBestCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerybestcursor'>
 <funcprototype>
   <funcdef>Status <function>XQueryBestCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -686,7 +686,7 @@ To change the color of a given cursor, use
 <function>XRecolorCursor</function>.
 <indexterm significance="preferred"><primary>XRecolorCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrecolorcursor'>
 <funcprototype>
   <funcdef><function>XRecolorCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -764,7 +764,7 @@ To free (destroy) a given cursor, use
 <function>XFreeCursor</function>.
 <indexterm significance="preferred"><primary>XFreeCursor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreecursor'>
 <funcprototype>
   <funcdef><function>XFreeCursor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH06.xml b/specs/libX11/CH06.xml
index 832a410..74b04af 100644
--- a/specs/libX11/CH06.xml
+++ b/specs/libX11/CH06.xml
@@ -814,7 +814,7 @@ To create a colormap for a screen, use
 <function>XCreateColormap</function>.</para>
 <indexterm significance="preferred"><primary>XCreateColormap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatecolormap'>
 <funcprototype>
   <funcdef>Colormap <function>XCreateColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -963,7 +963,7 @@ shared colormap has failed because of resource exhaustion, use
 <function>XCopyColormapAndFree</function>.
 <indexterm significance="preferred"><primary>XCopyColormapAndFree</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcopycolormapandfree'>
 <funcprototype>
   <funcdef>Colormap <function>XCopyColormapAndFree</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1040,7 +1040,7 @@ To destroy a colormap, use
 <indexterm significance="preferred"><primary>XFreeColormap</primary></indexterm>
 </para>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreecolormap'>
 <funcprototype>
   <funcdef><function>XFreeColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1119,7 +1119,7 @@ To map a color name to an <acronym>RGB</acronym> value, use
 <indexterm significance="preferred"><primary>XLookupColor</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xlookupcolor'>
 <funcprototype>
   <funcdef>Status <function>XLookupColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1216,7 +1216,7 @@ To map a color name to the exact <acronym>RGB</acronym> value, use
 <indexterm><primary>Color</primary><secondary>naming</secondary></indexterm>
 <indexterm significance="preferred"><primary>XParseColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xparsecolor'>
 <funcprototype>
   <funcdef>Status <function>XParseColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1306,7 +1306,7 @@ To map a color name to a value in an arbitrary color space, use
 <indexterm><primary>Color</primary><secondary>naming</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsLookupColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmslookupcolor'>
 <funcprototype>
   <funcdef>Status <function>XcmsLookupColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1462,7 +1462,7 @@ To allocate a read-only color cell with an <acronym>RGB</acronym> value, use
 <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm>
 <indexterm significance="preferred"><primary>XAllocColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xalloccolor'>
 <funcprototype>
   <funcdef>Status <function>XAllocColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1552,7 +1552,7 @@ To allocate a read-only color cell with a color in arbitrary format, use
 <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsAllocColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsalloccolor'>
 <funcprototype>
   <funcdef>Status <function>XcmsAllocColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1657,7 +1657,7 @@ color supported by the hardware in <acronym>RGB</acronym> format, use
 <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm>
 <indexterm significance="preferred"><primary>XAllocNamedColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xallocnamedcolor'>
 <funcprototype>
   <funcdef>Status <function>XAllocNamedColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1762,7 +1762,7 @@ color supported by the hardware in an arbitrary format, use
 <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsAllocNamedColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsallocnamedcolor'>
 <funcprototype>
   <funcdef>Status <function>XcmsAllocNamedColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1911,7 +1911,7 @@ model, use
 <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm>
 <indexterm significance="preferred"><primary>XAllocColorCells</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xalloccolorcells'>
 <funcprototype>
   <funcdef>Status <function>XAllocColorCells</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2065,7 +2065,7 @@ model, use
 <indexterm><primary>Color</primary><secondary>allocation</secondary></indexterm>
 <indexterm significance="preferred"><primary>XAllocColorPlanes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xalloccolorplanes'>
 <funcprototype>
   <funcdef>Status <function>XAllocColorPlanes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2267,7 +2267,7 @@ To free colormap cells, use
 <indexterm><primary>Color</primary><secondary>deallocation</secondary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xfreecolors'>
 <funcprototype>
   <funcdef><function>XFreeColors</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2408,7 +2408,7 @@ To store an <acronym>RGB</acronym> value in a single colormap cell, use
 <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XStoreColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstorecolor'>
 <funcprototype>
   <funcdef><function>XStoreColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2500,7 +2500,7 @@ To store multiple <acronym>RGB</acronym> values in multiple colormap cells, use
 <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XStoreColors</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstorecolors'>
 <funcprototype>
   <funcdef><function>XStoreColors</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2606,7 +2606,7 @@ To store a color of arbitrary format in a single colormap cell, use
 <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsStoreColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsstorecolor'>
 <funcprototype>
   <funcdef>Status <function>XcmsStoreColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2717,7 +2717,7 @@ To store multiple colors of arbitrary format in multiple colormap cells, use
 <indexterm><primary>Color</primary><secondary>storing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsStoreColors</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsstorecolors'>
 <funcprototype>
   <funcdef>Status <function>XcmsStoreColors</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2862,7 +2862,7 @@ To store a color specified by name in a single colormap cell, use
 <indexterm><primary>Color</primary><secondary>naming</secondary></indexterm>
 <indexterm significance="preferred"><primary>XStoreNamedColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstorenamedcolor'>
 <funcprototype>
   <funcdef><function>XStoreNamedColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2992,7 +2992,7 @@ To query the <acronym>RGB</acronym> value of a single colormap cell, use
 <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm>
 <indexterm significance="preferred"><primary>XQueryColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerycolor'>
 <funcprototype>
   <funcdef><function>XQueryColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3066,7 +3066,7 @@ To query the <acronym>RGB</acronym> values of multiple colormap cells, use
 <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm>
 <indexterm significance="preferred"><primary>XQueryColors</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerycolors'>
 <funcprototype>
   <funcdef><function>XQueryColors</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3156,7 +3156,7 @@ To query the color of a single colormap cell in an arbitrary format, use
 <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsQueryColor</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsquerycolor'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryColor</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3245,7 +3245,7 @@ To query the color of multiple colormap cells in an arbitrary format, use
 <indexterm><primary>Color</primary><secondary>querying</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsQueryColors</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsquerycolors'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryColors</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3404,7 +3404,7 @@ To obtain the CCC associated with a colormap, use
 <indexterm><primary>CCC</primary><secondary>of colormap</secondary></indexterm>
 <indexterm><primary>Color Conversion Context</primary><secondary>of colormap</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscccofcolormap'>
 <funcprototype>
   <funcdef>XcmsCCC <function>XcmsCCCOfColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3459,7 +3459,7 @@ To change the CCC associated with a colormap, use
 <indexterm><primary>CCC</primary><secondary>of colormap</secondary></indexterm>
 <indexterm><primary>Color Conversion Context</primary><secondary>of colormap</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmssetcccofcolormap'>
 <funcprototype>
   <funcdef>XcmsCCC <function>XcmsSetCCCOfColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3539,7 +3539,7 @@ To obtain the default CCC for a screen, use
 <indexterm><primary>Color Conversion Context</primary><secondary>default</secondary></indexterm>
 <indexterm><primary>CCC</primary><secondary>default</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsdefaultccc'>
 <funcprototype>
   <funcdef>XcmsCCC <function>XcmsDefaultCCC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3601,14 +3601,14 @@ can return.
 <indexterm significance="preferred"><primary>XcmsDisplayOfCCC</primary></indexterm>
 <!-- .sM -->
 
-<funcsynopsis>
+<funcsynopsis id='displayofccc'>
 <funcprototype>
   <funcdef><function>DisplayOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 
-<funcsynopsis>
+<funcsynopsis id='xcmddisplayofccc'>
 <funcprototype>
   <funcdef>Display *<function>XcmsDisplayOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3638,14 +3638,14 @@ Both return the display associated with the specified CCC.
 <indexterm significance="preferred"><primary>VisualOfCCC</primary></indexterm>
 <indexterm significance="preferred"><primary>XcmsVisualOfCCC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='visualofccc'>
 <funcprototype>
   <funcdef><function>VisualOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 
-<funcsynopsis>
+<funcsynopsis id='xcmsvisualofccc'>
 <funcprototype>
   <funcdef>Visual *<function>XcmsVisualOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3675,14 +3675,14 @@ Both return the visual associated with the specified CCC.
 <indexterm significance="preferred"><primary>ScreenNumberOfCCC</primary></indexterm>
 <indexterm significance="preferred"><primary>XcmsScreenNumberOfCCC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='screennumberofccc'>
 <funcprototype>
   <funcdef><function>ScreenNumberOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 
-<funcsynopsis>
+<funcsynopsis id='xcmsscreennumberofccc'>
 <funcprototype>
   <funcdef>int <function>XcmsScreenNumberOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3712,13 +3712,13 @@ Both return the number of the screen associated with the specified CCC.
 <indexterm significance="preferred"><primary>ScreenWhitePointOfCCC</primary></indexterm>
 <indexterm significance="preferred"><primary>XcmsScreenWhitePointOfCCC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='screenwhitepointofccc'>
 <funcprototype>
   <funcdef><function>ScreenWhitePointOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
-<funcsynopsis>
+<funcsynopsis id='xcmsscreenwhitepointofccc'>
 <funcprototype>
   <funcdef>XcmsColor <function>XcmsScreenWhitePointOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3748,14 +3748,14 @@ Both return the white point of the screen associated with the specified CCC.
 <indexterm significance="preferred"><primary>ClientWhitePointOfCCC</primary></indexterm>
 <indexterm significance="preferred"><primary>XcmsClientWhitePointOfCCC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='clientwhitepointofccc'>
 <funcprototype>
   <funcdef> <function>ClientWhitePointOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 
-<funcsynopsis>
+<funcsynopsis id='xcmsclientwhitepointofccc'>
 <funcprototype>
   <funcdef>XcmsColor *<function>XcmsClientWhitePointOfCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3795,7 +3795,7 @@ To set the Client White Point in the CCC, use
 <indexterm significance="preferred"><primary>XcmsSetWhitePoint</primary></indexterm>
 <indexterm><primary>Client White Point</primary><secondary>of Color Conversion Context</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmssetwhitepoint'>
 <funcprototype>
   <funcdef>Status <function>XcmsSetWhitePoint</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3866,7 +3866,7 @@ in a specified CCC, use
 <indexterm><primary>Gamut compression</primary><secondary>procedure</secondary></indexterm>
 <indexterm><primary>Gamut compression</primary><secondary>client data</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmssetcompressionproc'>
 <funcprototype>
   <funcdef>XcmsCompressionProc <function>XcmsSetCompressionProc</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -3935,7 +3935,7 @@ in a specified CCC, use
 <indexterm><primary>White point adjustment</primary><secondary>setting in Color Conversion Context</secondary></indexterm>
 <indexterm><primary>White point adjustment</primary><secondary>procedure</secondary></indexterm>
 <indexterm><primary>White point adjustment</primary><secondary>client data</secondary></indexterm>
-<funcsynopsis>
+<funcsynopsis id='xcmssetwhiteadjustproc'>
 <funcprototype>
   <funcdef>XcmsWhiteAdjustProc <function>XcmsSetWhiteAdjustProc</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -4012,7 +4012,7 @@ To create a CCC, use
 <indexterm><primary>Color Conversion Context</primary><secondary>creation</secondary></indexterm>
 <indexterm><primary>CCC</primary><secondary>creation</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscreateccc'>
 <funcprototype>
   <funcdef>XcmsCCC <function>XcmsCreateCCC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4139,7 +4139,7 @@ To free a CCC, use
 <indexterm><primary>Color Conversion Context</primary><secondary>freeing</secondary></indexterm>
 <indexterm><primary>CCC</primary><secondary>freeing</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsfreeccc'>
 <funcprototype>
   <funcdef>void <function>XcmsFreeCCC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -4186,7 +4186,7 @@ to a single destination format, use
 <indexterm><primary>Color</primary><secondary>conversion</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsConvertColors</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsconvertcolors'>
 <funcprototype>
   <funcdef>Status <function>XcmsConvertColors</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -4330,7 +4330,7 @@ following:
 </para>
 <indexterm significance="preferred"><primary>XcmsCompressionProc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscompressionproc'>
 <funcprototype>
   <funcdef>typedef Status<function>(*XcmsCompressionProc</function>)</funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -4657,7 +4657,7 @@ The white point adjustment procedure interface must adhere to the following:
 </para>
 <indexterm significance="preferred"><primary>XcmsWhiteAdjustProc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmswhiteadjustproc'>
 <funcprototype>
   <funcdef>typedef Status <function>(*XcmsWhiteAdjustProc</function>)</funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5020,7 +5020,7 @@ To obtain the color specification for black
 </para>
 <indexterm significance="preferred"><primary>XcmsQueryBlack</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsqueryblack'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryBlack</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5086,7 +5086,7 @@ To obtain the color specification for blue
 </para>
 <indexterm significance="preferred"><primary>XcmsQueryBlue</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsqueryblue'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryBlue</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5152,7 +5152,7 @@ To obtain the color specification for green
 </para>
 <indexterm significance="preferred"><primary>XcmsQueryGreen</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsquerygreen'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryGreen</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5218,7 +5218,7 @@ To obtain the color specification for red
 </para>
 <indexterm significance="preferred"><primary>XcmsQueryRed</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsqueryred'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryRed</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5284,7 +5284,7 @@ To obtain the color specification for white
 </para>
 <indexterm significance="preferred"><primary>XcmsQueryWhite</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsquerywhite'>
 <funcprototype>
   <funcdef>Status <function>XcmsQueryWhite</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5372,7 +5372,7 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness (
 </para>
 <indexterm significance="preferred"><primary>XcmsCIELabQueryMaxC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscielabquerymaxc'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELabQueryMaxC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5456,7 +5456,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsCIELabQueryMaxL</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscielabquerymaxl'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELabQueryMaxL</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5547,7 +5547,7 @@ for a given Psychometric Hue Angle, use
 <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsCIELabQueryMaxLC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscielabquerymaxlc'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELabQueryMaxLC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5619,7 +5619,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>minimum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsCIELabQueryMinL</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscielabqueryminl'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELabQueryMinL</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5729,7 +5729,7 @@ for a given Psychometric Hue Angle and <acronym>CIE</acronym> metric lightness (
 </para>
 <indexterm significance="preferred"><primary>XcmsCIELuvQueryMaxC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscieluvquerymaxc'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELuvQueryMaxC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5813,7 +5813,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsCIELuvQueryMaxL</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscieluvquerymaxl'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELuvQueryMaxL</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5904,7 +5904,7 @@ for a given Psychometric Hue Angle, use
 <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsCIELuvQueryMaxLC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscieluvquerymaxlc'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELuvQueryMaxLC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -5976,7 +5976,7 @@ for a given Psychometric Hue Angle and Psychometric Chroma, use
 <indexterm><primary><acronym>CIE</acronym> metric lightness</primary><secondary>minimum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsCIELuvQueryMinL</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmscieluvqueryminl'>
 <funcprototype>
   <funcdef>Status <function>XcmsCIELuvQueryMinL</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -6067,7 +6067,7 @@ To obtain the maximum Chroma for a given Hue and Value, use
 <indexterm><primary>Chroma</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmstekhvcquerymaxc'>
 <funcprototype>
   <funcdef>Status <function>XcmsTekHVCQueryMaxC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -6150,7 +6150,7 @@ To obtain the maximum Value for a given Hue and Chroma, use
 <indexterm><primary>Value</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxV</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmstekhvcquerymaxv'>
 <funcprototype>
   <funcdef>Status <function>XcmsTekHVCQueryMaxV</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -6237,7 +6237,7 @@ for a specified Hue, use
 <indexterm><primary>Value</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxVC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmstekhvcquerymaxvc'>
 <funcprototype>
   <funcdef>Status <function>XcmsTekHVCQueryMaxVC</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -6315,7 +6315,7 @@ Chroma at which the maximum Values are reached, use
 <indexterm><primary>Value</primary><secondary>maximum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsTekHVCQueryMaxVSamples</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmstekhvcquerymaxvsamples'>
 <funcprototype>
   <funcdef>Status <function>XcmsTekHVCQueryMaxVSamples</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -6396,7 +6396,7 @@ To obtain the minimum Value for a given Hue and Chroma, use
 <indexterm><primary>Value</primary><secondary>minimum</secondary></indexterm>
 <indexterm significance="preferred"><primary>XcmsTekHVCQueryMinV</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmstekhvcqueryminv'>
 <funcprototype>
   <funcdef>Status <function>XcmsTekHVCQueryMinV</function></funcdef>
   <paramdef>XcmsCCC<parameter> ccc</parameter></paramdef>
@@ -6554,7 +6554,7 @@ To add a device-independent color space, use
 </para>
 <indexterm significance="preferred"><primary>XcmsAddColorSpace</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsaddcolorspace'>
 <funcprototype>
   <funcdef>Status <function>XcmsAddColorSpace</function></funcdef>
   <paramdef>XcmsColorSpace<parameter> *color_space</parameter></paramdef>
@@ -6622,7 +6622,7 @@ associated with a specified color string prefix, use
 </para>
 <indexterm significance="preferred"><primary>XcmsFormatOfPrefix</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsformatofprefix'>
 <funcprototype>
   <funcdef>XcmsColorFormat <function>XcmsFormatOfPrefix</function></funcdef>
   <paramdef>char<parameter> *prefix</parameter></paramdef>
@@ -6664,7 +6664,7 @@ specified by a color format, use
 </para>
 <indexterm significance="preferred"><primary>XcmsPrefixOfFormat</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsprefixofformat'>
 <funcprototype>
   <funcdef>char *<function>XcmsPrefixOfFormat</function></funcdef>
   <paramdef>XcmsColorFormat<parameter> format</parameter></paramdef>
@@ -6808,7 +6808,7 @@ adhere to the following software interface specification:
 </para>
 <indexterm significance="preferred"><primary>XcmsParseStringProc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsparsestringproc'>
 <funcprototype>
   <funcdef>Status <function>XcmsParseStringProc</function></funcdef>
   <paramdef>char<parameter> *color_string</parameter></paramdef>
@@ -7130,7 +7130,7 @@ To add a function set, use
 </para>
 <indexterm significance="preferred"><primary>XcmsAddFunctionSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcmsaddfunctionset'>
 <funcprototype>
   <funcdef>Status <function>XcmsAddFunctionSet</function></funcdef>
   <paramdef>XcmsFunctionSet<parameter> *function_set</parameter></paramdef>
@@ -7260,7 +7260,7 @@ interface specification:
 <indexterm significance="preferred"><primary>XcmsScreenInitProc</primary></indexterm>
 <!-- .sM -->
 </para>
-<funcsynopsis>
+<funcsynopsis id='xcmsscreeninitproc'>
 <funcprototype>
   <funcdef>typedef Status <function>(*XcmsScreenInitProc</function>)</funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -7414,7 +7414,7 @@ indicates initialization has been previously attempted and succeeded.
 The screen free callback must adhere to the following software
 interface specification:
 </para>
-<funcsynopsis>
+<funcsynopsis id='xcmsscreenfreeproc'>
 <funcprototype>
   <funcdef>typedef void (*XcmsScreenFreeProc)</funcdef>
   <paramdef>XPointer<parameter> screenData</parameter></paramdef>
diff --git a/specs/libX11/CH07.xml b/specs/libX11/CH07.xml
index 201680d..0af3d19 100644
--- a/specs/libX11/CH07.xml
+++ b/specs/libX11/CH07.xml
@@ -965,7 +965,7 @@ depth of drawable, use
 <indexterm><primary>Graphics context</primary><secondary>initializing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XCreateGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreategc'>
 <funcprototype>
   <funcdef>GC <function>XCreateGC</function></funcdef>
   <paramdef>Display <parameter> *display</parameter></paramdef>
@@ -1053,7 +1053,7 @@ To copy components from a source GC to a destination GC, use
 <function>XCopyGC</function>.
 <indexterm significance="preferred"><primary>XCopyGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcopygc'>
 <funcprototype>
   <funcdef><function>XCopyGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1139,7 +1139,7 @@ To change the components in a given GC, use
 <function>XChangeGC</function>.
 <indexterm significance="preferred"><primary>XChangeGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangegc'>
 <funcprototype>
   <funcdef><function>XChangeGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1235,7 +1235,7 @@ To obtain components of a given GC, use
 <function>XGetGCValues</function>.
 <indexterm significance="preferred"><primary>XGetGCValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetgcvalues'>
 <funcprototype>
   <funcdef>Status <function>XGetGCValues</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1347,7 +1347,7 @@ To free a given GC, use
 <function>XFreeGC</function>.
 <indexterm significance="preferred"><primary>XFreeGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreegc'>
 <funcprototype>
   <funcdef><function>XFreeGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1401,7 +1401,7 @@ resource ID for a given GC, use
 <function>XGContextFromGC</function>.
 <indexterm significance="preferred"><primary>XGContextFromGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgcontextfromgc'>
 <funcprototype>
   <funcdef>GContext <function>XGContextFromGC</function></funcdef>
   <paramdef>GC<parameter> gc</parameter></paramdef>
@@ -1437,7 +1437,7 @@ To force sending GC component changes, use
 <function>XFlushGC</function>.
 <indexterm significance="preferred"><primary>XFlushGC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xflushgc'>
 <funcprototype>
   <funcdef>void <function>XFlushGC</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1531,7 +1531,7 @@ for a given GC, use
 <function>XSetState</function>.
 <indexterm significance="preferred"><primary>XSetState</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetstate'>
 <funcprototype>
   <funcdef><function>XSetState</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1624,7 +1624,7 @@ To set the foreground of a given GC, use
 <function>XSetForeground</function>.
 <indexterm significance="preferred"><primary>XSetForeground</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetforeground'>
 <funcprototype>
   <funcdef><function>XSetForeground</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1683,7 +1683,7 @@ To set the background of a given GC, use
 <function>XSetBackground</function>.
 <indexterm significance="preferred"><primary>XSetBackground</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetbackground'>
 <funcprototype>
   <funcdef><function>XSetBackground</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1742,7 +1742,7 @@ To set the display function in a given GC, use
 <function>XSetFunction</function>.
 <indexterm significance="preferred"><primary>XSetFunction</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetfunction'>
 <funcprototype>
   <funcdef><function>XSetFunction</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1802,7 +1802,7 @@ To set the plane mask of a given GC, use
 <function>XSetPlaneMask</function>.
 <indexterm significance="preferred"><primary>XSetPlaneMask</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetplanemask'>
 <funcprototype>
   <funcdef><function>XSetPlaneMask</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1867,7 +1867,7 @@ To set the line drawing components of a given GC, use
 <function>XSetLineAttributes</function>.
 <indexterm significance="preferred"><primary>XSetLineAttributes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetlineattributes'>
 <funcprototype>
   <funcdef><function>XSetLineAttributes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1976,7 +1976,7 @@ To set the dash-offset and dash-list for dashed line styles of a given GC, use
 <function>XSetDashes</function>.
 <indexterm significance="preferred"><primary>XSetDashes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetdashes'>
 <funcprototype>
   <funcdef><function>XSetDashes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2105,7 +2105,7 @@ To set the fill-style of a given GC, use
 <function>XSetFillStyle</function>.
 <indexterm significance="preferred"><primary>XSetFillStyle</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetfillstyle'>
 <funcprototype>
   <funcdef><function>XSetFillStyle</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2171,7 +2171,7 @@ To set the fill-rule of a given GC, use
 <function>XSetFillRule</function>.
 <indexterm significance="preferred"><primary>XSetFillRule</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetfillrule'>
 <funcprototype>
   <funcdef><function>XSetFillRule</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2251,7 +2251,7 @@ To obtain the best size of a tile, stipple, or cursor, use
 <function>XQueryBestSize</function>.
 <indexterm significance="preferred"><primary>XQueryBestSize</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerybestsize'>
 <funcprototype>
   <funcdef>Status <function>XQueryBestSize</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2394,7 +2394,7 @@ To obtain the best fill tile shape, use
 <function>XQueryBestTile</function>.
 <indexterm significance="preferred"><primary>XQueryBestTile</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerybesttile'>
 <funcprototype>
   <funcdef>Status <function>XQueryBestTile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2500,7 +2500,7 @@ To obtain the best stipple shape, use
 <function>XQueryBestStipple</function>.
 <indexterm significance="preferred"><primary>XQueryBestStipple</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerybeststipple'>
 <funcprototype>
   <funcdef>Status <function>XQueryBestStipple</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2606,7 +2606,7 @@ To set the fill tile of a given GC, use
 <function>XSetTile</function>.
 <indexterm significance="preferred"><primary>XSetTile</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsettile'>
 <funcprototype>
   <funcdef><function>XSetTile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2674,7 +2674,7 @@ To set the stipple of a given GC, use
 <function>XSetStipple</function>.
 <indexterm significance="preferred"><primary>XSetStipple</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetstipple'>
 <funcprototype>
   <funcdef><function>XSetStipple</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2742,7 +2742,7 @@ To set the tile or stipple origin of a given GC, use
 <function>XSetTSOrigin</function>.
 <indexterm significance="preferred"><primary>XSetTSOrigin</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsettsorigin'>
 <funcprototype>
   <funcdef><function>XSetTSOrigin</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2823,7 +2823,7 @@ To set the current font of a given GC, use
 <function>XSetFont</function>.
 <indexterm significance="preferred"><primary>XSetFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetfont'>
 <funcprototype>
   <funcdef><function>XSetFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2894,7 +2894,7 @@ To set the clip-origin of a given GC, use
 <function>XSetClipOrigin</function>.
 <indexterm significance="preferred"><primary>XSetClipOrigin</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetcliporigin'>
 <funcprototype>
   <funcdef><function>XSetClipOrigin</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2969,7 +2969,7 @@ To set the clip-mask of a given GC to the specified pixmap, use
 <function>XSetClipMask</function>.
 <indexterm significance="preferred"><primary>XSetClipMask</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetclipmask'>
 <funcprototype>
   <funcdef><function>XSetClipMask</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3037,7 +3037,7 @@ To set the clip-mask of a given GC to the specified list of rectangles, use
 <function>XSetClipRectangles</function>.
 <indexterm significance="preferred"><primary>XSetClipRectangles</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetcliprectangles'>
 <funcprototype>
   <funcdef><function>XSetClipRectangles</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3211,7 +3211,7 @@ To set the arc mode of a given GC, use
 <function>XSetArcMode</function>.
 <indexterm significance="preferred"><primary>XSetArcMode</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetarcmode'>
 <funcprototype>
   <funcdef><function>XSetArcMode</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3275,7 +3275,7 @@ To set the subwindow mode of a given GC, use
 <function>XSetSubwindowMode</function>.
 <indexterm significance="preferred"><primary>XSetSubwindowMode</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetsubwindowmode'>
 <funcprototype>
   <funcdef><function>XSetSubwindowMode</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3339,7 +3339,7 @@ To set the graphics-exposures flag of a given GC, use
 <function>XSetGraphicsExposures</function>.
 <indexterm significance="preferred"><primary>XSetGraphicsExposures</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetgraphicsexposures'>
 <funcprototype>
   <funcdef><function>XSetGraphicsExposures</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH08.xml b/specs/libX11/CH08.xml
index 376f194..d43443a 100644
--- a/specs/libX11/CH08.xml
+++ b/specs/libX11/CH08.xml
@@ -43,7 +43,7 @@ To clear a rectangular area of a given window, use
 <indexterm><primary>Clearing</primary><secondary>areas</secondary></indexterm>
 <indexterm significance="preferred"><primary>XClearArea</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcleararea'>
 <funcprototype>
   <funcdef><function>XClearArea</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -185,7 +185,7 @@ To clear the entire area in a given window, use
 <indexterm><primary>Clearing</primary><secondary>windows</secondary></indexterm>
 <indexterm significance="preferred"><primary>XClearWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xclearwindow'>
 <funcprototype>
   <funcdef><function>XClearWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -269,7 +269,7 @@ root and depth, use
 <indexterm><primary>Copying</primary><secondary>areas</secondary></indexterm>
 <indexterm significance="preferred"><primary>XCopyArea</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcopyarea'>
 <funcprototype>
   <funcdef><function>XCopyArea</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -464,7 +464,7 @@ To copy a single bit plane of a given drawable, use
 <indexterm><primary>Copying</primary><secondary>planes</secondary></indexterm>
 <indexterm significance="preferred"><primary>XCopyPlane</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcopyplane'>
 <funcprototype>
   <funcdef><function>XCopyPlane</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -768,7 +768,7 @@ To draw a single point in a given drawable, use
 <function>XDrawPoint</function>.
 <indexterm significance="preferred"><primary>XDrawPoint</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawpoint'>
 <funcprototype>
   <funcdef><function>XDrawPoint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -840,7 +840,7 @@ To draw multiple points in a given drawable, use
 <function>XDrawPoints</function>.
 <indexterm significance="preferred"><primary>XDrawPoints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawpoints'>
 <funcprototype>
   <funcdef><function>XDrawPoints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -981,7 +981,7 @@ To draw a single line between two points in a given drawable, use
 <function>XDrawLine</function>.
 <indexterm significance="preferred"><primary>XDrawLine</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawline'>
 <funcprototype>
   <funcdef><function>XDrawLine</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1075,7 +1075,7 @@ To draw multiple lines in a given drawable, use
 <function>XDrawLines</function>.
 <indexterm significance="preferred"><primary>XDrawLines</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawlines'>
 <funcprototype>
   <funcdef><function>XDrawLines</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1163,7 +1163,7 @@ use
 <function>XDrawSegments</function>.
 <indexterm significance="preferred"><primary>XDrawSegments</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawsegments'>
 <funcprototype>
   <funcdef><function>XDrawSegments</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1333,7 +1333,7 @@ To draw the outline of a single rectangle in a given drawable, use
 <function>XDrawRectangle</function>.
 <indexterm significance="preferred"><primary>XDrawRectangle</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawrectangle'>
 <funcprototype>
   <funcdef><function>XDrawRectangle</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1430,7 +1430,7 @@ in a given drawable, use
 <function>XDrawRectangles</function>.
 <indexterm significance="preferred"><primary>XDrawRectangles</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawrectangles'>
 <funcprototype>
   <funcdef><function>XDrawRectangles</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1564,7 +1564,7 @@ To draw a single arc in a given drawable, use
 <function>XDrawArc</function>.
 <indexterm significance="preferred"><primary>XDrawArc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawarc'>
 <funcprototype>
   <funcdef><function>XDrawArc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1684,7 +1684,7 @@ To draw multiple arcs in a given drawable, use
 <function>XDrawArcs</function>.
 <indexterm significance="preferred"><primary>XDrawArcs</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawarcs'>
 <funcprototype>
   <funcdef><function>XDrawArcs</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1922,7 +1922,7 @@ To fill a single rectangular area in a given drawable, use
 <function>XFillRectangle</function>.
 <indexterm significance="preferred"><primary>XFillRectangle</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfillrectangle'>
 <funcprototype>
   <funcdef><function>XFillRectangle</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2019,7 +2019,7 @@ To fill multiple rectangular areas in a given drawable, use
 <function>XFillRectangles</function>.
 <indexterm significance="preferred"><primary>XFillRectangles</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfillrectangles'>
 <funcprototype>
   <funcdef><function>XFillRectangles</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2154,7 +2154,7 @@ To fill a polygon area in a given drawable, use
 <indexterm><primary>Filling</primary><secondary>polygon</secondary></indexterm>
 <indexterm significance="preferred"><primary>XFillPolygon</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfillpolygon'>
 <funcprototype>
   <funcdef><function>XFillPolygon</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2353,7 +2353,7 @@ To fill a single arc in a given drawable, use
 <function>XFillArc</function>.
 <indexterm significance="preferred"><primary>XFillArc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfillarc'>
 <funcprototype>
   <funcdef><function>XFillArc</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2473,7 +2473,7 @@ To fill multiple arcs in a given drawable, use
 <function>XFillArcs</function>.
 <indexterm significance="preferred"><primary>XFillArcs</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfillarcs'>
 <funcprototype>
   <funcdef><function>XFillArcs</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3020,7 +3020,7 @@ To load a given font, use
 <function>XLoadFont</function>.
 <indexterm significance="preferred"><primary>XLoadFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xloadfont'>
 <funcprototype>
   <funcdef>Font <function>XLoadFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3096,7 +3096,7 @@ To return information about an available font, use
 <function>XQueryFont</function>.
 <indexterm significance="preferred"><primary>XQueryFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xqueryfont'>
 <funcprototype>
   <funcdef>XFontStruct *<function>XQueryFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3162,7 +3162,7 @@ in a single operation, use
 <function>XLoadQueryFont</function>.
 <indexterm significance="preferred"><primary>XLoadQueryFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xloadqueryfont'>
 <funcprototype>
   <funcdef>XFontStruct *<function>XLoadQueryFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3230,7 +3230,7 @@ use
 <function>XFreeFont</function>.
 <indexterm significance="preferred"><primary>XFreeFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreefont'>
 <funcprototype>
   <funcdef><function>XFreeFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3287,7 +3287,7 @@ To return a given font property, use
 <function>XGetFontProperty</function>.
 <indexterm significance="preferred"><primary>XGetFontProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetfontproperty'>
 <funcprototype>
   <funcdef>Bool <function>XGetFontProperty</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
@@ -3362,7 +3362,7 @@ use
 <function>XUnloadFont</function>.
 <indexterm significance="preferred"><primary>XUnloadFont</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunloadfont'>
 <funcprototype>
   <funcdef><function>XUnloadFont</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3427,7 +3427,7 @@ To return a list of the available font names, use
 <function>XListFonts</function>.
 <indexterm significance="preferred"><primary>XListFonts</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlistfonts'>
 <funcprototype>
   <funcdef>char **<function>XListFonts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3514,7 +3514,7 @@ To free a font name array, use
 <function>XFreeFontNames</function>.
 <indexterm significance="preferred"><primary>XFreeFontNames</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreefontnames'>
 <funcprototype>
   <funcdef><function>XFreeFontNames</function></funcdef>
   <paramdef>char<parameter> *list[]</parameter></paramdef>
@@ -3551,7 +3551,7 @@ To obtain the names and information about available fonts, use
 <function>XListFontsWithInfo</function>.
 <indexterm significance="preferred"><primary>XListFontsWithInfo</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlistfontswithinfo'>
 <funcprototype>
   <funcdef>char **<function>XListFontsWithInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3658,7 +3658,7 @@ To free font structures and font names, use
 <function>XFreeFontInfo</function>.
 <indexterm significance="preferred"><primary>XFreeFontInfo</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreefontinfo'>
 <funcprototype>
   <funcdef><function>XFreeFontInfo</function></funcdef>
   <paramdef>char<parameter> **names</parameter></paramdef>
@@ -3742,7 +3742,7 @@ To determine the width of an 8-bit character string, use
 <function>XTextWidth</function>.
 <indexterm significance="preferred"><primary>XTextWidth</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xtextwidth'>
 <funcprototype>
   <funcdef>int <function>XTextWidth</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
@@ -3792,7 +3792,7 @@ To determine the width of a 2-byte character string, use
 <function>XTextWidth16</function>.
 <indexterm significance="preferred"><primary>XTextWidth16</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xtextwidth16'>
 <funcprototype>
   <funcdef>int <function>XTextWidth16</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
@@ -3850,7 +3850,7 @@ To compute the bounding box of an 8-bit character string in a given font, use
 <function>XTextExtents</function>.
 <indexterm significance="preferred"><primary>XTextExtents</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xtextextents'>
 <funcprototype>
   <funcdef><function>XTextExtents</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
@@ -3950,7 +3950,7 @@ To compute the bounding box of a 2-byte character string in a given font, use
 <function>XTextExtents16</function>.
 <indexterm significance="preferred"><primary>XTextExtents16</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xtextextents16'>
 <funcprototype>
   <funcdef><function>XTextExtents16</function></funcdef>
   <paramdef>XFontStruct<parameter> *font_struct</parameter></paramdef>
@@ -4097,7 +4097,7 @@ given font, use
 <function>XQueryTextExtents</function>.
 <indexterm significance="preferred"><primary>XQueryTextExtents</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerytextextents'>
 <funcprototype>
   <funcdef><function>XQueryTextExtents</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4209,7 +4209,7 @@ in a given font, use
 <function>XQueryTextExtents16</function>.
 <indexterm significance="preferred"><primary>XQueryTextExtents16</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerytextextents16'>
 <funcprototype>
   <funcdef><function>XQueryTextExtents16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4482,7 +4482,7 @@ To draw 8-bit characters in a given drawable, use
 <function>XDrawText</function>.
 <indexterm significance="preferred"><primary>XDrawText</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawtext'>
 <funcprototype>
   <funcdef><function>XDrawText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4578,7 +4578,7 @@ To draw 2-byte characters in a given drawable, use
 <function>XDrawText16</function>.
 <indexterm significance="preferred"><primary>XDrawText16</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawtext16'>
 <funcprototype>
   <funcdef><function>XDrawText16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4738,7 +4738,7 @@ To draw 8-bit characters in a given drawable, use
 <function>XDrawString</function>.
 <indexterm significance="preferred"><primary>XDrawString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawstring'>
 <funcprototype>
   <funcdef><function>XDrawString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4834,7 +4834,7 @@ To draw 2-byte characters in a given drawable, use
 <function>XDrawString16</function>.
 <indexterm significance="preferred"><primary>XDrawString16</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawstring16'>
 <funcprototype>
   <funcdef><function>XDrawString16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4978,7 +4978,7 @@ To draw 8-bit image text characters in a given drawable, use
 <function>XDrawImageString</function>.
 <indexterm significance="preferred"><primary>XDrawImageString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawimagestring'>
 <funcprototype>
   <funcdef><function>XDrawImageString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5074,7 +5074,7 @@ To draw 2-byte image text characters in a given drawable, use
 <function>XDrawImageString16</function>.
 <indexterm significance="preferred"><primary>XDrawImageString16</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdrawimagestring16'>
 <funcprototype>
   <funcdef><function>XDrawImageString16</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5319,7 +5319,7 @@ To initialize the image manipulation routines of an image structure, use
 <function>XInitImage</function>.
 <indexterm significance="preferred"><primary>XInitImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xinitimage'>
 <funcprototype>
   <funcdef>Status <function>XInitImage</function></funcdef>
   <paramdef>XImage<parameter> *image</parameter></paramdef>
@@ -5377,7 +5377,7 @@ use
 <function>XPutImage</function>.
 <indexterm significance="preferred"><primary>XPutImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xputimage'>
 <funcprototype>
   <funcdef><function>XPutImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5566,7 +5566,7 @@ use
 This function specifically supports rudimentary screen dumps.
 <indexterm significance="preferred"><primary>XGetImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetimage'>
 <funcprototype>
   <funcdef>XImage *<function>XGetImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5753,7 +5753,7 @@ to a location within a preexisting image structure, use
 <function>XGetSubImage</function>.
 <indexterm significance="preferred"><primary>XGetSubImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetsubimage'>
 <funcprototype>
   <funcdef>XImage *<function>XGetSubImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH09.xml b/specs/libX11/CH09.xml
index 66d1bc3..49a34e2 100644
--- a/specs/libX11/CH09.xml
+++ b/specs/libX11/CH09.xml
@@ -34,7 +34,7 @@ To change a window's parent to another window on the same screen, use
 There is no way to move a window between screens.
 <indexterm significance="preferred"><primary>XReparentWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xreparentwindow'>
 <funcprototype>
   <funcdef><function>XReparentWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -218,7 +218,7 @@ To add or remove a window from the client's save-set, use
 <function>XChangeSaveSet</function>.
 <indexterm significance="preferred"><primary>XChangeSaveSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangesaveset'>
 <funcprototype>
   <funcdef><function>XChangeSaveSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -293,7 +293,7 @@ To add a window to the client's save-set, use
 <function>XAddToSaveSet</function>.
 <indexterm significance="preferred"><primary>XAddToSaveSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xaddtosaveset'>
 <funcprototype>
   <funcdef><function>XAddToSaveSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -352,7 +352,7 @@ To remove a window from the client's save-set, use
 <function>XRemoveFromSaveSet</function>.
 <indexterm significance="preferred"><primary>XRemoveFromSaveSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xremovefromsaveset'>
 <funcprototype>
   <funcdef><function>XRemoveFromSaveSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -449,7 +449,7 @@ To install a colormap, use
 <function>XInstallColormap</function>.
 <indexterm significance="preferred"><primary>XInstallColormap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xinstallcolormap'>
 <funcprototype>
   <funcdef><function>XInstallColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -522,7 +522,7 @@ To uninstall a colormap, use
 <function>XUninstallColormap</function>.
 <indexterm significance="preferred"><primary>XUninstallColormap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xuninstallcolormap'>
 <funcprototype>
   <funcdef><function>XUninstallColormap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -593,7 +593,7 @@ To obtain a list of the currently installed colormaps for a given screen, use
 <function>XListInstalledColormaps</function>.
 <indexterm significance="preferred"><primary>XListInstalledColormaps</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlistinstalledcolormaps'>
 <funcprototype>
   <funcdef>Colormap *<function>XListInstalledColormaps</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -675,7 +675,7 @@ To set the font search path, use
 <function>XSetFontPath</function>.
 <indexterm significance="preferred"><primary>XSetFontPath</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetfontpath'>
 <funcprototype>
   <funcdef><function>XSetFontPath</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -753,7 +753,7 @@ To get the current font search path, use
 <function>XGetFontPath</function>.
 <indexterm significance="preferred"><primary>XGetFontPath</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetfontpath'>
 <funcprototype>
   <funcdef>char **<function>XGetFontPath</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -805,7 +805,7 @@ use
 <function>XFreeFontPath</function>.
 <indexterm significance="preferred"><primary>XFreeFontPath</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreefontpath'>
 <funcprototype>
   <funcdef><function>XFreeFontPath</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
@@ -861,7 +861,7 @@ To grab the server, use
 <indexterm><primary>Grabbing</primary><secondary>server</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabServer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgrabserver'>
 <funcprototype>
   <funcdef><function>XGrabServer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -897,7 +897,7 @@ To ungrab the server, use
 <function>XUngrabServer</function>.
 <indexterm significance="preferred"><primary>XUngrabServer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xungrabserver'>
 <funcprototype>
   <funcdef><function>XUngrabServer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -939,7 +939,7 @@ To destroy a client, use
 <function>XKillClient</function>.
 <indexterm significance="preferred"><primary>XKillClient</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xkillclient'>
 <funcprototype>
   <funcdef><function>XKillClient</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1026,7 +1026,7 @@ To set the screen saver mode, use
 <function>XSetScreenSaver</function>.
 <indexterm significance="preferred"><primary>XSetScreenSaver</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetscreensaver'>
 <funcprototype>
   <funcdef><function>XSetScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1161,7 +1161,7 @@ To force the screen saver on or off, use
 <function>XForceScreenSaver</function>.
 <indexterm significance="preferred"><primary>XForceScreenSaver</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xforcescreensaver'>
 <funcprototype>
   <funcdef><function>XForceScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1227,7 +1227,7 @@ To activate the screen saver, use
 <function>XActivateScreenSaver</function>.
 <indexterm significance="preferred"><primary>XActivateScreenSaver</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xactivatescreensaver'>
 <funcprototype>
   <funcdef><function>XActivateScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1255,7 +1255,7 @@ To reset the screen saver, use
 <function>XResetScreenSaver</function>.
 <indexterm significance="preferred"><primary>XResetScreenSaver</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xresetscreensaver'>
 <funcprototype>
   <funcdef><function>XResetScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1283,7 +1283,7 @@ To get the current screen saver values, use
 <function>XGetScreenSaver</function>.
 <indexterm significance="preferred"><primary>XGetScreenSaver</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetscreensaver'>
 <funcprototype>
   <funcdef><function>XGetScreenSaver</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1530,7 +1530,7 @@ To add a single host, use
 <function>XAddHost</function>.
 <indexterm significance="preferred"><primary>XAddHost</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xaddhost'>
 <funcprototype>
   <funcdef><function>XAddHost</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1588,7 +1588,7 @@ To add multiple hosts at one time, use
 <function>XAddHosts</function>.
 <indexterm significance="preferred"><primary>XAddHosts</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xaddhosts'>
 <funcprototype>
   <funcdef><function>XAddHosts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1657,7 +1657,7 @@ To obtain a host list, use
 <function>XListHosts</function>.
 <indexterm significance="preferred"><primary>XListHosts</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlisthosts'>
 <funcprototype>
   <funcdef>XHostAddress *<function>XListHosts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1721,7 +1721,7 @@ To remove a single host, use
 <function>XRemoveHost</function>.
 <indexterm significance="preferred"><primary>XRemoveHost</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xremovehost'>
 <funcprototype>
   <funcdef><function>XRemoveHost</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1783,7 +1783,7 @@ To remove multiple hosts at one time, use
 <function>XRemoveHosts</function>.
 <indexterm significance="preferred"><primary>XRemoveHosts</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xremovehosts'>
 <funcprototype>
   <funcdef><function>XRemoveHosts</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1874,7 +1874,7 @@ To change access control, use
 <function>XSetAccessControl</function>.
 <indexterm significance="preferred"><primary>XSetAccessControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetaccesscontrol'>
 <funcprototype>
   <funcdef><function>XSetAccessControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1933,7 +1933,7 @@ To enable access control, use
 <function>XEnableAccessControl</function>.
 <indexterm significance="preferred"><primary>XEnableAccessControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xenableaccesscontrol'>
 <funcprototype>
   <funcdef><function>XEnableAccessControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1974,7 +1974,7 @@ To disable access control, use
 <function>XDisableAccessControl</function>.
 <indexterm significance="preferred"><primary>XDisableAccessControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdisableaccesscontrol'>
 <funcprototype>
   <funcdef><function>XDisableAccessControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH11.xml b/specs/libX11/CH11.xml
index ddbc095..817041d 100644
--- a/specs/libX11/CH11.xml
+++ b/specs/libX11/CH11.xml
@@ -45,7 +45,7 @@ Another way is to use
 <function>XSelectInput</function>.
 <indexterm significance="preferred"><primary>XSelectInput</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xselectinput'>
 <funcprototype>
   <funcdef><function>XSelectInput</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -183,7 +183,7 @@ To flush the output buffer, use
 <function>XFlush</function>.
 <indexterm significance="preferred"><primary>XFlush</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xflush'>
 <funcprototype>
   <funcdef><function>XFlush</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -229,7 +229,7 @@ use
 <function>XSync</function>.
 <indexterm significance="preferred"><primary>XSync</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsync'>
 <funcprototype>
   <funcdef><function>XSync</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -312,7 +312,7 @@ To check the number of events in the event queue, use
 <function>XEventsQueued</function>.
 <indexterm significance="preferred"><primary>XEventsQueued</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xeventsqueued'>
 <funcprototype>
   <funcdef>int <function>XEventsQueued</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -398,7 +398,7 @@ To return the number of events that are pending, use
 <function>XPending</function>.
 <indexterm significance="preferred"><primary>XPending</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xpending'>
 <funcprototype>
   <funcdef>int <function>XPending</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -472,7 +472,7 @@ To get the next event and remove it from the queue, use
 <function>XNextEvent</function>.
 <indexterm significance="preferred"><primary>XNextEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xnextevent'>
 <funcprototype>
   <funcdef><function>XNextEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -522,7 +522,7 @@ To peek at the event queue, use
 <function>XPeekEvent</function>.
 <indexterm significance="preferred"><primary>XPeekEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xpeekevent'>
 <funcprototype>
   <funcdef><function>XPeekEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -659,7 +659,7 @@ and, if found, remove the event from the queue, use
 <function>XIfEvent</function>.
 <indexterm significance="preferred"><primary>XIfEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xifevent'>
 <funcprototype>
   <funcdef><function>XIfEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -738,7 +738,7 @@ To check the event queue for a matching event without blocking, use
 <function>XCheckIfEvent</function>.
 <indexterm significance="preferred"><primary>XCheckIfEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcheckifevent'>
 <funcprototype>
   <funcdef>Bool <function>XCheckIfEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -817,7 +817,7 @@ without removing the event from the queue, use
 <function>XPeekIfEvent</function>.
 <indexterm significance="preferred"><primary>XPeekIfEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xpeekifevent'>
 <funcprototype>
   <funcdef><function>XPeekIfEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -906,7 +906,7 @@ To remove the next event that matches both a window and an event mask, use
 <function>XWindowEvent</function>.
 <indexterm significance="preferred"><primary>XWindowEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xwindowevent'>
 <funcprototype>
   <funcdef><function>XWindowEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -991,7 +991,7 @@ except that it never blocks and it returns a
 indicating if the event was returned.
 <indexterm significance="preferred"><primary>XCheckWindowEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcheckwindowevent'>
 <funcprototype>
   <funcdef>Bool <function>XCheckWindowEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1073,7 +1073,7 @@ To remove the next event that matches an event mask, use
 <function>XMaskEvent</function>.
 <indexterm significance="preferred"><primary>XMaskEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmaskevent'>
 <funcprototype>
   <funcdef><function>XMaskEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1144,7 +1144,7 @@ except that it never blocks and it returns a
 indicating if the event was returned.
 <indexterm significance="preferred"><primary>XCheckMaskEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcheckmaskevent'>
 <funcprototype>
   <funcdef>Bool <function>XCheckMaskEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1213,7 +1213,7 @@ To return and remove the next event in the queue that matches an event type, use
 <function>XCheckTypedEvent</function>.
 <indexterm significance="preferred"><primary>XCheckTypedEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchecktypedevent'>
 <funcprototype>
   <funcdef>Bool <function>XCheckTypedEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1284,7 +1284,7 @@ and a window, use
 <function>XCheckTypedWindowEvent</function>.
 <indexterm significance="preferred"><primary>XCheckTypedWindowEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchecktypedwindowevent'>
 <funcprototype>
   <funcdef>Bool <function>XCheckTypedWindowEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1372,7 +1372,7 @@ To push an event back into the event queue, use
 <function>XPutBackEvent</function>.
 <indexterm significance="preferred"><primary>XPutBackEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xputbackevent'>
 <funcprototype>
   <funcdef><function>XPutBackEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1435,7 +1435,7 @@ event to a requestor when a selection has been converted
 and stored as a property.
 <indexterm significance="preferred"><primary>XSendEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsendevent'>
 <funcprototype>
   <funcdef>Status <function>XSendEvent</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1671,7 +1671,7 @@ To get the motion history for a specified window and time, use
 <function>XGetMotionEvents</function>.
 <indexterm significance="preferred"><primary>XGetMotionEvents</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetmotionevents'>
 <funcprototype>
   <funcdef>XTimeCoord *<function>XGetMotionEvents</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1948,7 +1948,7 @@ To set the error handler, use
 <function>XSetErrorHandler</function>.
 <indexterm significance="preferred"><primary>XSetErrorHandler</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xseterrorhandler'>
 <funcprototype>
   <funcdef>int *<function>XSetErrorHandler</function></funcdef>
   <paramdef>int <parameter> *handler</parameter></paramdef>
@@ -2238,7 +2238,7 @@ To obtain textual descriptions of the specified error code, use
 <indexterm significance="preferred"><primary>XGetErrorText</primary></indexterm>
 <indexterm><primary>Debugging</primary><secondary>error message strings</secondary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgeterrortext'>
 <funcprototype>
   <funcdef><function>XGetErrorText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2310,7 +2310,7 @@ To obtain error messages from the error database, use
 <function>XGetErrorDatabaseText</function>.
 <indexterm significance="preferred"><primary>XGetErrorDatabaseText</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgeterrordatabasetext'>
 <funcprototype>
   <funcdef><function>XGetErrorDatabaseText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2455,7 +2455,7 @@ To report an error to the user when the requested display does not exist, use
 <function>XDisplayName</function>.
 <indexterm significance="preferred"><primary>XDisplayName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdisplayname'>
 <funcprototype>
   <funcdef>char *<function>XDisplayName</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
diff --git a/specs/libX11/CH12.xml b/specs/libX11/CH12.xml
index 6d4fc87..416bc76 100644
--- a/specs/libX11/CH12.xml
+++ b/specs/libX11/CH12.xml
@@ -159,7 +159,7 @@ To grab the pointer, use
 <indexterm><primary>Pointer</primary><secondary>grabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabPointer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgrabpointer'>
 <funcprototype>
   <funcdef>int <function>XGrabPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -425,7 +425,7 @@ To ungrab the pointer, use
 <indexterm><primary>Pointer</primary><secondary>ungrabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabPointer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xungrabpointer'>
 <funcprototype>
   <funcdef><function>XUngrabPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -493,7 +493,7 @@ To change an active pointer grab, use
 <indexterm ><primary>Changing</primary><secondary>pointer grab</secondary></indexterm>
 <indexterm significance="preferred"><primary>XChangeActivePointerGrab</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangeactivepointergrab'>
 <funcprototype>
   <funcdef><function>XChangeActivePointerGrab</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -581,7 +581,7 @@ To grab a pointer button, use
 <indexterm><primary>Button</primary><secondary>grabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabButton</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgrabbutton'>
 <funcprototype>
   <funcdef><function>XGrabButton</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -825,7 +825,7 @@ To ungrab a pointer button, use
 <indexterm><primary>Button</primary><secondary>ungrabbing</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabButton</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xungrabbutton'>
 <funcprototype>
   <funcdef><function>XUngrabButton</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -946,7 +946,7 @@ To grab the keyboard, use
 <indexterm><primary>Grabbing</primary><secondary>keyboard</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabKeyboard</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgrabkeyboard'>
 <funcprototype>
   <funcdef>int <function>XGrabKeyboard</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1134,7 +1134,7 @@ To ungrab the keyboard, use
 <indexterm><primary>Ungrabbing</primary><secondary>keyboard</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabKeyboard</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xungrabkeyboard'>
 <funcprototype>
   <funcdef><function>XUngrabKeyboard</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1201,7 +1201,7 @@ To passively grab a single key of the keyboard, use
 <indexterm><primary>Grabbing</primary><secondary>keys</secondary></indexterm>
 <indexterm significance="preferred"><primary>XGrabKey</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgrabkey'>
 <funcprototype>
   <funcdef><function>XGrabKey</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1405,7 +1405,7 @@ To ungrab a key, use
 <indexterm><primary>Ungrabbing</primary><secondary>keys</secondary></indexterm>
 <indexterm significance="preferred"><primary>XUngrabKey</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xungrabkey'>
 <funcprototype>
   <funcdef><function>XUngrabKey</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1506,7 +1506,7 @@ To allow further events to be processed when the device has been frozen, use
 <function>XAllowEvents</function>.
 <indexterm significance="preferred"><primary>XAllowEvents</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xallowevents'>
 <funcprototype>
   <funcdef><function>XAllowEvents</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1761,7 +1761,7 @@ To move the pointer to an arbitrary point in a window, use
 <function>XWarpPointer</function>.
 <indexterm significance="preferred"><primary>XWarpPointer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xwarppointer'>
 <funcprototype>
   <funcdef><function>XWarpPointer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1935,7 +1935,7 @@ To set the input focus, use
 <function>XSetInputFocus</function>.
 <indexterm significance="preferred"><primary>XSetInputFocus</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetinputfocus'>
 <funcprototype>
   <funcdef><function>XSetInputFocus</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2109,7 +2109,7 @@ To obtain the current input focus, use
 <function>XGetInputFocus</function>.
 <indexterm significance="preferred"><primary>XGetInputFocus</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetinputfocus'>
 <funcprototype>
   <funcdef><function>XGetInputFocus</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2324,7 +2324,7 @@ If an error is generated, a subset of the controls may have been altered.
 <!-- .sp -->
 <indexterm significance="preferred"><primary>XChangeKeyboardControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangekeyboardcontrol'>
 <funcprototype>
   <funcdef><function>XChangeKeyboardControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2393,7 +2393,7 @@ To obtain the current control values for the keyboard, use
 <function>XGetKeyboardControl</function>.
 <indexterm significance="preferred"><primary>XGetKeyboardControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetkeyboardcontrol'>
 <funcprototype>
   <funcdef><function>XGetKeyboardControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2477,7 +2477,7 @@ To turn on keyboard auto-repeat, use
 <function>XAutoRepeatOn</function>.
 <indexterm significance="preferred"><primary>XAutoRepeatOn</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xautorepeaton'>
 <funcprototype>
   <funcdef><function>XAutoRepeatOn</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2511,7 +2511,7 @@ To turn off keyboard auto-repeat, use
 <function>XAutoRepeatOff</function>.
 <indexterm significance="preferred"><primary>XAutoRepeatOff</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xautorepeatoff'>
 <funcprototype>
   <funcdef><function>XAutoRepeatOff</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2545,7 +2545,7 @@ To ring the bell, use
 <function>XBell</function>.
 <indexterm significance="preferred"><primary>XBell</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xbell'>
 <funcprototype>
   <funcdef><function>XBell</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2629,7 +2629,7 @@ To obtain a bit vector that describes the state of the keyboard, use
 <function>XQueryKeymap</function>.
 <indexterm significance="preferred"><primary>XQueryKeymap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xquerykeymap'>
 <funcprototype>
   <funcdef><function>XQueryKeymap</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2685,7 +2685,7 @@ To set the mapping of the pointer buttons, use
 <function>XSetPointerMapping</function>.
 <indexterm significance="preferred"><primary>XSetPointerMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetpointermapping'>
 <funcprototype>
   <funcdef>int <function>XSetPointerMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2773,7 +2773,7 @@ To get the pointer mapping, use
 <function>XGetPointerMapping</function>.
 <indexterm significance="preferred"><primary>XGetPointerMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetpointermapping'>
 <funcprototype>
   <funcdef>int <function>XGetPointerMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2836,7 +2836,7 @@ To control the pointer's interactive feel, use
 <function>XChangePointerControl</function>.
 <indexterm significance="preferred"><primary>XChangePointerControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangepointercontrol'>
 <funcprototype>
   <funcdef><function>XChangePointerControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2949,7 +2949,7 @@ To get the current pointer parameters, use
 <function>XGetPointerControl</function>.
 <indexterm significance="preferred"><primary>XGetPointerControl</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetpontercontrol'>
 <funcprototype>
   <funcdef><function>XGetPointerControl</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3224,7 +3224,7 @@ To obtain the legal KeyCodes for a display, use
 <function>XDisplayKeycodes</function>.
 <indexterm significance="preferred"><primary>XDisplayKeycodes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdisplaykeycodes'>
 <funcprototype>
   <funcdef><function>XDisplayKeycodes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3283,7 +3283,7 @@ To obtain the symbols for the specified KeyCodes, use
 <function>XGetKeyboardMapping</function>.
 <indexterm significance="preferred"><primary>XGetKeyboardMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetkeyboardmapping'>
 <funcprototype>
   <funcdef>KeySym *<function>XGetKeyboardMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3408,7 +3408,7 @@ To change the keyboard mapping, use
 <function>XChangeKeyboardMapping</function>.
 <indexterm significance="preferred"><primary>XChangeKeyboardMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xchangekeyboardmapping'>
 <funcprototype>
   <funcdef><function>XChangeKeyboardMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3580,7 +3580,7 @@ structure, use
 <function>XNewModifiermap</function>.
 <indexterm significance="preferred"><primary>XNewModifiermap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xnewmodifiermap'>
 <funcprototype>
   <funcdef>XModifierKeymap *<function>XNewModifiermap</function></funcdef>
   <paramdef>int<parameter> max_keys_per_mod</parameter></paramdef>
@@ -3619,7 +3619,7 @@ structure, use
 <function>XInsertModifiermapEntry</function>.
 <indexterm significance="preferred"><primary>XInsertModifiermapEntry</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xinsertmodifiermapentry'>
 <funcprototype>
   <funcdef>XModifierKeymap *<function>XInsertModifiermapEntry</function></funcdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
@@ -3682,7 +3682,7 @@ structure, use
 <function>XDeleteModifiermapEntry</function>.
 <indexterm significance="preferred"><primary>XDeleteModifiermapEntry</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdeletemodifierentry'>
 <funcprototype>
   <funcdef>XModifierKeymap *<function>XDeleteModifiermapEntry</function></funcdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
@@ -3745,7 +3745,7 @@ structure, use
 <function>XFreeModifiermap</function>.
 <indexterm significance="preferred"><primary>XFreeModifiermap</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreemodifiermap'>
 <funcprototype>
   <funcdef><function>XFreeModifiermap</function></funcdef>
   <paramdef>XModifierKeymap<parameter> *modmap</parameter></paramdef>
@@ -3783,7 +3783,7 @@ To set the KeyCodes to be used as modifiers, use
 <function>XSetModifierMapping</function>.
 <indexterm significance="preferred"><primary>XSetModifierMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetmodifiermapping'>
 <funcprototype>
   <funcdef>int <function>XSetModifierMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3897,7 +3897,7 @@ To obtain the KeyCodes used as modifiers, use
 <function>XGetModifierMapping</function>.
 <indexterm significance="preferred"><primary>XGetModifierMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetmodifiermapping'>
 <funcprototype>
   <funcdef>XModifierKeymap *<function>XGetModifierMapping</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH13.xml b/specs/libX11/CH13.xml
index 25cb56f..0da3b26 100644
--- a/specs/libX11/CH13.xml
+++ b/specs/libX11/CH13.xml
@@ -146,7 +146,7 @@ To configure Xlib locale modifiers for the current locale, use
 <function>XSetLocaleModifiers</function>.
 <indexterm significance="preferred"><primary>XSetLocaleModifiers</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis  id='xsetlocalemodifiers'>
 <funcprototype>
   <funcdef>char *<function>XSetLocaleModifiers</function></funcdef>
   <paramdef>char<parameter> *modifier_list</parameter></paramdef>
@@ -545,7 +545,7 @@ To allocate a nested variable argument list dynamically, use
 <function>XVaCreateNestedList</function>.
 <indexterm significance="preferred"><primary>XVaCreateNestedList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xvacreatenestedlist'>
 <funcprototype>
   <funcdef>XVaNestedList <function>XVaCreateNestedList</function></funcdef>
   <paramdef>int<parameter> dummy</parameter></paramdef>
@@ -732,7 +732,7 @@ To open an output method, use
 <function>XOpenOM</function>.
 <indexterm significance="preferred"><primary>XOpenOM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xopenom'>
 <funcprototype>
   <funcdef>XOM <function>XOpenOM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -850,7 +850,7 @@ To close an output method, use
 <function>XCloseOM</function>.
 <indexterm significance="preferred"><primary>XCloseOM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcloseom'>
 <funcprototype>
   <funcdef>Status <function>XCloseOM</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
@@ -884,7 +884,7 @@ To set output method attributes, use
 <function>XSetOMValues</function>.
 <indexterm significance="preferred"><primary>XSetOMValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetomvalues'>
 <funcprototype>
   <funcdef>char *<function>XSetOMValues</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
@@ -937,7 +937,7 @@ To query an output method, use
 <function>XGetOMValues</function>.
 <indexterm significance="preferred"><primary>XGetOMValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetomvalues'>
 <funcprototype>
   <funcdef>char *<function>XGetOMValues</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
@@ -985,7 +985,7 @@ To obtain the display associated with an output method, use
 <function>XDisplayOfOM</function>.
 <indexterm significance="preferred"><primary>XDisplayOfOM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdisplayofom'>
 <funcprototype>
   <funcdef>Display *<function>XDisplayOfOM</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
@@ -1019,7 +1019,7 @@ To get the locale associated with an output method, use
 <function>XLocaleOfOM</function>.
 <indexterm significance="preferred"><primary>XLocaleOfOM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlocaleofom'>
 <funcprototype>
   <funcdef>char *<function>XLocaleOfOM</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
@@ -1355,7 +1355,7 @@ To create an output context, use
 <function>XCreateOC</function>.
 <indexterm significance="preferred"><primary>XCreateOC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreateoc'>
 <funcprototype>
   <funcdef>XOC <function>XCreateOC</function></funcdef>
   <paramdef>XOM<parameter> om</parameter></paramdef>
@@ -1441,7 +1441,7 @@ To destroy an output context, use
 <function>XDestroyOC</function>.
 <indexterm significance="preferred"><primary>XDestroyOC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroyoc'>
 <funcprototype>
   <funcdef>void <function>XDestroyOC</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
@@ -1475,7 +1475,7 @@ To get the output method associated with an output context, use
 <function>XOMOfOC</function>.
 <indexterm significance="preferred"><primary>XOMOfOC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xomofoc'>
 <funcprototype>
   <funcdef>XOM <function>XOMOfOC</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
@@ -1522,7 +1522,7 @@ To set <acronym>XOC</acronym> values, use
 <function>XSetOCValues</function>.
 <indexterm significance="preferred"><primary>XSetOCValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetocvalues'>
 <funcprototype>
   <funcdef>char *<function>XSetOCValues</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
@@ -1599,7 +1599,7 @@ To obtain <acronym>XOC</acronym> values, use
 <function>XGetOCValues</function>.
 <indexterm significance="preferred"><primary>XGetOCValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetocvalues'>
 <funcprototype>
   <funcdef>char *<function>XGetOCValues</function></funcdef>
   <paramdef>XOC<parameter> oc</parameter></paramdef>
@@ -2147,7 +2147,7 @@ or
 <function>XCreateFontSet</function>.
 <indexterm significance="preferred"><primary>XCreateFontSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatefontset'>
 <funcprototype>
   <funcdef>XFontSet <function>XCreateFontSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2477,7 +2477,7 @@ use
 <function>XFontsOfFontSet</function>.
 <indexterm significance="preferred"><primary>XFontsOfFontSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfontsoffontset'>
 <funcprototype>
   <funcdef>int <function>XFontsOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -2586,7 +2586,7 @@ use
 <function>XBaseFontNameListOfFontSet</function>.
 <indexterm significance="preferred"><primary>XBaseFontNameListOfFontSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xbasefontnamelistoffontset'>
 <funcprototype>
   <funcdef>char *<function>XBaseFontNameListOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -2648,7 +2648,7 @@ use
 <function>XLocaleOfFontSet</function>.
 <indexterm significance="preferred"><primary>XLocaleOfFontSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlocaleoffontset'>
 <funcprototype>
   <funcdef>char *<function>XLocaleOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -2701,7 +2701,7 @@ if the output context was created by
 <function>XCreateFontSet</function>.
 <indexterm significance="preferred"><primary>XFreeFontSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreefontset'>
 <funcprototype>
   <funcdef>void <function>XFreeFontSet</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2805,7 +2805,7 @@ To find out about direction-dependent rendering, use
 <function>XDirectionalDependentDrawing</function>.
 <indexterm significance="preferred"><primary>XDirectionalDependentDrawing</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdirectionaldependentdrawing'>
 <funcprototype>
   <funcdef>Bool <function>XDirectionalDependentDrawing</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -2843,7 +2843,7 @@ To find out about context-dependent rendering, use
 <function>XContextualDrawing</function>.
 <indexterm significance="preferred"><primary>XContextualDrawing</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcontextualdrawing'>
 <funcprototype>
   <funcdef>Bool <function>XContextualDrawing</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -2881,7 +2881,7 @@ To find out about context-dependent or direction-dependent rendering, use
 <function>XContextDependentDrawing</function>.
 <indexterm significance="preferred"><primary>XContextDependentDrawing</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcontextdependentdrawing'>
 <funcprototype>
   <funcdef>Bool <function>XContextDependentDrawing</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -2995,7 +2995,7 @@ use
 <function>XExtentsOfFontSet</function>.
 <indexterm significance="preferred"><primary>XExtentsOfFontSet</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xextentsoffontset'>
 <funcprototype>
   <funcdef>XFontSetExtents *<function>XExtentsOfFontSet</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3048,7 +3048,7 @@ or
 <indexterm significance="preferred"><primary>XmbTextEscapement</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextEscapement</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbtextescapement'>
 <funcprototype>
   <funcdef>int <function>XmbTextEscapement</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3057,7 +3057,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwctextescapement'>
 <funcprototype>
   <funcdef>int <function>XwcTextEscapement</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3140,7 +3140,7 @@ use
 <indexterm significance="preferred"><primary>XmbTextExtents</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextExtents</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbtextextents'>
 <funcprototype>
   <funcdef>int <function>XmbTextExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3151,7 +3151,7 @@ use
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwctextextents'>
 <funcprototype>
   <funcdef>int <function>XwcTextExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3300,7 +3300,7 @@ or
 <indexterm significance="preferred"><primary>XmbTextPerCharExtents</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextPerCharExtents</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbtextpercharextents'>
 <funcprototype>
   <funcdef>Status <function>XmbTextPerCharExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3315,7 +3315,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwctextpercharextents'>
 <funcprototype>
   <funcdef>Status <function>XwcTextPerCharExtents</function></funcdef>
   <paramdef>XFontSet<parameter> font_set</parameter></paramdef>
@@ -3582,7 +3582,7 @@ or
 <indexterm significance="preferred"><primary>XmbDrawText</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcDrawText</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbdrawtext'>
 <funcprototype>
   <funcdef>void <function>XmbDrawText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3594,7 +3594,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwcdrawtext'>
 <funcprototype>
   <funcdef>void <function>XwcDrawText</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3733,7 +3733,7 @@ or
 <indexterm significance="preferred"><primary>XmbDrawString</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcDrawString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbdrawstring'>
 <funcprototype>
   <funcdef>void <function>XmbDrawString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3746,7 +3746,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwcdrawstring'>
 <funcprototype>
   <funcdef>void <function>XwcDrawString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3879,7 +3879,7 @@ or
 <indexterm significance="preferred"><primary>XmbDrawImageString</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcDrawImageString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbdrawimagestring'>
 <funcprototype>
   <funcdef>void <function>XmbDrawImageString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3892,7 +3892,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwcdrawimagestring'>
 <funcprototype>
   <funcdef>void <function>XwcDrawImageString</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5185,7 +5185,7 @@ To open a connection, use
 <function>XOpenIM</function>.
 <indexterm significance="preferred"><primary>XOpenIM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xopenim'>
 <funcprototype>
   <funcdef>XIM <function>XOpenIM</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5306,7 +5306,7 @@ To close a connection, use
 <function>XCloseIM</function>.
 <indexterm significance="preferred"><primary>XCloseIM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcloseim'>
 <funcprototype>
   <funcdef>Status <function>XCloseIM</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -5340,7 +5340,7 @@ To set input method attributes, use
 <function>XSetIMValues</function>.
 <indexterm significance="preferred"><primary>XSetIMValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetimvalues'>
 <funcprototype>
   <funcdef>char *<function>XSetIMValues</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -5393,7 +5393,7 @@ To query an input method, use
 <function>XGetIMValues</function>.
 <indexterm significance="preferred"><primary>XGetIMValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetimvalues'>
 <funcprototype>
   <funcdef>char *<function>XGetIMValues</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -5456,7 +5456,7 @@ To obtain the display associated with an input method, use
 <function>XDisplayOfIM</function>.
 <indexterm significance="preferred"><primary>XDisplayOfIM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdisplayofim'>
 <funcprototype>
   <funcdef>Display *<function>XDisplayOfIM</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -5490,7 +5490,7 @@ To get the locale associated with an input method, use
 <function>XLocaleOfIM</function>.
 <indexterm significance="preferred"><primary>XLocaleOfIM</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlocaleofim'>
 <funcprototype>
   <funcdef>char *<function>XLocaleOfIM</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -5524,7 +5524,7 @@ To register an input method instantiate callback, use
 <function>XRegisterIMInstantiateCallback</function>.
 <indexterm significance="preferred"><primary>XRegisterIMInstantiateCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xregisteriminstatiatecallback'>
 <funcprototype>
   <funcdef>Bool <function>XRegisterIMInstantiateCallback</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5620,7 +5620,7 @@ The function returns
 The generic prototype is as follows:
 <indexterm significance="preferred"><primary>IMInstantiateCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='iminstantiatecallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>IMInstantiateCallback</replaceable></function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5669,7 +5669,7 @@ To unregister an input method instantiation callback, use
 <function>XUnregisterIMInstantiateCallback</function>.
 <indexterm significance="preferred"><primary>XUnregisterIMInstantiateCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunregisteriminstantiatecallback'>
 <funcprototype>
   <funcdef>Bool <function>XUnregisterIMInstantiateCallback</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -6109,7 +6109,7 @@ or
 The generic prototype of this callback function is as follows:
 <indexterm significance="preferred"><primary>DestroyCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='destroycallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>DestroyCallback</replaceable></function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -6345,7 +6345,7 @@ To create an input context, use
 <function>XCreateIC</function>.
 <indexterm significance="preferred"><primary>XCreateIC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreateic'>
 <funcprototype>
   <funcdef>XIC <function>XCreateIC</function></funcdef>
   <paramdef>XIM<parameter> im</parameter></paramdef>
@@ -6438,7 +6438,7 @@ To destroy an input context, use
 <function>XDestroyIC</function>.
 <indexterm significance="preferred"><primary>XDestroyIC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroyic'>
 <funcprototype>
   <funcdef>void <function>XDestroyIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -6475,7 +6475,7 @@ and
 <function>XUnsetICFocus</function>.
 <indexterm significance="preferred"><primary>XSetICFocus</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xseticfocus'>
 <funcprototype>
   <funcdef>void <function>XSetICFocus</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -6516,7 +6516,7 @@ does not affect the focus window value.
 <!-- .sp -->
 <indexterm significance="preferred"><primary>XUnsetICFocus</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunseticfocus'>
 <funcprototype>
   <funcdef>void <function>XUnsetICFocus</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -6565,14 +6565,14 @@ or
 <indexterm significance="preferred"><primary>XmbResetIC</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcResetIC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbresetic'>
 <funcprototype>
   <funcdef>char *<function>XmbResetIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwcresetic'>
 <funcprototype>
   <funcdef>wchar_t *<function>XwcResetIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -6640,7 +6640,7 @@ To get the input method associated with an input context, use
 <function>XIMOfIC</function>.
 <indexterm significance="preferred"><primary>XIMOfIC</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='ximofic'>
 <funcprototype>
   <funcdef>XIM <function>XIMOfIC</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -6685,7 +6685,7 @@ To set <acronym>XIC</acronym> values, use
 <function>XSetICValues</function>.
 <indexterm significance="preferred"><primary>XSetICValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xseticvalues'>
 <funcprototype>
   <funcdef>char *<function>XSetICValues</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -6768,7 +6768,7 @@ To obtain <acronym>XIC</acronym> values, use
 <function>XGetICValues</function>.
 <indexterm significance="preferred"><primary>XGetICValues</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgeticvalues'>
 <funcprototype>
   <funcdef>char *<function>XGetICValues</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -8321,7 +8321,7 @@ argument is a pointer to a structure of type
 The generic prototype is as follows:
 <indexterm significance="preferred"><primary>PreeditStateNotifyCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='preeditstatenotifycallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>PreeditStateNotifyCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -8539,7 +8539,7 @@ terminate preedit, or update the status area.
 All callback procedures follow the generic prototype:
 <indexterm significance="preferred"><primary>CallbackPrototype</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='callbackprototype'>
 <funcprototype>
   <funcdef>void <function><replaceable>CallbackPrototype</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -8611,7 +8611,7 @@ to indicate that it wants the client to negotiate geometry.
 The generic prototype is as follows:
 <indexterm significance="preferred"><primary>GeometryCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='geometrycallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>GeometryCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -8734,7 +8734,7 @@ with an encoding matching the locale bound to the input context.
 The callback prototype is as follows:
 <indexterm significance="preferred"><primary>StringConversionCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='stringconversioncallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>StringConversionCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -8895,7 +8895,7 @@ callback is triggered to let the toolkit do the setup
 or the cleanup for the preedit region.
 <indexterm significance="preferred"><primary>PreeditStartCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='preeditstartcallback'>
 <funcprototype>
   <funcdef>int <function><replaceable>PreeditStartCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -8949,7 +8949,7 @@ in the preedit string,
 and a value of -1 indicates there is no limit.
 <indexterm significance="preferred"><primary>PreeditDoneCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='preeditdonecallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>PreeditDoneCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9030,7 +9030,7 @@ The callback prototype
 is as follows:
 <indexterm significance="preferred"><primary>PreeditDrawCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='preeditdrawcallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>PreeditDrawCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9416,7 +9416,7 @@ should move the text insertion point.
 It then calls the PreeditCaretCallback.
 <indexterm significance="preferred"><primary>PreeditCaretCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='preeditcaretcallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>PreeditCaretCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9632,7 +9632,7 @@ When the input context is created or gains focus,
 the input method calls the StatusStartCallback callback.
 <indexterm significance="preferred"><primary>StatusStartCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='statusstartcallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>StatusStartCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9689,7 +9689,7 @@ When an input context
 is destroyed or when it loses focus, the input method calls StatusDoneCallback.
 <indexterm significance="preferred"><primary>StatusDoneCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='statusdonecallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>StatusDoneCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9744,7 +9744,7 @@ When an input context status has to be updated, the input method calls
 StatusDrawCallback.
 <indexterm significance="preferred"><primary>StatusDrawCallback</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='statusdrawcallback'>
 <funcprototype>
   <funcdef>void <function><replaceable>StatusDrawCallback</replaceable></function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9882,7 +9882,7 @@ To filter an event, use
 <function>XFilterEvent</function>.
 <indexterm significance="preferred"><primary>XFilterEvent</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfilterevent'>
 <funcprototype>
   <funcdef>Bool <function>XFilterEvent</function></funcdef>
   <paramdef>XEvent<parameter> *event</parameter></paramdef>
@@ -9966,7 +9966,7 @@ or
 <indexterm significance="preferred"><primary>XmbLookupString</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcLookupString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmblookupstring'>
 <funcprototype>
   <funcdef>int <function>XmbLookupString</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
@@ -9978,7 +9978,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwclookupstring'>
 <funcprototype>
   <funcdef>int <function>XwcLookupString</function></funcdef>
   <paramdef>XIC<parameter> ic</parameter></paramdef>
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index 78d0e3f..6d786c9 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -259,7 +259,7 @@ To request that a top-level window be iconified, use
 <function>XIconifyWindow</function>.
 <indexterm significance="preferred"><primary>XIconifyWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xiconifywindow'>
 <funcprototype>
   <funcdef>Status <function>XIconifyWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -333,7 +333,7 @@ To request that a top-level window be withdrawn, use
 <function>XWithdrawWindow</function>.
 <indexterm significance="preferred"><primary>XWithdrawWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xwithdrawwindow'>
 <funcprototype>
   <funcdef>Status <function>XWithdrawWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -407,7 +407,7 @@ To request that a top-level window be reconfigured, use
 <function>XReconfigureWMWindow</function>.
 <indexterm significance="preferred"><primary>XReconfigureWMWindow</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xreconfigurewmwindow'>
 <funcprototype>
   <funcdef>Status <function>XReconfigureWMWindow</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -581,7 +581,7 @@ or
 <indexterm significance="preferred"><primary>XmbTextListToTextProperty</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextListToTextProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbtextlisttotextproperty'>
 <funcprototype>
   <funcdef>int <function>XmbTextListToTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -592,7 +592,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwctextlisttotextproperty'>
 <funcprototype>
   <funcdef>int <function>XwcTextListToTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -743,7 +743,7 @@ or
 <indexterm significance="preferred"><primary>XmbTextPropertyToTextList</primary></indexterm>
 <indexterm significance="preferred"><primary>XwcTextPropertyToTextList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbtextpropertytotextlist'>
 <funcprototype>
   <funcdef>int <function>XmbTextPropertyToTextList</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -753,7 +753,7 @@ or
 </funcprototype>
 </funcsynopsis>
 <!-- .FN -->
-<funcsynopsis>
+<funcsynopsis id='xwctextpropertytotextlist'>
 <funcprototype>
   <funcdef>int <function>XwcTextPropertyToTextList</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -901,7 +901,7 @@ wide character string list, use
 <function>XwcFreeStringList</function>.
 <indexterm significance="preferred"><primary>XwcFreeStringList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xwcfreestringlist'>
 <funcprototype>
   <funcdef>void <function>XwcFreeStringList</function></funcdef>
   <paramdef>wchar_t<parameter> **list</parameter></paramdef>
@@ -985,7 +985,7 @@ structure, use
 <function>XStringListToTextProperty</function>.
 <indexterm significance="preferred"><primary>XStringListToTextProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstringlisttotextproperty'>
 <funcprototype>
   <funcdef>Status <function>XStringListToTextProperty</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
@@ -1060,7 +1060,7 @@ structure in the STRING encoding, use
 <function>XTextPropertyToStringList</function>.
 <indexterm significance="preferred"><primary>XTextPropertyToStringList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xtextpropertytostringlist'>
 <funcprototype>
   <funcdef>Status <function>XTextPropertyToStringList</function></funcdef>
   <paramdef>XTextProperty<parameter> *text_prop</parameter></paramdef>
@@ -1133,7 +1133,7 @@ To free the in-memory data associated with the specified string list, use
 <function>XFreeStringList</function>.
 <indexterm significance="preferred"><primary>XFreeStringList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfreestringlist'>
 <funcprototype>
   <funcdef>void <function>XFreeStringList</function></funcdef>
   <paramdef>char<parameter> **list</parameter></paramdef>
@@ -1190,7 +1190,7 @@ To set one of a window's text properties, use
 <function>XSetTextProperty</function>.
 <indexterm significance="preferred"><primary>XSetTextProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsettextproperty'>
 <funcprototype>
   <funcdef>void <function>XSetTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1278,7 +1278,7 @@ To read one of a window's text properties, use
 <function>XGetTextProperty</function>.
 <indexterm significance="preferred"><primary>XGetTextProperty</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgettextproperty'>
 <funcprototype>
   <funcdef>Status <function>XGetTextProperty</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1394,7 +1394,7 @@ To set a window's <property>WM_NAME</property> property with the supplied conven
 <function>XSetWMName</function>.
 <indexterm significance="preferred"><primary>XSetWMName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmname'>
 <funcprototype>
   <funcdef>void <function>XSetWMName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1454,7 +1454,7 @@ To read a window's <property>WM_NAME</property> property with the supplied conve
 <function>XGetWMName</function>.
 <indexterm significance="preferred"><primary>XGetWMName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmname'>
 <funcprototype>
   <funcdef>Status <function>XGetWMName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1527,7 +1527,7 @@ To assign a name to a window, use
 <indexterm><primary>Window</primary><secondary>name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XStoreName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstorename'>
 <funcprototype>
   <funcdef><function>XStoreName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1600,7 +1600,7 @@ To get the name of a window, use
 <function>XFetchName</function>.
 <indexterm significance="preferred"><primary>XFetchName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfetchname'>
 <funcprototype>
   <funcdef>Status <function>XFetchName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1688,7 +1688,7 @@ use
 <function>XSetWMIconName</function>.
 <indexterm significance="preferred"><primary>XSetWMIconName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmiconname'>
 <funcprototype>
   <funcdef>void <function>XSetWMIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1749,7 +1749,7 @@ use
 <function>XGetWMIconName</function>.
 <indexterm significance="preferred"><primary>XGetWMIconName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmiconname'>
 <funcprototype>
   <funcdef>Status <function>XGetWMIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1823,7 +1823,7 @@ To set the name to be displayed in a window's icon, use
 <indexterm><primary>Window</primary><secondary>icon name</secondary></indexterm>
 <indexterm significance="preferred"><primary>XSetIconName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xseticonname'>
 <funcprototype>
   <funcdef><function>XSetIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1885,7 +1885,7 @@ To get the name a window wants displayed in its icon, use
 <function>XGetIconName</function>.
 <indexterm significance="preferred"><primary>XGetIconName</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgeticonname'>
 <funcprototype>
   <funcdef>Status <function>XGetIconName</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2123,7 +2123,7 @@ To set a window's <property>WM_HINTS</property> property, use
 <function>XSetWMHints</function>.
 <indexterm significance="preferred"><primary>XSetWMHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmhints'>
 <funcprototype>
   <funcdef><function>XSetWMHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2192,7 +2192,7 @@ To read a window's <property>WM_HINTS</property> property, use
 <function>XGetWMHints</function>.
 <indexterm significance="preferred"><primary>XGetWMHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmhints'>
 <funcprototype>
   <funcdef>XWMHints *<function>XGetWMHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2389,7 +2389,7 @@ To set a window's <property>WM_NORMAL_HINTS</property> property, use
 <function>XSetWMNormalHints</function>.
 <indexterm significance="preferred"><primary>XSetWMNormalHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmnormalhints'>
 <funcprototype>
   <funcdef>void <function>XSetWMNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2459,7 +2459,7 @@ To read a window's <property>WM_NORMAL_HINTS</property> property, use
 <function>XGetWMNormalHints</function>.
 <indexterm significance="preferred"><primary>XGetWMNormalHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmnormalhints'>
 <funcprototype>
   <funcdef>Status <function>XGetWMNormalHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2570,7 +2570,7 @@ To set a window's <property>WM_SIZE_HINTS</property> property, use
 <function>XSetWMSizeHints</function>.
 <indexterm significance="preferred"><primary>XSetWMSizeHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmsizehints'>
 <funcprototype>
   <funcdef>void <function>XSetWMSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2659,7 +2659,7 @@ To read a window's <property>WM_SIZE_HINTS</property> property, use
 <function>XGetWMSizeHints</function>.
 <indexterm significance="preferred"><primary>XGetWMSizeHints</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmsizehints'>
 <funcprototype>
   <funcdef>Status <function>XGetWMSizeHints</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2875,7 +2875,7 @@ To set a window's <property>WM_CLASS</property> property, use
 <function>XSetClassHint</function>.
 <indexterm significance="preferred"><primary>XSetClassHint</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetclasshint'>
 <funcprototype>
   <funcdef><function>XSetClassHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2944,7 +2944,7 @@ To read a window's <property>WM_CLASS</property> property, use
 <function>XGetClassHint</function>.
 <indexterm significance="preferred"><primary>XGetClassHint</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetclasshint'>
 <funcprototype>
   <funcdef>Status <function>XGetClassHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3030,7 +3030,7 @@ To set a window's <property>WM_TRANSIENT_FOR</property> property, use
 <function>XSetTransientForHint</function>.
 <indexterm significance="preferred"><primary>XSetTransientForHint</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsettransientforhint'>
 <funcprototype>
   <funcdef><function>XSetTransientForHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3096,7 +3096,7 @@ To read a window's <property>WM_TRANSIENT_FOR</property> property, use
 <function>XGetTransientForHint</function>.
 <indexterm significance="preferred"><primary>XGetTransientForHint</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgettransientforhint'>
 <funcprototype>
   <funcdef>Status <function>XGetTransientForHint</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3172,7 +3172,7 @@ To set a window's <property>WM_PROTOCOLS</property> property, use
 <function>XSetWMProtocols</function>.
 <indexterm significance="preferred"><primary>XSetWMProtocols</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmprotocols'>
 <funcprototype>
   <funcdef>Status <function>XSetWMProtocols</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3259,7 +3259,7 @@ To read a window's <property>WM_PROTOCOLS</property> property, use
 <function>XGetWMProtocols</function>.
 <indexterm significance="preferred"><primary>XGetWMProtocols</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmprotocols'>
 <funcprototype>
   <funcdef>Status <function>XGetWMProtocols</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3358,7 +3358,7 @@ To set a window's <property>WM_COLORMAP_WINDOWS</property> property, use
 <function>XSetWMColormapWindows</function>.
 <indexterm significance="preferred"><primary>XSetWMColormapWindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmcolormapwindows'>
 <funcprototype>
   <funcdef>Status <function>XSetWMColormapWindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3445,7 +3445,7 @@ To read a window's <property>WM_COLORMAP_WINDOWS</property> property, use
 <function>XGetWMColormapWindows</function>.
 <indexterm significance="preferred"><primary>XGetWMColormapWindows</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmcolormapwindows'>
 <funcprototype>
   <funcdef>Status <function>XGetWMColormapWindows</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3610,7 +3610,7 @@ To set a window's <property>WM_ICON_SIZE</property> property, use
 <function>XSetIconSizes</function>.
 <indexterm significance="preferred"><primary>XSetIconSizes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xseticonsizes'>
 <funcprototype>
   <funcdef><function>XSetIconSizes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3686,7 +3686,7 @@ To read a window's <property>WM_ICON_SIZE</property> property, use
 <function>XGetIconSizes</function>.
 <indexterm significance="preferred"><primary>XGetIconSizes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgeticonsizes'>
 <funcprototype>
   <funcdef>Status <function>XGetIconSizes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3783,7 +3783,7 @@ The standard window manager properties for a given window are
 <property>WM_COMMAND</property>, <property>WM_CLIENT_MACHINE</property>, and <property>WM_LOCALE_NAME</property>.
 <indexterm significance="preferred"><primary>XmbSetWMProperties</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmbsetwmproperties'>
 <funcprototype>
   <funcdef>void <function>XmbSetWMProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4001,7 +4001,7 @@ The standard window manager properties for a given window are
 <property>WM_COMMAND</property>, and <property>WM_CLIENT_MACHINE</property>.
 <indexterm significance="preferred"><primary>XSetWMProperties</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmproperties'>
 <funcprototype>
   <funcdef>void <function>XSetWMProperties</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4227,7 +4227,7 @@ To set a window's <property>WM_COMMAND</property> property, use
 <function>XSetCommand</function>.
 <indexterm significance="preferred"><primary>XSetCommand</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetcommand'>
 <funcprototype>
   <funcdef><function>XSetCommand</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4307,7 +4307,7 @@ To read a window's <property>WM_COMMAND</property> property, use
 <function>XGetCommand</function>.
 <indexterm significance="preferred"><primary>XGetCommand</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetcommand'>
 <funcprototype>
   <funcdef>Status <function>XGetCommand</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4398,7 +4398,7 @@ To set a window's <property>WM_CLIENT_MACHINE</property> property, use
 <function>XSetWMClientMachine</function>.
 <indexterm significance="preferred"><primary>XSetWMClientMachine</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetwmclientmachine'>
 <funcprototype>
   <funcdef>void <function>XSetWMClientMachine</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4458,7 +4458,7 @@ To read a window's <property>WM_CLIENT_MACHINE</property> property, use
 <function>XGetWMClientMachine</function>.
 <indexterm significance="preferred"><primary>XGetWMClientMachine</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetwmclientmachine'>
 <funcprototype>
   <funcdef>Status <function>XGetWMClientMachine</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4920,7 +4920,7 @@ structure, use
 <function>XSetRGBColormaps</function>.
 <indexterm significance="preferred"><primary>XSetRGBColormaps</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetrgbcolormaps'>
 <funcprototype>
   <funcdef>void <function>XSetRGBColormaps</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -5100,7 +5100,7 @@ structure associated with the specified property, use
 <function>XGetRGBColormaps</function>.
 <indexterm significance="preferred"><primary>XGetRGBColormaps</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetrgbcolormaps'>
 <funcprototype>
   <funcdef>Status <function>XGetRGBColormaps</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
diff --git a/specs/libX11/CH15.xml b/specs/libX11/CH15.xml
index 9c739b3..2143e34 100644
--- a/specs/libX11/CH15.xml
+++ b/specs/libX11/CH15.xml
@@ -419,7 +419,7 @@ or
 <indexterm significance="preferred"><primary>XrmStringToQuark</primary></indexterm>
 <indexterm significance="preferred"><primary>XrmPermStringToQuark</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrmstringtoquark'>
 <funcprototype>
   <funcdef>XrmQuark <function>XrmStringToQuark</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
@@ -477,7 +477,7 @@ To convert a quark to a string, use
 </literallayout>
 <indexterm significance="preferred"><primary>XrmQuarkToString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrmquarktostring'>
 <funcprototype>
   <funcdef>char *<function>XrmQuarkToString</function></funcdef>
   <paramdef>XrmQuark<parameter> quark</parameter></paramdef>
@@ -524,7 +524,7 @@ To convert a string with one or more components to a quark list, use
 
 <indexterm significance="preferred"><primary>XrmStringToQuarkList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrmstringtoquarklist'>
 <funcprototype>
   <funcdef>void <function>XrmStringToQuarkList</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
@@ -598,7 +598,7 @@ and a quark list, use
 <function>XrmStringToBindingQuarkList</function>.
 <indexterm significance="preferred"><primary>XrmStringToBindingQuarkList</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrmstringtobindingquarklist'>
 <funcprototype>
   <funcdef><function>XrmStringToBindingQuarkList</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
@@ -708,7 +708,7 @@ To initialize the resource manager, use
 <function>XrmInitialize</function>.
 <indexterm significance="preferred"><primary>XrmInitialize</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrminitialize'>
 <funcprototype>
   <funcdef>void <function>XrmInitialize</function></funcdef>
   <paramdef>void<parameter> XrmInitialize(\|)</parameter></paramdef>
diff --git a/specs/libX11/CH16.xml b/specs/libX11/CH16.xml
index 8d6ccc3..db42bb1 100644
--- a/specs/libX11/CH16.xml
+++ b/specs/libX11/CH16.xml
@@ -100,7 +100,7 @@ To obtain a KeySym for the KeyCode of an event, use
 <function>XLookupKeysym</function>.
 <indexterm significance="preferred"><primary>XLookupKeysym</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlookupkeysym'>
 <funcprototype>
   <funcdef>KeySym <function>XLookupKeysym</function></funcdef>
   <paramdef>XKeyEvent<parameter> *key_event</parameter></paramdef>
@@ -158,7 +158,7 @@ To obtain a KeySym for a specific KeyCode, use
 <function>XKeycodeToKeysym</function>.
 <indexterm significance="preferred"><primary>XKeycodeToKeysym</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xkeycodetokeysym'>
 <funcprototype>
   <funcdef>KeySym <function>XKeycodeToKeysym</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -220,7 +220,7 @@ To obtain a KeyCode for a key having a specific KeySym, use
 <function>XKeysymToKeycode</function>.
 <indexterm significance="preferred"><primary>XKeysymToKeycode</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xkeysymtokeycode'>
 <funcprototype>
   <funcdef>KeyCode <function>XKeysymToKeycode</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -268,7 +268,7 @@ To refresh the stored modifier and keymap information, use
 <function>XRefreshKeyboardMapping</function>.
 <indexterm significance="preferred"><primary>XRefreshKeyboardMapping</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrefreshkeyboardmapping'>
 <funcprototype>
   <funcdef><function>XRefreshKeyboardMapping</function></funcdef>
   <paramdef>XMappingEvent<parameter> *event_map</parameter></paramdef>
@@ -310,7 +310,7 @@ To obtain the uppercase and lowercase forms of a KeySym, use
 <function>XConvertCase</function>.
 <indexterm significance="preferred"><primary>XConvertCase</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xconvertcase'>
 <funcprototype>
   <funcdef>void <function>XConvertCase</function></funcdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
@@ -373,7 +373,7 @@ To convert the name of the KeySym to the KeySym code, use
 <function>XStringToKeysym</function>.
 <indexterm significance="preferred"><primary>XStringToKeysym</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstringtokeysym'>
 <funcprototype>
   <funcdef>KeySym <function>XStringToKeysym</function></funcdef>
   <paramdef>char<parameter> *string</parameter></paramdef>
@@ -423,7 +423,7 @@ To convert a KeySym code to the name of the KeySym, use
 <function>XKeysymToString</function>.
 <indexterm significance="preferred"><primary>XKeysymToString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xkeysymtostring'>
 <funcprototype>
   <funcdef>char *<function>XKeysymToString</function></funcdef>
   <paramdef>KeySym<parameter> keysym</parameter></paramdef>
@@ -671,7 +671,7 @@ To map a key event to an ISO Latin-1 string, use
 <function>XLookupString</function>.
 <indexterm significance="preferred"><primary>XLookupString</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xlookupstring'>
 <funcprototype>
   <funcdef>int <function>XLookupString</function></funcdef>
   <paramdef>XKeyEvent<parameter> *event_struct</parameter></paramdef>
@@ -793,7 +793,7 @@ use
 <function>XRebindKeysym</function>.
 <indexterm significance="preferred"><primary>XRebindKeysym</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrebindkeysym'>
 <funcprototype>
   <funcdef><function>XRebindKeysym</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -898,7 +898,7 @@ To allocate some memory you will never give back, use
 <function>Xpermalloc</function>.
 <indexterm significance="preferred"><primary>Xpermalloc</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xpermalloc'>
 <funcprototype>
   <funcdef>char *<function>Xpermalloc</function></funcdef>
   <paramdef>unsignedint<parameter> size</parameter></paramdef>
@@ -932,7 +932,7 @@ To parse standard window geometry strings, use
 <para>
 <!-- .LP -->
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xparsegeometry'>
 <funcprototype>
   <funcdef>int <function>XParseGeometry</function></funcdef>
   <paramdef>char<parameter> *parsestring</parameter></paramdef>
@@ -1066,7 +1066,7 @@ To construct a window's geometry information, use
 <function>XWMGeometry</function>.
 <indexterm significance="preferred"><primary>XWMGeometry</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xwmgeometry'>
 <funcprototype>
   <funcdef>int <function>XWMGeometry</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1305,7 +1305,7 @@ To generate a region from a polygon, use
 </para>
 <indexterm significance="preferred"><primary>XPolygonRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xpolygonregion'>
 <funcprototype>
   <funcdef>Region <function>XPolygonRegion</function></funcdef>
   <paramdef>XPoint<parameter> points[]</parameter></paramdef>
@@ -1368,7 +1368,7 @@ To set the clip-mask of a GC to a region, use
 <function>XSetRegion</function>.
 <indexterm significance="preferred"><primary>XSetRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsetregion'>
 <funcprototype>
   <funcdef><function>XSetRegion</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -1428,7 +1428,7 @@ To deallocate the storage associated with a specified region, use
 <function>XDestroyRegion</function>.
 <indexterm significance="preferred"><primary>XDestroyRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroyregion'>
 <funcprototype>
   <funcdef><function>XDestroyRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -1464,7 +1464,7 @@ To move a region by a specified amount, use
 <function>XOffsetRegion</function>.
 <indexterm significance="preferred"><primary>XOffsetRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xoffsetregion'>
 <funcprototype>
   <funcdef><function>XOffsetRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -1516,7 +1516,7 @@ To reduce a region by a specified amount, use
 <function>XShrinkRegion</function>.
 <indexterm significance="preferred"><primary>XShrinkRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xshrinkregion'>
 <funcprototype>
   <funcdef><function>XShrinkRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -1579,7 +1579,7 @@ To generate the smallest rectangle enclosing a region, use
 <function>XClipBox</function>.
 <indexterm significance="preferred"><primary>XClipBox</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xclipbox'>
 <funcprototype>
   <funcdef><function>XClipBox</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -1624,7 +1624,7 @@ To compute the intersection of two regions, use
 <function>XIntersectRegion</function>.
 <indexterm significance="preferred"><primary>XIntersectRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xintersectregion'>
 <funcprototype>
   <funcdef><function>XIntersectRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
@@ -1673,7 +1673,7 @@ To compute the union of two regions, use
 <function>XUnionRegion</function>.
 <indexterm significance="preferred"><primary>XUnionRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunionregion'>
 <funcprototype>
   <funcdef><function>XUnionRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
@@ -1722,7 +1722,7 @@ To create a union of a source region and a rectangle, use
 <function>XUnionRectWithRegion</function>.
 <indexterm significance="preferred"><primary>XUnionRectWithRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xunionrectwithregion'>
 <funcprototype>
   <funcdef><function>XUnionRectWithRegion</function></funcdef>
   <paramdef>XRectangle<parameter> *rectangle</parameter></paramdef>
@@ -1779,7 +1779,7 @@ To subtract two regions, use
 <function>XSubtractRegion</function>.
 <indexterm significance="preferred"><primary>XSubtractRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsubtractregion'>
 <funcprototype>
   <funcdef><function>XSubtractRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
@@ -1835,7 +1835,7 @@ of two regions, use
 <function>XXorRegion</function>.
 <indexterm significance="preferred"><primary>XXorRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xxorregion'>
 <funcprototype>
   <funcdef><function>XXorRegion</function></funcdef>
   <paramdef>Regionsra,srb,<parameter> dr_return</parameter></paramdef>
@@ -1892,7 +1892,7 @@ To determine if the specified region is empty, use
 <function>XEmptyRegion</function>.
 <indexterm significance="preferred"><primary>XEmptyRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xemptyregion'>
 <funcprototype>
   <funcdef>Bool <function>XEmptyRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -1928,7 +1928,7 @@ To determine if two regions have the same offset, size, and shape, use
 <function>XEqualRegion</function>.
 <indexterm significance="preferred"><primary>XEqualRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xequalregion'>
 <funcprototype>
   <funcdef>Bool <function>XEqualRegion</function></funcdef>
   <paramdef>Regionr1,<parameter> r2</parameter></paramdef>
@@ -1980,7 +1980,7 @@ To determine if a specified point resides in a specified region, use
 <function>XPointInRegion</function>.
 <indexterm significance="preferred"><primary>XPointInRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xpointinregion'>
 <funcprototype>
   <funcdef>Bool <function>XPointInRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -2039,7 +2039,7 @@ To determine if a specified rectangle is inside a region, use
 <function>XRectInRegion</function>.
 <indexterm significance="preferred"><primary>XRectInRegion</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrectinregion'>
 <funcprototype>
   <funcdef>int <function>XRectInRegion</function></funcdef>
   <paramdef>Region<parameter> r</parameter></paramdef>
@@ -2151,7 +2151,7 @@ To store data in cut buffer 0, use
 <function>XStoreBytes</function>.
 <indexterm significance="preferred"><primary>XStoreBytes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstorebytes'>
 <funcprototype>
   <funcdef><function>XStoreBytes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2216,7 +2216,7 @@ To store data in a specified cut buffer, use
 <function>XStoreBuffer</function>.
 <indexterm significance="preferred"><primary>XStoreBuffer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xstorebuffer'>
 <funcprototype>
   <funcdef><function>XStoreBuffer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2291,7 +2291,7 @@ To return data from cut buffer 0, use
 <function>XFetchBytes</function>.
 <indexterm significance="preferred"><primary>XFetchBytes</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfetchbytes'>
 <funcprototype>
   <funcdef>char *<function>XFetchBytes</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2343,7 +2343,7 @@ To return data from a specified cut buffer, use
 <function>XFetchBuffer</function>.
 <indexterm significance="preferred"><primary>XFetchBuffer</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfetchbuffer'>
 <funcprototype>
   <funcdef>char *<function>XFetchBuffer</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2402,7 +2402,7 @@ To rotate the cut buffers, use
 <function>XRotateBuffers</function>.
 <indexterm significance="preferred"><primary>XRotateBuffers</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xrotatebuffers'>
 <funcprototype>
   <funcdef><function>XRotateBuffers</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2522,7 +2522,7 @@ template, use
 <function>XGetVisualInfo</function>.
 <indexterm significance="preferred"><primary>XGetVisualInfo</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetvisualinfo'>
 <funcprototype>
   <funcdef>XVisualInfo *<function>XGetVisualInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2597,7 +2597,7 @@ class of the screen, use
 <function>XMatchVisualInfo</function>.
 <indexterm significance="preferred"><primary>XMatchVisualInfo</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xmatchvisualinfo'>
 <funcprototype>
   <funcdef>Status <function>XMatchVisualInfo</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2747,7 +2747,7 @@ structure and initialize it with image format values from a display, use
 <function>XCreateImage</function>.
 <indexterm significance="preferred"><primary>XCreateImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreateimage'>
 <funcprototype>
   <funcdef>XImage *<function>XCreateImage</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -2930,7 +2930,7 @@ To obtain a pixel value in an image, use
 <function>XGetPixel</function>.
 <indexterm significance="preferred"><primary>XGetPixel</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xgetpixel'>
 <funcprototype>
   <funcdef>unsigned long <function>XGetPixel</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
@@ -2991,7 +2991,7 @@ To set a pixel value in an image, use
 <function>XPutPixel</function>.
 <indexterm significance="preferred"><primary>XPutPixel</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xputpixel'>
 <funcprototype>
   <funcdef><function>XPutPixel</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
@@ -3063,7 +3063,7 @@ To create a subimage, use
 <function>XSubImage</function>.
 <indexterm significance="preferred"><primary>XSubImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsubimage'>
 <funcprototype>
   <funcdef>XImage *<function>XSubImage</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
@@ -3149,7 +3149,7 @@ To increment each pixel in an image by a constant value, use
 <function>XAddPixel</function>.
 <indexterm significance="preferred"><primary>XAddPixel</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xaddpixel'>
 <funcprototype>
   <funcdef><function>XAddPixel</function></funcdef>
   <paramdef>XImage<parameter> *ximage</parameter></paramdef>
@@ -3198,7 +3198,7 @@ use
 <function>XDestroyImage</function>.
 <indexterm significance="preferred"><primary>XDestroyImage</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdestroyimage'>
 <funcprototype>
   <funcdef><function>XDestroyImage</function></funcdef>
   <paramdef>XImage *<parameter>ximage</parameter></paramdef>
@@ -3285,7 +3285,7 @@ To read a bitmap from a file and store it in a pixmap, use
 <function>XReadBitmapFile</function>.
 <indexterm significance="preferred"><primary>XReadBitmapFile</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xreadbitmapfile'>
 <funcprototype>
   <funcdef>int <function>XReadBitmapFile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3440,7 +3440,7 @@ To read a bitmap from a file and return it as data, use
 <function>XReadBitmapFileData</function>.
 <indexterm significance="preferred"><primary>XReadBitmapFileData</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xreadbitmapfiledata'>
 <funcprototype>
   <funcdef>int <function>XReadBitmapFileData</function></funcdef>
   <paramdef>char<parameter> *filename</parameter></paramdef>
@@ -3537,7 +3537,7 @@ To write out a bitmap from a pixmap to a file, use
 <function>XWriteBitmapFile</function>.
 <indexterm significance="preferred"><primary>XWriteBitmapFile</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xwritebitmapfile'>
 <funcprototype>
   <funcdef>int <function>XWriteBitmapFile</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3664,7 +3664,7 @@ To create a pixmap and then store bitmap-format data into it, use
 <function>XCreatePixmapFromBitmapData</function>.
 <indexterm significance="preferred"><primary>XCreatePixmapFromBitmapData</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatepixmapfrombitmapdata'>
 <funcprototype>
   <funcdef>Pixmap <function>XCreatePixmapFromBitmapData</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3796,7 +3796,7 @@ in a program directly, as opposed to reading it in every time at run time, use
 <function>XCreateBitmapFromData</function>.
 <indexterm significance="preferred"><primary>XCreateBitmapFromData</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xcreatebitmapfromdata'>
 <funcprototype>
   <funcdef>Pixmap <function>XCreateBitmapFromData</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -3942,7 +3942,7 @@ To save a data value that corresponds to a resource ID and context type, use
 <function>XSaveContext</function>.
 <indexterm significance="preferred"><primary>XSaveContext</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xsavecontext'>
 <funcprototype>
   <funcdef>int <function>XSaveContext</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4016,7 +4016,7 @@ To get the data associated with a resource ID and type, use
 <function>XFindContext</function>.
 <indexterm significance="preferred"><primary>XFindContext</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xfindcontext'>
 <funcprototype>
   <funcdef>int <function>XFindContext</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>
@@ -4089,7 +4089,7 @@ To delete an entry for a given resource ID and type, use
 <function>XDeleteContext</function>.
 <indexterm significance="preferred"><primary>XDeleteContext</primary></indexterm>
 <!-- .sM -->
-<funcsynopsis>
+<funcsynopsis id='xdeletecontext'>
 <funcprototype>
   <funcdef>int <function>XDeleteContext</function></funcdef>
   <paramdef>Display<parameter> *display</parameter></paramdef>