[PATCH libX11] specs: move indexterm from glossdef to glossterm

Gaetan Nadon memsize at videotron.ca
Wed Jul 28 07:27:39 PDT 2010


This move fixes a Java class cast exception in the glossary.
The problem was introduced in commit
26f4f0d50840fe5ba4c46aae0a8e68db0059434b

It may not happen on all versions of the doc toolchain.
There is no reason why indexterm cannot appear in glossdef,
this is a workaround to an implementation problem found by
trial and error.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 specs/libX11/glossary.xml |  266 ++++++++++++++++++++++----------------------
 1 files changed, 133 insertions(+), 133 deletions(-)

diff --git a/specs/libX11/glossary.xml b/specs/libX11/glossary.xml
index 116a871..26056fc 100644
--- a/specs/libX11/glossary.xml
+++ b/specs/libX11/glossary.xml
@@ -5,8 +5,8 @@
 <title>Glossary</title>
 <glossentry id="glossary:Access_control_list">
   <glossterm>Access control list</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Access control list</primary></indexterm>
+  <glossdef>
     <para>
 X maintains a list of hosts from which client programs can be run.  
 By default, 
@@ -22,8 +22,8 @@ protocol name and data received by the server at connection setup.
 </glossentry>
 <glossentry id="glossary:Active_grab">
   <glossterm>Active grab</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Active grab</primary></indexterm>
+  <glossdef>
     <para>
 A grab is active when the pointer or keyboard is actually owned by the 
 single grabbing client.
@@ -32,8 +32,8 @@ single grabbing client.
 </glossentry>
 <glossentry id="glossary:Ancestors">
   <glossterm>Ancestors</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Ancestors</primary></indexterm>
+  <glossdef>
     <para>
 If W is an inferior of A, then A is an ancestor of W.
     </para>
@@ -41,8 +41,8 @@ If W is an inferior of A, then A is an ancestor of W.
 </glossentry>
 <glossentry id="glossary:Atom">
   <glossterm>Atom</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Atom</primary></indexterm>
+  <glossdef>
     <para>
 An atom is a unique ID corresponding to a string name.
 Atoms are used to identify properties, types, and selections.
@@ -51,8 +51,8 @@ Atoms are used to identify properties, types, and selections.
 </glossentry>
 <glossentry id="glossary:Background">
   <glossterm>Background</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Background</primary></indexterm>
+  <glossdef>
     <para>
 An
 <symbol>InputOutput</symbol>
@@ -65,8 +65,8 @@ the server automatically tiles those regions with the background.
 </glossentry>
 <glossentry id="glossary:Backing_store">
   <glossterm>Backing store</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Backing store</primary></indexterm>
+  <glossdef>
     <para>
 When a server maintains the contents of a window, 
 the pixels saved off-screen are known as a backing store.
@@ -75,8 +75,8 @@ the pixels saved off-screen are known as a backing store.
 </glossentry>
 <glossentry id="glossary:Base_font_name">
   <glossterm>Base font name</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Base font name</primary></indexterm>
+  <glossdef>
     <para>
 A font name used to select a family of fonts whose members may be encoded 
 in various charsets.
@@ -104,8 +104,8 @@ to load the fonts required to render text.
 </glossentry>
 <glossentry id="glossary:Bit_gravity">
   <glossterm>Bit gravity</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Bit</primary><secondary>gravity</secondary></indexterm>
+  <glossdef>
     <para>
 When a window is resized, 
 the contents of the window are not necessarily discarded.  
@@ -118,8 +118,8 @@ a window is known as bit gravity.
 </glossentry>
 <glossentry id="glossary:Bit_plane">
   <glossterm>Bit plane</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Bit</primary><secondary>plane</secondary></indexterm>
+  <glossdef>
     <para>
 When a pixmap or window is thought of as a stack of bitmaps,
 each bitmap is called a bit plane or plane.
@@ -128,8 +128,8 @@ each bitmap is called a bit plane or plane.
 </glossentry>
 <glossentry id="glossary:Bitmap">
   <glossterm>Bitmap</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Bitmap</primary></indexterm>
+  <glossdef>
     <para>
 A bitmap is a <glossterm linkend="glossary:Pixmap">pixmap</glossterm> of depth one.
     </para>
@@ -137,8 +137,8 @@ A bitmap is a <glossterm linkend="glossary:Pixmap">pixmap</glossterm> of depth o
 </glossentry>
 <glossentry id="glossary:Border">
   <glossterm>Border</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Border</primary></indexterm>
+  <glossdef>
     <para>
 An
 <symbol>InputOutput</symbol>
@@ -151,8 +151,8 @@ Exposure events are never generated for border regions.
 </glossentry>
 <glossentry id="glossary:Button_grabbing">
   <glossterm>Button grabbing</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Button</primary><secondary>grabbing</secondary></indexterm>
+  <glossdef>
     <para>
 Buttons on the pointer can be passively grabbed by a client.
 When the button is pressed, 
@@ -162,8 +162,8 @@ the pointer is then actively grabbed by the client.
 </glossentry>
 <glossentry id="glossary:Byte_order">
   <glossterm>Byte order</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Byte</primary><secondary>order</secondary></indexterm>
+  <glossdef>
     <para>
 For image (pixmap/bitmap) data, 
 the server defines the byte order,
@@ -177,8 +177,8 @@ and the server swaps bytes as necessary.
 </glossentry>
 <glossentry id="glossary:Character">
   <glossterm>Character</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Character</primary></indexterm>
+  <glossdef>
     <para>
 A member of a set of elements used for the organization,
 control, or representation of text (ISO2022, as adapted by XPG3).
@@ -189,8 +189,8 @@ until it is identified as part of a coded character set.
 </glossentry>
 <glossentry id="glossary:Character_glyph">
   <glossterm>Character glyph</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Character glyph</primary></indexterm>
+  <glossdef>
     <para>
 The abstract graphical symbol for a character.
 Character glyphs may or may not map one-to-one to font glyphs,
@@ -201,8 +201,8 @@ Multiple characters may map to a single character glyph.
 </glossentry>
 <glossentry id="glossary:Character_set">
   <glossterm>Character set</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Character set</primary></indexterm>
+  <glossdef>
     <para>
 A collection of characters.
     </para>
@@ -210,8 +210,8 @@ A collection of characters.
 </glossentry>
 <glossentry id="glossary:Charset">
   <glossterm>Charset</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Charset</primary></indexterm>
+  <glossdef>
     <para>
 An encoding with a uniform, state-independent mapping from characters 
 to codepoints.
@@ -236,8 +236,8 @@ for example, ISO8859-1.
 </glossentry>
 <glossentry id="glossary:Children">
   <glossterm>Children</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Children</primary></indexterm>
+  <glossdef>
     <para>
 The children of a window are its first-level subwindows.
     </para>
@@ -245,8 +245,8 @@ The children of a window are its first-level subwindows.
 </glossentry>
 <glossentry id="glossary:Class">
   <glossterm>Class</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Class</primary></indexterm>
+  <glossdef>
     <para>
 Windows can be of different classes or types.
 See the entries for
@@ -259,8 +259,8 @@ windows for further information about valid window types.
 </glossentry>
 <glossentry id="glossary:Client">
   <glossterm>Client</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Client</primary></indexterm>
+  <glossdef>
     <para>
 An application program connects to the window system server by some
 interprocess communication (<acronym>IPC</acronym>) path, such as a <acronym>TCP</acronym> connection or a
@@ -277,8 +277,8 @@ connection lifetimes, not by program lifetimes.
 </glossentry>
 <glossentry id="glossary:Clipping_region">
   <glossterm>Clipping region</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Clipping region</primary></indexterm>
+  <glossdef>
     <para>
 In a graphics context, 
 a bitmap or list of rectangles can be specified
@@ -289,8 +289,8 @@ The image defined by the bitmap or rectangles is called a clipping region.
 </glossentry>
 <glossentry id="glossary:Coded_character">
   <glossterm>Coded character</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Coded character</primary></indexterm>
+  <glossdef>
     <para>
 A character bound to a codepoint.
     </para>
@@ -298,8 +298,8 @@ A character bound to a codepoint.
 </glossentry>
 <glossentry id="glossary:Coded_character_set">
   <glossterm>Coded character set</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Coded character set</primary></indexterm>
+  <glossdef>
     <para>
 A set of unambiguous rules that establishes a character set 
 and the one-to-one relationship between each character of the set 
@@ -312,8 +312,8 @@ codepoints.
 </glossentry>
 <glossentry id="glossary:Codepoint">
   <glossterm>Codepoint</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Codepoint</primary></indexterm>
+  <glossdef>
     <para>
 The coded representation of a single character in a coded character set.
     </para>
@@ -321,8 +321,8 @@ The coded representation of a single character in a coded character set.
 </glossentry>
 <glossentry id="glossary:Colormap">
   <glossterm>Colormap</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Colormap</primary></indexterm>
+  <glossdef>
     <para>
 A colormap consists of a set of entries defining color values.
 The colormap associated with a window is used to display the contents of
@@ -336,8 +336,8 @@ that windows associated with those maps display with true colors.
 </glossentry>
 <glossentry id="glossary:Connection">
   <glossterm>Connection</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Connection</primary></indexterm>
+  <glossdef>
     <para>
 The <acronym>IPC</acronym> path between the server and client program is known as a connection.
 A client program typically (but not necessarily) has one
@@ -347,8 +347,8 @@ connection to the server over which requests and events are sent.
 </glossentry>
 <glossentry id="glossary:Containment">
   <glossterm>Containment</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Containment</primary></indexterm>
+  <glossdef>
     <para>
 A window contains the pointer if the window is viewable and the
 hotspot of the cursor is within a visible region of the window or a
@@ -361,8 +361,8 @@ but no inferior contains the pointer.
 </glossentry>
 <glossentry id="glossary:Coordinate_system">
   <glossterm>Coordinate system</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Coordinate system</primary></indexterm>
+  <glossdef>
     <para>
 The coordinate system has X horizontal and Y vertical, 
 with the origin [0, 0] at the upper left.  
@@ -375,8 +375,8 @@ the origin is inside the border at the inside upper-left corner.
 </glossentry>
 <glossentry id="glossary:Cursor">
   <glossterm>Cursor</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Cursor</primary></indexterm>
+  <glossdef>
     <para>
 A cursor is the visible shape of the pointer on a screen.  
 It consists of a hotspot, a source bitmap, a shape bitmap, 
@@ -388,8 +388,8 @@ appearance when the pointer is in that window.
 </glossentry>
 <glossentry id="glossary:Depth">
   <glossterm>Depth</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Depth</primary></indexterm>
+  <glossdef>
     <para>
 The depth of a window or pixmap is the number of bits per pixel it has.
 The depth of a graphics context is the depth of the drawables it can be
@@ -399,8 +399,8 @@ used in conjunction with graphics output.
 </glossentry>
 <glossentry id="glossary:Device">
   <glossterm>Device</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Device</primary></indexterm>
+  <glossdef>
     <para>
 Keyboards, mice, tablets, track-balls, button boxes, and so on are all
 collectively known as input devices.
@@ -413,8 +413,8 @@ and the pointer.
 </glossentry>
 <glossentry id="glossary:DirectColor">
   <glossterm>DirectColor</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>DirectColor</primary></indexterm>
+  <glossdef>
     <para>
 <symbol>DirectColor</symbol>
 is a class of colormap in which a pixel value is decomposed into three
@@ -429,13 +429,13 @@ changed dynamically.
 </glossentry>
 <glossentry id="glossary:Display">
   <glossterm>Display</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Display</primary></indexterm>
+<indexterm><primary>Display</primary><secondary>structure</secondary></indexterm>
+  <glossdef>
     <para>
 A server, together with its screens and input devices, is called a display.
 The Xlib
 <type>Display</type>
-<indexterm><primary>Display</primary><secondary>structure</secondary></indexterm>
 structure contains all information about the particular display and its screens
 as well as the state that Xlib needs to communicate with the display over a
 particular connection.
@@ -444,8 +444,8 @@ particular connection.
 </glossentry>
 <glossentry id="glossary:Drawable">
   <glossterm>Drawable</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Drawable</primary></indexterm>
+  <glossdef>
     <para>
 Both windows and pixmaps can be used as sources and destinations 
 in graphics operations.  
@@ -459,8 +459,8 @@ graphics operation.
 </glossentry>
 <glossentry id="glossary:Encoding">
   <glossterm>Encoding</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Encoding</primary></indexterm>
+  <glossdef>
     <para>
 A set of unambiguous rules that establishes a character set 
 and a relationship between the characters and their representations.
@@ -488,8 +488,8 @@ Character Set.
 </glossentry>
 <glossentry id="glossary:Escapement">
   <glossterm>Escapement</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Escapement</primary></indexterm>
+  <glossdef>
     <para>
 The escapement of a string is the distance in pixels in the
 primary draw direction from the drawing origin to the origin of the next
@@ -499,8 +499,8 @@ character (that is, the one following the given string) to be drawn.
 </glossentry>
 <glossentry id="glossary:Event">
   <glossterm>Event</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Event</primary></indexterm>
+  <glossdef>
     <para>
 Clients are informed of information asynchronously by means of events.
 These events can be either asynchronously generated from devices or
@@ -515,8 +515,8 @@ Events are typically reported relative to a window.
 </glossentry>
 <glossentry id="glossary:Event_mask">
   <glossterm>Event mask</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Event</primary><secondary>mask</secondary></indexterm>
+  <glossdef>
     <para>
 Events are requested relative to a window.  
 The set of event types a client requests relative to a window is described 
@@ -526,8 +526,8 @@ by using an event mask.
 </glossentry>
 <glossentry id="glossary:Event_propagation">
   <glossterm>Event propagation</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Event</primary><secondary>propagation</secondary></indexterm>
+  <glossdef>
     <para>
 Device-related events propagate from the source window to ancestor
 windows until some client has expressed interest in handling that type
@@ -537,8 +537,8 @@ of event or until the event is discarded explicitly.
 </glossentry>
 <glossentry id="glossary:Event_source">
   <glossterm>Event source</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Event</primary><secondary>source</secondary></indexterm>
+  <glossdef>
     <para>
 The deepest viewable window that the pointer is in is called
 the source of a device-related event.
@@ -547,8 +547,8 @@ the source of a device-related event.
 </glossentry>
 <glossentry id="glossary:Event_synchronization">
   <glossterm>Event synchronization</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Event</primary><secondary>synchronization</secondary></indexterm>
+  <glossdef>
     <para>
 There are certain race conditions possible when demultiplexing device
 events to clients (in particular, deciding where pointer and keyboard
@@ -561,8 +561,8 @@ device events.
 </glossentry>
 <glossentry id="glossary:Exposure_event">
   <glossterm>Exposure event</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Event</primary><secondary>Exposure</secondary></indexterm>
+  <glossdef>
     <para>
 Servers do not guarantee to preserve the contents of windows when
 windows are obscured or reconfigured.  
@@ -573,8 +573,8 @@ of windows have been lost.
 </glossentry>
 <glossentry id="glossary:Extension">
   <glossterm>Extension</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Extension</primary></indexterm>
+  <glossdef>
     <para>
 Named extensions to the core protocol can be defined to extend the system.  
 Extensions to output requests, resources, and event types are all possible
@@ -584,8 +584,8 @@ and expected.
 </glossentry>
 <glossentry id="glossary:Font">
   <glossterm>Font</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Font</primary></indexterm>
+  <glossdef>
     <para>
 A font is an array of glyphs (typically characters).  
 The protocol does no translation or interpretation of character sets.  
@@ -597,8 +597,8 @@ and interline spacing.
 </glossentry>
 <glossentry id="glossary:Font_glyph">
   <glossterm>Font glyph</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Font glyph</primary></indexterm>
+  <glossdef>
     <para>
 The abstract graphical symbol for an index into a font.
     </para>
@@ -606,8 +606,8 @@ The abstract graphical symbol for an index into a font.
 </glossentry>
 <glossentry id="glossary:Frozen_events">
   <glossterm>Frozen events</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Frozen events</primary></indexterm>
+  <glossdef>
     <para>
 Clients can freeze event processing during keyboard and pointer grabs.
     </para>
@@ -615,8 +615,8 @@ Clients can freeze event processing during keyboard and pointer grabs.
 </glossentry>
 <glossentry id="glossary:GC">
   <glossterm>GC</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>GC</primary></indexterm>
+  <glossdef>
     <para>
 GC is an abbreviation for graphics context.
 See <glossterm linkend="glossary:Graphics_context">Graphics context</glossterm>.
@@ -625,8 +625,8 @@ See <glossterm linkend="glossary:Graphics_context">Graphics context</glossterm>.
 </glossentry>
 <glossentry id="glossary:Glyph">
   <glossterm>Glyph</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Glyph</primary></indexterm>
+  <glossdef>
     <para>
 An identified abstract graphical symbol independent of any actual image.
 (ISO/IEC/DIS 9541-1)
@@ -637,8 +637,8 @@ not bound to a codepoint.
 </glossentry>
 <glossentry id="glossary:Glyph_image">
   <glossterm>Glyph image</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Glyph image</primary></indexterm>
+  <glossdef>
     <para>
 An image of a glyph, as obtained from a glyph representation displayed 
 on a presentation surface.
@@ -648,8 +648,8 @@ on a presentation surface.
 </glossentry>
 <glossentry id="glossary:Grab">
   <glossterm>Grab</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Grab</primary></indexterm>
+  <glossdef>
     <para>
 Keyboard keys, the keyboard, pointer buttons, the pointer, 
 and the server can be grabbed for exclusive use by a client.  
@@ -662,8 +662,8 @@ styles of user interfaces.
 </glossentry>
 <glossentry id="glossary:Graphics_context">
   <glossterm>Graphics context</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Graphics context</primary></indexterm>
+  <glossdef>
     <para>
 Various information for graphics output is stored in a graphics
 context (<acronym>GC</acronym>), such as foreground pixel, background
@@ -676,8 +676,8 @@ the graphics context.
 </glossentry>
 <glossentry id="glossary:Gravity">
   <glossterm>Gravity</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Gravity</primary></indexterm>
+  <glossdef>
     <para>
 The contents of windows and windows themselves have a gravity,
 which determines how the contents move when a window is resized.
@@ -688,8 +688,8 @@ See <glossterm linkend="glossary:Bit_gravity">Bit gravity</glossterm> and
 </glossentry>
 <glossentry id="glossary:GrayScale">
   <glossterm>GrayScale</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>GrayScale</primary></indexterm>
+  <glossdef>
     <para>
 <symbol>GrayScale</symbol>
 can be viewed as a degenerate case of 
@@ -702,8 +702,8 @@ The gray values can be changed dynamically.
 </glossentry>
 <glossentry id="glossary:Host_Portable_Character_Encoding">
   <glossterm>Host Portable Character Encoding</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Host Portable Character Encoding</primary></indexterm>
+  <glossdef>
     <para>
 The encoding of the <glossterm linkend="glossary:X_Portable_Character_Set">X Portable Character Set</glossterm> on the host.
 The encoding itself is not defined by this standard,
@@ -716,8 +716,8 @@ in the host encoding.
 </glossentry>
 <glossentry id="glossary:Hotspot">
   <glossterm>Hotspot</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Hotspot</primary></indexterm>
+  <glossdef>
     <para>
 A cursor has an associated hotspot, which defines the point in the
 cursor corresponding to the coordinates reported for the pointer.
@@ -726,8 +726,8 @@ cursor corresponding to the coordinates reported for the pointer.
 </glossentry>
 <glossentry id="glossary:Identifier">
   <glossterm>Identifier</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Identifier</primary></indexterm>
+  <glossdef>
     <para>
 An identifier is a unique value associated with a resource
 that clients use to name that resource.  
@@ -737,8 +737,8 @@ The identifier can be used over any connection to name the resource.
 </glossentry>
 <glossentry id="glossary:Inferiors">
   <glossterm>Inferiors</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Inferiors</primary></indexterm>
+  <glossdef>
     <para>
 The inferiors of a window are all of the subwindows nested below it:
 the children, the children's children, and so on.
@@ -747,8 +747,8 @@ the children, the children's children, and so on.
 </glossentry>
 <glossentry id="glossary:Input_focus">
   <glossterm>Input focus</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Input</primary><secondary>focus</secondary></indexterm>
+  <glossdef>
     <para>
 The input focus is usually a window defining the scope for processing
 of keyboard input.
@@ -764,8 +764,8 @@ of whatever screen the pointer is on at each keyboard event.
 </glossentry>
 <glossentry id="glossary:Input_manager">
   <glossterm>Input manager</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Input</primary><secondary>manager</secondary></indexterm>
+  <glossdef>
     <para>
 Control over keyboard input is typically provided by an input manager 
 client, which usually is part of a window manager.
@@ -774,8 +774,8 @@ client, which usually is part of a window manager.
 </glossentry>
 <glossentry id="glossary:InputOnly_window">
   <glossterm>InputOnly window</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Window</primary><secondary>InputOnly</secondary></indexterm>
+  <glossdef>
     <para>
 An
 <symbol>InputOnly</symbol>
@@ -792,8 +792,8 @@ windows as inferiors.
 </glossentry>
 <glossentry id="glossary:InputOutput_window">
   <glossterm>InputOutput window</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Window</primary><secondary>InputOutput</secondary></indexterm>
+  <glossdef>
     <para>
 An
 <symbol>InputOutput</symbol>
@@ -809,8 +809,8 @@ windows as inferiors.
 </glossentry>
 <glossentry id="glossary:Internationalization">
   <glossterm>Internationalization</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Internationalization</primary></indexterm>
+  <glossdef>
     <para>
 The process of making software adaptable to the requirements
 of different native languages, local customs, and character string encodings.
@@ -821,8 +821,8 @@ without program source modifications or recompilation.
 </glossentry>
 <glossentry id="glossary:ISO2022">
   <glossterm>ISO2022</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>ISO2022</primary></indexterm>
+  <glossdef>
     <para>
 ISO standard for code extension techniques for 7-bit and 8-bit coded 
 character sets.
@@ -831,8 +831,8 @@ character sets.
 </glossentry>
 <glossentry id="glossary:Key_grabbing">
   <glossterm>Key grabbing</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Key</primary><secondary>grabbing</secondary></indexterm>
+  <glossdef>
     <para>
 Keys on the keyboard can be passively grabbed by a client.  
 When the key is pressed, 
@@ -842,8 +842,8 @@ the keyboard is then actively grabbed by the client.
 </glossentry>
 <glossentry id="glossary:Keyboard_grabbing">
   <glossterm>Keyboard grabbing</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Keyboard</primary><secondary>grabbing</secondary></indexterm>
+  <glossdef>
     <para>
 A client can actively grab control of the keyboard, and key events
 will be sent to that client rather than the client the events would
@@ -853,8 +853,8 @@ normally have been sent to.
 </glossentry>
 <glossentry id="glossary:Keysym">
   <glossterm>Keysym</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Keysym</primary></indexterm>
+  <glossdef>
     <para>
 An encoding of a symbol on a keycap on a keyboard.
     </para>
@@ -862,8 +862,8 @@ An encoding of a symbol on a keycap on a keyboard.
 </glossentry>
 <glossentry id="glossary:Latin-1">
   <glossterm>Latin-1</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Latin-1</primary></indexterm>
+  <glossdef>
     <para>
 The coded character set defined by the ISO8859-1 standard.
     </para>
@@ -871,8 +871,8 @@ The coded character set defined by the ISO8859-1 standard.
 </glossentry>
 <glossentry id="glossary:Latin_Portable_Character_Encoding">
   <glossterm>Latin Portable Character Encoding</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Latin Portable Character Encoding</primary></indexterm>
+  <glossdef>
     <para>
 The encoding of the X Portable Character Set using the Latin-1 codepoints
 plus ASCII control characters.
@@ -884,8 +884,8 @@ not all of Latin-1.
 </glossentry>
 <glossentry id="glossary:Locale">
   <glossterm>Locale</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Locale</primary></indexterm>
+  <glossdef>
     <para>
 The international environment of a computer program defining the ``localized''
 behavior of that program at run-time.
@@ -917,8 +917,8 @@ Encoding and decoding for inter-client text communication
 </glossentry>
 <glossentry id="glossary:Locale_name">
   <glossterm>Locale name</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Locale name</primary></indexterm>
+  <glossdef>
     <para>
 The identifier used to select the desired locale for the host C library 
 and X library functions.
@@ -931,8 +931,8 @@ function.
 </glossentry>
 <glossentry id="glossary:Localization">
   <glossterm>Localization</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Localization</primary></indexterm>
+  <glossdef>
     <para>
 The process of establishing information within a computer system specific 
 to the operation of particular native languages, local customs 
@@ -943,8 +943,8 @@ and coded character sets.
 </glossentry>
 <glossentry id="glossary:Mapped">
   <glossterm>Mapped</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Mapped window</primary></indexterm>
+  <glossdef>
     <para>
 A window is said to be mapped if a map call has been performed on it.
 Unmapped windows and their inferiors are never viewable or visible.
@@ -953,8 +953,8 @@ Unmapped windows and their inferiors are never viewable or visible.
 </glossentry>
 <glossentry id="glossary:Modifier_keys">
   <glossterm>Modifier keys</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Modifier keys</primary></indexterm>
+  <glossdef>
     <para>
 Shift, Control, Meta, Super, Hyper, Alt, Compose, Apple, CapsLock,
 ShiftLock, and similar keys are called modifier keys.
@@ -963,8 +963,8 @@ ShiftLock, and similar keys are called modifier keys.
 </glossentry>
 <glossentry id="glossary:Monochrome">
   <glossterm>Monochrome</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Monochrome</primary></indexterm>
+  <glossdef>
     <para>
 Monochrome is a special case of 
 <glossterm linkend="glossary:StaticGray"><symbol>StaticGray</symbol></glossterm>
@@ -974,8 +974,8 @@ in which there are only two colormap entries.
 </glossentry>
 <glossentry id="glossary:Multibyte">
   <glossterm>Multibyte</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Multibyte</primary></indexterm>
+  <glossdef>
     <para>
 A character whose codepoint is stored in more than one byte;
 any encoding which can contain multibyte characters;
@@ -988,8 +988,8 @@ imply only that the strings <emphasis remap='I'>may</emphasis> contain multibyte
 </glossentry>
 <glossentry id="glossary:Obscure">
   <glossterm>Obscure</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Obscure</primary></indexterm>
+  <glossdef>
     <para>
 A window is obscured if some other window obscures it.
 A window can be partially obscured and so still have visible regions.
@@ -1005,8 +1005,8 @@ Also note that window borders are included in the calculation.
 </glossentry>
 <glossentry id="glossary:Occlude">
   <glossterm>Occlude</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Occlude</primary></indexterm>
+  <glossdef>
     <para>
 A window is occluded if some other window occludes it.
 Window A occludes window B if both are mapped, 
@@ -1023,8 +1023,8 @@ windows never obscure other windows but can occlude other windows.
 </glossentry>
 <glossentry id="glossary:Padding">
   <glossterm>Padding</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Padding</primary></indexterm>
+  <glossdef>
     <para>
 Some padding bytes are inserted in the data stream to maintain
 alignment of the protocol requests on natural boundaries.  
@@ -1034,8 +1034,8 @@ This increases ease of portability to some machine architectures.
 </glossentry>
 <glossentry id="glossary:Parent_window">
   <glossterm>Parent window</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Window</primary><secondary>parent</secondary></indexterm>
+  <glossdef>
     <para>
 If C is a child of P, then P is the parent of C.
     </para>
@@ -1043,8 +1043,8 @@ If C is a child of P, then P is the parent of C.
 </glossentry>
 <glossentry id="glossary:Passive_grab">
   <glossterm>Passive grab</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Passive grab</primary></indexterm>
+  <glossdef>
     <para>
 Grabbing a key or button is a passive grab.  
 The grab activates when the key or button is actually pressed.
@@ -1053,8 +1053,8 @@ The grab activates when the key or button is actually pressed.
 </glossentry>
 <glossentry id="glossary:Pixel_value">
   <glossterm>Pixel value</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Pixel value</primary></indexterm>
+  <glossdef>
     <para>
 A pixel is an N-bit value,
 where N is the number of bit planes used in a particular window or pixmap
@@ -1066,8 +1066,8 @@ displayed.
 </glossentry>
 <glossentry id="glossary:Pixmap">
   <glossterm>Pixmap</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Pixmap</primary></indexterm>
+  <glossdef>
     <para>
 A pixmap is a three-dimensional array of bits.  
 A pixmap is normally thought of as a two-dimensional array of pixels, 
@@ -1080,8 +1080,8 @@ A pixmap can only be used on the screen that it was created in.
 </glossentry>
 <glossentry id="glossary:Plane">
   <glossterm>Plane</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Plane</primary></indexterm>
+  <glossdef>
     <para>
 When a pixmap or window is thought of as a stack of bitmaps, each
 bitmap is called a plane or bit plane.
@@ -1090,8 +1090,8 @@ bitmap is called a plane or bit plane.
 </glossentry>
 <glossentry id="glossary:Plane_mask">
   <glossterm>Plane mask</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Plane</primary><secondary>mask</secondary></indexterm>
+  <glossdef>
     <para>
 Graphics operations can be restricted to only affect a subset of bit
 planes of a destination.  
@@ -1102,8 +1102,8 @@ The plane mask is stored in a graphics context.
 </glossentry>
 <glossentry id="glossary:Pointer">
   <glossterm>Pointer</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Pointer</primary></indexterm>
+  <glossdef>
     <para>
 The pointer is the pointing device currently attached to the cursor
 and tracked on the screens.
@@ -1112,8 +1112,8 @@ and tracked on the screens.
 </glossentry>
 <glossentry id="glossary:Pointer_grabbing">
   <glossterm>Pointer grabbing</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Pointer</primary><secondary>grabbing</secondary></indexterm>
+  <glossdef>
     <para>
 A client can actively grab control of the pointer. 
 Then button and motion events will be sent to that client 
@@ -1123,8 +1123,8 @@ rather than the client the events would normally have been sent to.
 </glossentry>
 <glossentry id="glossary:Pointing_device">
   <glossterm>Pointing device</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Pointing device</primary></indexterm>
+  <glossdef>
     <para>
 A pointing device is typically a mouse, tablet, or some other
 device with effective dimensional motion.  
@@ -1135,8 +1135,8 @@ which tracks whatever pointing device is attached as the pointer.
 </glossentry>
 <glossentry id="glossary:POSIX">
   <glossterm><acronym>POSIX</acronym></glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary><acronym>POSIX</acronym></primary></indexterm>
+  <glossdef>
     <para>
 Portable Operating System Interface, ISO/IEC 9945-1 (IEEE Std 1003.1).
     </para>
@@ -1144,8 +1144,8 @@ Portable Operating System Interface, ISO/IEC 9945-1 (IEEE Std 1003.1).
 </glossentry>
 <glossentry id="glossary:POSIX_Portable_Filename_Character_Set">
   <glossterm><acronym>POSIX</acronym> Portable Filename Character Set</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary><acronym>POSIX</acronym> Portable Filename Character Set</primary></indexterm>
+  <glossdef>
     <para>
 The set of 65 characters which can be used in naming files on a <acronym>POSIX</acronym>-compliant
 host that are correctly processed in all locales.
@@ -1160,8 +1160,8 @@ a..z A..Z 0..9 ._-
 </glossentry>
 <glossentry id="glossary:Property">
   <glossterm>Property</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Property</primary></indexterm>
+  <glossdef>
     <para>
 Windows can have associated properties that consist of a name, a type,
 a data format, and some data. 
@@ -1174,8 +1174,8 @@ hints, program names, and icon formats with a window manager.
 </glossentry>
 <glossentry id="glossary:Property_list">
   <glossterm>Property list</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Property list</primary></indexterm>
+  <glossdef>
     <para>
 The property list of a window is the list of properties that have
 been defined for the window.
@@ -1184,8 +1184,8 @@ been defined for the window.
 </glossentry>
 <glossentry id="glossary:PseudoColor">
   <glossterm>PseudoColor</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>PseudoColor</primary></indexterm>
+  <glossdef>
     <para>
 <symbol>PseudoColor</symbol>
 is a class of colormap in which a pixel value indexes the colormap entry to
@@ -1197,8 +1197,8 @@ The <acronym>RGB</acronym> values can be changed dynamically.
 </glossentry>
 <glossentry id="glossary:Rectangle">
   <glossterm>Rectangle</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Rectangle</primary></indexterm>
+  <glossdef>
     <para>
 A rectangle specified by [x,y,w,h] has an infinitely thin
 outline path with corners at [x,y], [x+w,y], [x+w,y+h], and [x, y+h].
@@ -1214,8 +1214,8 @@ a single pixel would be drawn.
 </glossentry>
 <glossentry id="glossary:Redirecting_control">
   <glossterm>Redirecting control</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Redirecting control</primary></indexterm>
+  <glossdef>
     <para>
 Window managers (or client programs) may enforce window layout
 policy in various ways.  
@@ -1227,8 +1227,8 @@ rather than the operation actually being performed.
 </glossentry>
 <glossentry id="glossary:Reply">
   <glossterm>Reply</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Reply</primary></indexterm>
+  <glossdef>
     <para>
 Information requested by a client program using the X protocol 
 is sent back to the client with a reply.
@@ -1240,8 +1240,8 @@ but some requests generate multiple replies.
 </glossentry>
 <glossentry id="glossary:Request">
   <glossterm>Request</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Request</primary></indexterm>
+  <glossdef>
     <para>
 A command to the server is called a request.
 It is a single block of data sent over a connection.
@@ -1250,8 +1250,8 @@ It is a single block of data sent over a connection.
 </glossentry>
 <glossentry id="glossary:Resource">
   <glossterm>Resource</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Resource</primary></indexterm>
+  <glossdef>
     <para>
 Windows, pixmaps, cursors, fonts, graphics contexts, and colormaps are
 known as resources.  
@@ -1263,8 +1263,8 @@ connection over which the resource was created.
 </glossentry>
 <glossentry id="glossary:RGB_values">
   <glossterm><acronym>RGB</acronym> values</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary><acronym>RGB</acronym> values</primary></indexterm>
+  <glossdef>
     <para>
 <acronym>RGB</acronym> values are the red, green, and blue intensity values that are used
 to define a color.
@@ -1276,8 +1276,8 @@ The X server scales these values to match the display hardware.
 </glossentry>
 <glossentry id="glossary:Root">
   <glossterm>Root</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Root</primary></indexterm>
+  <glossdef>
     <para>
 The root of a pixmap or graphics context is the same as the root 
 of whatever drawable was used when the pixmap or GC was created.  
@@ -1287,8 +1287,8 @@ The root of a window is the root window under which the window was created.
 </glossentry>
 <glossentry id="glossary:Root_window">
   <glossterm>Root window</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Window</primary><secondary>root</secondary></indexterm>
+  <glossdef>
     <para>
 Each screen has a root window covering it.
 The root window cannot be reconfigured or unmapped, 
@@ -1299,8 +1299,8 @@ A root window has no parent.
 </glossentry>
 <glossentry id="glossary:Save_set">
   <glossterm>Save set</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Save set</primary></indexterm>
+  <glossdef>
     <para>
 The save set of a client is a list of other clients' windows that,
 if they are inferiors of one of the client's windows at connection
@@ -1313,8 +1313,8 @@ lost windows if the manager should terminate abnormally.
 </glossentry>
 <glossentry id="glossary:Scanline">
   <glossterm>Scanline</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Scanline</primary></indexterm>
+  <glossdef>
     <para>
 A scanline is a list of pixel or bit values viewed as a horizontal
 row (all values having the same y coordinate) of an image, with the
@@ -1324,8 +1324,8 @@ values ordered by increasing the x coordinate.
 </glossentry>
 <glossentry id="glossary:Scanline_order">
   <glossterm>Scanline order</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Scanline</primary><secondary>order</secondary></indexterm>
+  <glossdef>
     <para>
 An image represented in scanline order contains scanlines ordered by
 increasing the y coordinate.
@@ -1334,8 +1334,10 @@ increasing the y coordinate.
 </glossentry>
 <glossentry id="glossary:Screen">
   <glossterm>Screen</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Screen</primary></indexterm>
+<indexterm><primary>Screen</primary><secondary>structure</secondary></indexterm>
+<indexterm><primary>Display</primary><secondary>structure</secondary></indexterm>
+  <glossdef>
     <para>
 A server can provide several independent screens, 
 which typically have physically independent monitors.  
@@ -1343,19 +1345,17 @@ This would be the expected configuration when there is only a single keyboard
 and pointer shared among the screens.
 A 
 <type>Screen</type>
-<indexterm><primary>Screen</primary><secondary>structure</secondary></indexterm>
 structure contains the information about that screen
 and is linked to the 
 <type>Display</type>
-<indexterm><primary>Display</primary><secondary>structure</secondary></indexterm>
 structure.
     </para>
   </glossdef>
 </glossentry>
 <glossentry id="glossary:Selection">
   <glossterm>Selection</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Selection</primary></indexterm>
+  <glossdef>
     <para>
 A selection can be thought of as an indirect property with dynamic
 type.
@@ -1387,8 +1387,8 @@ The protocol does not constrain the semantics.
 </glossentry>
 <glossentry id="glossary:Server">
   <glossterm>Server</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Server</primary></indexterm>
+  <glossdef>
     <para>
 The server, which is also referred to as the X server, 
 provides the basic windowing mechanism.  
@@ -1400,8 +1400,8 @@ and demultiplexes input back to the appropriate clients.
 </glossentry>
 <glossentry id="glossary:Server_grabbing">
   <glossterm>Server grabbing</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Server</primary><secondary>grabbing</secondary></indexterm>
+  <glossdef>
     <para>
 The server can be grabbed by a single client for exclusive use.  
 This prevents processing of any requests from other client connections until
@@ -1413,8 +1413,8 @@ pop-up menus, or executing requests indivisibly.
 </glossentry>
 <glossentry id="glossary:Shift_sequence">
   <glossterm>Shift sequence</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Shift sequence</primary></indexterm>
+  <glossdef>
     <para>
 ISO2022 defines control characters and escape sequences 
 which temporarily (single shift) or permanently (locking shift) cause a
@@ -1424,8 +1424,8 @@ different character set to be in effect (``invoking'' a character set).
 </glossentry>
 <glossentry id="glossary:Sibling">
   <glossterm>Sibling</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Sibling</primary></indexterm>
+  <glossdef>
     <para>
 Children of the same parent window are known as sibling windows.
     </para>
@@ -1433,8 +1433,8 @@ Children of the same parent window are known as sibling windows.
 </glossentry>
 <glossentry id="glossary:Stacking_order">
   <glossterm>Stacking order</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Stacking order</primary></indexterm>
+  <glossdef>
     <para>
 Sibling windows, similar to sheets of paper on a desk,
 can stack on top of each other.  
@@ -1445,8 +1445,8 @@ The relationship between sibling windows is known as the stacking order.
 </glossentry>
 <glossentry id="glossary:State-dependent_encoding">
   <glossterm>State-dependent encoding</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>State-dependent encoding</primary></indexterm>
+  <glossdef>
     <para>
 An encoding in which an invocation of a charset can apply to multiple
 characters in sequence.
@@ -1460,8 +1460,8 @@ this means use of locking shifts, not single shifts.
 </glossentry>
 <glossentry id="glossary:State-independent_encoding">
   <glossterm>State-independent encoding</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>State-independent encoding</primary></indexterm>
+  <glossdef>
     <para>
 Any encoding in which the invocations of the charsets are fixed,
 or span only a single character.
@@ -1472,8 +1472,8 @@ this means use of at most single shifts, not locking shifts.
 </glossentry>
 <glossentry id="glossary:StaticColor">
   <glossterm>StaticColor</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>StaticColor</primary></indexterm>
+  <glossdef>
     <para>
 <symbol>StaticColor</symbol>
 can be viewed as a degenerate case of 
@@ -1484,8 +1484,8 @@ in which the <acronym>RGB</acronym> values are predefined and read-only.
 </glossentry>
 <glossentry id="glossary:StaticGray">
   <glossterm>StaticGray</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>StaticGray</primary></indexterm>
+  <glossdef>
     <para>
 <symbol>StaticGray</symbol>
 can be viewed as a degenerate case of 
@@ -1497,8 +1497,8 @@ The values are typically linear or near-linear increasing ramps.
 </glossentry>
 <glossentry id="glossary:Status">
   <glossterm>Status</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Status</primary></indexterm>
+  <glossdef>
     <para>
 Many Xlib functions return a success status.
 If the function does not succeed,
@@ -1508,8 +1508,8 @@ however, its arguments are not disturbed.
 </glossentry>
 <glossentry id="glossary:Stipple">
   <glossterm>Stipple</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Stipple</primary></indexterm>
+  <glossdef>
     <para>
 A stipple pattern is a bitmap that is used to tile a region to serve
 as an additional clip mask for a fill operation with the foreground
@@ -1527,9 +1527,9 @@ color.
 </glossentry>
 <glossentry id="glossary:String_Equivalence">
   <glossterm>String Equivalence</glossterm>
+<indexterm significance="preferred"><primary>String Equivalence</primary></indexterm>
   <glossdef>
     <para>
-<indexterm significance="preferred"><primary>String Equivalence</primary></indexterm>
 Two ISO Latin-1 STRING8 values are considered equal if they are the same
 length and if corresponding bytes are either equal or are equivalent as
 follows:  decimal values 65 to 90 inclusive (characters ``A'' to ``Z'') are
@@ -1545,8 +1545,8 @@ are pairwise equivalent to decimal values 246 to 254 inclusive
 </glossentry>
 <glossentry id="glossary:Tile">
   <glossterm>Tile</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Tile</primary></indexterm>
+  <glossdef>
     <para>
 A pixmap can be replicated in two dimensions to tile a region.  
 The pixmap itself is also known as a tile.
@@ -1555,8 +1555,8 @@ The pixmap itself is also known as a tile.
 </glossentry>
 <glossentry id="glossary:Timestamp">
   <glossterm>Timestamp</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Timestamp</primary></indexterm>
+  <glossdef>
     <para>
 A timestamp is a time value expressed in milliseconds. 
 It is typically the time since the last server reset.
@@ -1574,8 +1574,8 @@ This value is reserved for use in requests to represent the current server time.
 </glossentry>
 <glossentry id="glossary:TrueColor">
   <glossterm>TrueColor</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>TrueColor</primary></indexterm>
+  <glossdef>
     <para>
 <symbol>TrueColor</symbol>
 can be viewed as a degenerate case of 
@@ -1589,8 +1589,8 @@ The values are typically linear or near-linear increasing ramps.
 </glossentry>
 <glossentry id="glossary:Type">
   <glossterm>Type</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Type</primary></indexterm>
+  <glossdef>
     <para>
 A type is an arbitrary atom used to identify the interpretation of property 
 data.  
@@ -1603,8 +1603,8 @@ and clients also can define new types.
 </glossentry>
 <glossentry id="glossary:Viewable">
   <glossterm>Viewable</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Viewable</primary></indexterm>
+  <glossdef>
     <para>
 A window is viewable if it and all of its ancestors are mapped.  
 This does not imply that any portion of the window is actually visible.
@@ -1616,8 +1616,8 @@ backing store.
 </glossentry>
 <glossentry id="glossary:Visible">
   <glossterm>Visible</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Visible</primary></indexterm>
+  <glossdef>
     <para>
 A region of a window is visible if someone looking at the screen can
 actually see it; that is, the window is viewable and the region is not occluded
@@ -1627,8 +1627,8 @@ by any other window.
 </glossentry>
 <glossentry id="glossary:Whitespace">
   <glossterm>Whitespace</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Whitespace</primary></indexterm>
+  <glossdef>
     <para>
 Any spacing character.
 On implementations that conform to the ANSI C library,
@@ -1640,8 +1640,8 @@ returns true.
 </glossentry>
 <glossentry id="glossary:Window_gravity">
   <glossterm>Window gravity</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Window</primary><secondary>gravity</secondary></indexterm>
+  <glossdef>
     <para>
 When windows are resized, 
 subwindows may be repositioned automatically relative to some position in the 
@@ -1653,8 +1653,8 @@ as window gravity.
 </glossentry>
 <glossentry id="glossary:Window_manager">
   <glossterm>Window manager</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Window</primary><secondary>manager</secondary></indexterm>
+  <glossdef>
     <para>
 Manipulation of windows on the screen and much of the user interface
 (policy) is typically provided by a window manager client.
@@ -1663,8 +1663,8 @@ Manipulation of windows on the screen and much of the user interface
 </glossentry>
 <glossentry id="glossary:X_Portable_Character_Set">
   <glossterm>X Portable Character Set</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>X Portable Character Set</primary></indexterm>
+  <glossdef>
     <para>
 A basic set of 97 characters which are assumed to exist in all
 locales supported by Xlib.  This set contains the following characters:
@@ -1686,8 +1686,8 @@ see the <glossterm linkend="glossary:Host_Portable_Character_Encoding">Host Port
 </glossentry>
 <glossentry id="glossary:XLFD">
   <glossterm><acronym>XLFD</acronym></glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary><acronym>XLFD</acronym></primary></indexterm>
+  <glossdef>
     <para>
 The X Logical Font Description Conventions that define a standard syntax 
 for structured font names.
@@ -1696,8 +1696,8 @@ for structured font names.
 </glossentry>
 <glossentry id="glossary:XY_format">
   <glossterm>XY format</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>XY format</primary></indexterm>
+  <glossdef>
     <para>
 The data for a pixmap is said to be in XY format if it is organized as
 a set of bitmaps representing individual bit planes with the planes
@@ -1707,8 +1707,8 @@ appearing from most-significant to least-significant bit order.
 </glossentry>
 <glossentry id="glossary:Z_format">
   <glossterm>Z format</glossterm>
-  <glossdef>
 <indexterm significance="preferred"><primary>Z format</primary></indexterm>
+  <glossdef>
     <para>
 The data for a pixmap is said to be in Z format if it is organized as
 a set of pixel values in scanline order.
-- 
1.6.0.4

It would be useful to test this patch on other toolchain version.
I used xmlto 0.0.20 and fop 0.95




More information about the xorg-devel mailing list