aboutsummaryrefslogtreecommitdiff
path: root/libX11/man/xkb
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-10-04 19:13:27 +0000
committermarha <marha@users.sourceforge.net>2009-10-04 19:13:27 +0000
commit77a4732b0637493966889fe3545966fdc12a1b5e (patch)
tree42ab7f9667a7b3bdd89e6bb5c50793dad170b974 /libX11/man/xkb
parent67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff)
downloadvcxsrv-77a4732b0637493966889fe3545966fdc12a1b5e.tar.gz
vcxsrv-77a4732b0637493966889fe3545966fdc12a1b5e.tar.bz2
vcxsrv-77a4732b0637493966889fe3545966fdc12a1b5e.zip
Updated to
xkeyboard-config-1.7 pixman-0.16.2 libX11-1.3 libXinerama-1.1 xkbcomp-1.1.1 recordproto-1.14 xineramaproto-1.2 inputproto-2.0 compositeproto-0.4.1 xorg-server-1.7.0
Diffstat (limited to 'libX11/man/xkb')
-rw-r--r--libX11/man/xkb/Makefile.am2
-rw-r--r--libX11/man/xkb/Makefile.in17
-rw-r--r--libX11/man/xkb/XkbActionCtrls.man9
-rw-r--r--libX11/man/xkb/XkbAddDeviceLedInfo.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomColor.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomDoodad.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomKey.man7
-rw-r--r--libX11/man/xkb/XkbAddGeomKeyAlias.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomOutline.man11
-rw-r--r--libX11/man/xkb/XkbAddGeomOverlay.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomOverlayKey.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomOverlayRow.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomProperty.man15
-rw-r--r--libX11/man/xkb/XkbAddGeomRow.man11
-rw-r--r--libX11/man/xkb/XkbAddGeomSection.man23
-rw-r--r--libX11/man/xkb/XkbAddGeomShape.man15
-rw-r--r--libX11/man/xkb/XkbAddSymInterpret.man19
-rw-r--r--libX11/man/xkb/XkbAllocClientMap.man15
-rw-r--r--libX11/man/xkb/XkbAllocCompatMap.man15
-rw-r--r--libX11/man/xkb/XkbAllocControls.man11
-rw-r--r--libX11/man/xkb/XkbAllocDeviceInfo.man15
-rw-r--r--libX11/man/xkb/XkbAllocDeviceLedInfo.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomColors.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomDoodads.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomKeyAliases.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomKeys.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomOutlines.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomOverlayKey.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomOverlayRows.man13
-rw-r--r--libX11/man/xkb/XkbAllocGeomOverlays.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomPoints.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomProps.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomRows.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomSectionDoodads.man14
-rw-r--r--libX11/man/xkb/XkbAllocGeomSections.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeomShapes.man11
-rw-r--r--libX11/man/xkb/XkbAllocGeometry.man11
-rw-r--r--libX11/man/xkb/XkbAllocIndicatorMaps.man7
-rw-r--r--libX11/man/xkb/XkbAllocKeyboard.man5
-rw-r--r--libX11/man/xkb/XkbAllocNames.man19
-rw-r--r--libX11/man/xkb/XkbAllocServerMap.man15
-rw-r--r--libX11/man/xkb/XkbApplyCompatMapToKey.man15
-rw-r--r--libX11/man/xkb/XkbBell.man21
-rw-r--r--libX11/man/xkb/XkbBellEvent.man19
-rw-r--r--libX11/man/xkb/XkbChangeControls.man15
-rw-r--r--libX11/man/xkb/XkbChangeDeviceInfo.man15
-rw-r--r--libX11/man/xkb/XkbChangeEnabledControls.man19
-rw-r--r--libX11/man/xkb/XkbChangeIndicators.man19
-rw-r--r--libX11/man/xkb/XkbChangeMap.man15
-rw-r--r--libX11/man/xkb/XkbChangeNames.man15
-rw-r--r--libX11/man/xkb/XkbChangeTypesOfKey.man27
-rw-r--r--libX11/man/xkb/XkbComputeRowBounds.man15
-rw-r--r--libX11/man/xkb/XkbComputeSectionBounds.man11
-rw-r--r--libX11/man/xkb/XkbComputeShapeBounds.man7
-rw-r--r--libX11/man/xkb/XkbComputeShapeTop.man11
-rw-r--r--libX11/man/xkb/XkbCopyKeyType.man11
-rw-r--r--libX11/man/xkb/XkbCopyKeyTypes.man15
-rw-r--r--libX11/man/xkb/XkbDeviceBell.man33
-rw-r--r--libX11/man/xkb/XkbDeviceBellEvent.man33
-rw-r--r--libX11/man/xkb/XkbFindOverlayForKey.man15
-rw-r--r--libX11/man/xkb/XkbForceBell.man13
-rw-r--r--libX11/man/xkb/XkbForceDeviceBell.man29
-rw-r--r--libX11/man/xkb/XkbFreeClientMap.man15
-rw-r--r--libX11/man/xkb/XkbFreeCompatMap.man15
-rw-r--r--libX11/man/xkb/XkbFreeComponentList.man7
-rw-r--r--libX11/man/xkb/XkbFreeControls.man15
-rw-r--r--libX11/man/xkb/XkbFreeDeviceInfo.man15
-rw-r--r--libX11/man/xkb/XkbFreeGeomColors.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomDoodads.man15
-rw-r--r--libX11/man/xkb/XkbFreeGeomKeyAliases.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomKeys.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomOutlines.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomOverlayKeys.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomOverlayRows.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomOverlays.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomPoints.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomProperties.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomRows.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomSections.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeomShapes.man19
-rw-r--r--libX11/man/xkb/XkbFreeGeometry.man15
-rw-r--r--libX11/man/xkb/XkbFreeIndicatorMaps.man7
-rw-r--r--libX11/man/xkb/XkbFreeKeyboard.man15
-rw-r--r--libX11/man/xkb/XkbFreeNames.man15
-rw-r--r--libX11/man/xkb/XkbFreeServerMap.man15
-rw-r--r--libX11/man/xkb/XkbGetAccessXTimeout.man31
-rw-r--r--libX11/man/xkb/XkbGetAutoRepeatRate.man19
-rw-r--r--libX11/man/xkb/XkbGetAutoResetControls.man15
-rw-r--r--libX11/man/xkb/XkbGetBounceKeysDelay.man15
-rw-r--r--libX11/man/xkb/XkbGetCompatMap.man15
-rw-r--r--libX11/man/xkb/XkbGetControls.man15
-rw-r--r--libX11/man/xkb/XkbGetControlsChanges.man15
-rw-r--r--libX11/man/xkb/XkbGetDetectableAutorepeat.man11
-rw-r--r--libX11/man/xkb/XkbGetDeviceButtonActions.man23
-rw-r--r--libX11/man/xkb/XkbGetDeviceInfo.man25
-rw-r--r--libX11/man/xkb/XkbGetDeviceInfoChanges.man15
-rw-r--r--libX11/man/xkb/XkbGetDeviceLedInfo.man23
-rw-r--r--libX11/man/xkb/XkbGetGeometry.man11
-rw-r--r--libX11/man/xkb/XkbGetIndicatorChanges.man19
-rw-r--r--libX11/man/xkb/XkbGetIndicatorMap.man15
-rw-r--r--libX11/man/xkb/XkbGetIndicatorState.man15
-rw-r--r--libX11/man/xkb/XkbGetKeyActions.man19
-rw-r--r--libX11/man/xkb/XkbGetKeyBehaviors.man19
-rw-r--r--libX11/man/xkb/XkbGetKeyExplicitComponents.man22
-rw-r--r--libX11/man/xkb/XkbGetKeyModifierMap.man19
-rw-r--r--libX11/man/xkb/XkbGetKeySyms.man19
-rw-r--r--libX11/man/xkb/XkbGetKeyTypes.man19
-rw-r--r--libX11/man/xkb/XkbGetKeyVirtualModMap.man19
-rw-r--r--libX11/man/xkb/XkbGetKeyboard.man15
-rw-r--r--libX11/man/xkb/XkbGetKeyboardByName.man27
-rw-r--r--libX11/man/xkb/XkbGetMap.man15
-rw-r--r--libX11/man/xkb/XkbGetNameChanges.man15
-rw-r--r--libX11/man/xkb/XkbGetNamedGeometry.man17
-rw-r--r--libX11/man/xkb/XkbGetNamedIndicator.man31
-rw-r--r--libX11/man/xkb/XkbGetNames.man15
-rw-r--r--libX11/man/xkb/XkbGetSlowKeysDelay.man15
-rw-r--r--libX11/man/xkb/XkbGetState.man15
-rw-r--r--libX11/man/xkb/XkbGetStickyKeysOptions.man15
-rw-r--r--libX11/man/xkb/XkbGetUpdatedMap.man15
-rw-r--r--libX11/man/xkb/XkbGetVirtualMods.man15
-rw-r--r--libX11/man/xkb/XkbGetXlibControls.man7
-rw-r--r--libX11/man/xkb/XkbIgnoreExtension.man9
-rw-r--r--libX11/man/xkb/XkbInitCanonicalKeyTypes.man15
-rw-r--r--libX11/man/xkb/XkbKeyAction.man15
-rw-r--r--libX11/man/xkb/XkbKeyActionEntry.man21
-rw-r--r--libX11/man/xkb/XkbKeyActionsPtr.man13
-rw-r--r--libX11/man/xkb/XkbKeyGroupInfo.man13
-rw-r--r--libX11/man/xkb/XkbKeyGroupWidth.man17
-rw-r--r--libX11/man/xkb/XkbKeyGroupsWidth.man13
-rw-r--r--libX11/man/xkb/XkbKeyHasActions.man13
-rw-r--r--libX11/man/xkb/XkbKeyNumActions.man13
-rw-r--r--libX11/man/xkb/XkbKeyNumGroups.man13
-rw-r--r--libX11/man/xkb/XkbKeyNumSyms.man13
-rw-r--r--libX11/man/xkb/XkbKeySymEntry.man21
-rw-r--r--libX11/man/xkb/XkbKeySymsOffset.man13
-rw-r--r--libX11/man/xkb/XkbKeySymsPtr.man13
-rw-r--r--libX11/man/xkb/XkbKeyType.man15
-rw-r--r--libX11/man/xkb/XkbKeyTypeIndex.man15
-rw-r--r--libX11/man/xkb/XkbKeyTypesForCoreSymbols.man27
-rw-r--r--libX11/man/xkb/XkbKeycodeToKeysym.man19
-rw-r--r--libX11/man/xkb/XkbKeysymToModifiers.man11
-rw-r--r--libX11/man/xkb/XkbLatchGroup.man15
-rw-r--r--libX11/man/xkb/XkbLatchModifiers.man19
-rw-r--r--libX11/man/xkb/XkbLibraryVersion.man11
-rw-r--r--libX11/man/xkb/XkbListComponents.man19
-rw-r--r--libX11/man/xkb/XkbLockGroup.man15
-rw-r--r--libX11/man/xkb/XkbLockModifiers.man19
-rw-r--r--libX11/man/xkb/XkbLookupKeyBinding.man31
-rw-r--r--libX11/man/xkb/XkbLookupKeySym.man25
-rw-r--r--libX11/man/xkb/XkbModActionVMods.man9
-rw-r--r--libX11/man/xkb/XkbNoteControlsChanges.man15
-rw-r--r--libX11/man/xkb/XkbNoteDeviceChanges.man15
-rw-r--r--libX11/man/xkb/XkbNoteIndicatorChanges.man15
-rw-r--r--libX11/man/xkb/XkbNoteNameChanges.man15
-rw-r--r--libX11/man/xkb/XkbOpenDisplay.man29
-rw-r--r--libX11/man/xkb/XkbOutOfRangeGroupInfo.man9
-rw-r--r--libX11/man/xkb/XkbOutOfRangeGroupNumber.man9
-rw-r--r--libX11/man/xkb/XkbPtrActionX.man9
-rw-r--r--libX11/man/xkb/XkbPtrActionY.man9
-rw-r--r--libX11/man/xkb/XkbQueryExtension.man27
-rw-r--r--libX11/man/xkb/XkbRefreshKeyboardMapping.man9
-rw-r--r--libX11/man/xkb/XkbResizeDeviceButtonActions.man11
-rw-r--r--libX11/man/xkb/XkbResizeKeyActions.man15
-rw-r--r--libX11/man/xkb/XkbResizeKeySyms.man15
-rw-r--r--libX11/man/xkb/XkbResizeKeyType.man23
-rw-r--r--libX11/man/xkb/XkbSAActionSetCtrls.man15
-rw-r--r--libX11/man/xkb/XkbSAGroup.man9
-rw-r--r--libX11/man/xkb/XkbSAPtrDfltValue.man9
-rw-r--r--libX11/man/xkb/XkbSARedirectSetVMods.man13
-rw-r--r--libX11/man/xkb/XkbSARedirectSetVModsMask.man13
-rw-r--r--libX11/man/xkb/XkbSARedirectVMods.man9
-rw-r--r--libX11/man/xkb/XkbSARedirectVModsMask.man9
-rw-r--r--libX11/man/xkb/XkbSAScreen.man7
-rw-r--r--libX11/man/xkb/XkbSASetGroup.man15
-rw-r--r--libX11/man/xkb/XkbSASetPtrDfltValue.man13
-rw-r--r--libX11/man/xkb/XkbSASetScreen.man13
-rw-r--r--libX11/man/xkb/XkbSelectEventDetails.man23
-rw-r--r--libX11/man/xkb/XkbSelectEvents.man19
-rw-r--r--libX11/man/xkb/XkbSetAccessXTimeout.man31
-rw-r--r--libX11/man/xkb/XkbSetAutoRepeatRate.man19
-rw-r--r--libX11/man/xkb/XkbSetAutoResetControls.man19
-rw-r--r--libX11/man/xkb/XkbSetBounceKeysDelay.man15
-rw-r--r--libX11/man/xkb/XkbSetCompatMap.man19
-rw-r--r--libX11/man/xkb/XkbSetControls.man15
-rw-r--r--libX11/man/xkb/XkbSetDebuggingFlags.man35
-rw-r--r--libX11/man/xkb/XkbSetDetectableAutorepeat.man15
-rw-r--r--libX11/man/xkb/XkbSetDeviceButtonActions.man27
-rw-r--r--libX11/man/xkb/XkbSetDeviceInfo.man15
-rw-r--r--libX11/man/xkb/XkbSetIgnoreLockMods.man27
-rw-r--r--libX11/man/xkb/XkbSetIndicatorMap.man15
-rw-r--r--libX11/man/xkb/XkbSetMap.man15
-rw-r--r--libX11/man/xkb/XkbSetModActionVMods.man13
-rw-r--r--libX11/man/xkb/XkbSetNamedIndicator.man31
-rw-r--r--libX11/man/xkb/XkbSetNames.man23
-rw-r--r--libX11/man/xkb/XkbSetPtrActionX.man13
-rw-r--r--libX11/man/xkb/XkbSetPtrActionY.man13
-rw-r--r--libX11/man/xkb/XkbSetServerInternalMods.man27
-rw-r--r--libX11/man/xkb/XkbSetXlibControls.man15
-rw-r--r--libX11/man/xkb/XkbTranslateKeyCode.man25
-rw-r--r--libX11/man/xkb/XkbTranslateKeySym.man27
-rw-r--r--libX11/man/xkb/XkbUpdateMapFromCore.man27
-rw-r--r--libX11/man/xkb/XkbVirtualModsToReal.man15
202 files changed, 899 insertions, 2356 deletions
diff --git a/libX11/man/xkb/Makefile.am b/libX11/man/xkb/Makefile.am
index 542baf297..a15932f4b 100644
--- a/libX11/man/xkb/Makefile.am
+++ b/libX11/man/xkb/Makefile.am
@@ -230,5 +230,5 @@ MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
CPP_MAN_FLAGS = $(MANDEFS) $(EXTRAMANDEFS)
.man.$(LIB_MAN_SUFFIX):
- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+ $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
diff --git a/libX11/man/xkb/Makefile.in b/libX11/man/xkb/Makefile.in
index d35914bde..a8639b91e 100644
--- a/libX11/man/xkb/Makefile.in
+++ b/libX11/man/xkb/Makefile.in
@@ -54,6 +54,12 @@ CONFIG_HEADER = $(top_builddir)/src/config.h \
$(top_builddir)/include/X11/XlibConf.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
+AM_V_GEN = $(am__v_GEN_$(V))
+am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
+am__v_GEN_0 = @echo " GEN " $@;
+AM_V_at = $(am__v_at_$(V))
+am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+am__v_at_0 = @
SOURCES =
DIST_SOURCES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -84,6 +90,7 @@ ACLOCAL = @ACLOCAL@
ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
@@ -160,6 +167,7 @@ PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PERL = @PERL@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
RAWCPP = @RAWCPP@
@@ -474,6 +482,11 @@ CPP_SED_MAGIC = $(SED) -e '/^\# *[0-9][0-9]* *.*$$/d' \
-e 's,X11_LOCALEDATADIR,$(X11_LOCALEDATADIR),g' \
-e '/\@\@$$/s/\@\@$$/\\/'
+
+# Support for automake 1.11 AM_SILENT_RULES
+@HAVE_AM_SILENT_RULES_TRUE@cpp_verbose = $(cpp_verbose_$(V))
+@HAVE_AM_SILENT_RULES_TRUE@cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY))
+@HAVE_AM_SILENT_RULES_TRUE@cpp_verbose_0 = @echo " CPP " $@;
XORGRELSTRING = @PACKAGE_STRING@
XORGMANNAME = X Version 11
MANDEFS = -D__libmansuffix__=$(LIB_MAN_SUFFIX) \
@@ -692,10 +705,10 @@ uninstall-am: uninstall-libmanDATA
.pre:
- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+ $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
.man.$(LIB_MAN_SUFFIX):
- $(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
+ $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_MAN_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/libX11/man/xkb/XkbActionCtrls.man b/libX11/man/xkb/XkbActionCtrls.man
index 243619013..0bc6a7f6a 100644
--- a/libX11/man/xkb/XkbActionCtrls.man
+++ b/libX11/man/xkb/XkbActionCtrls.man
@@ -31,12 +31,9 @@
.SH NAME
XkbActionCtrls \- Returns the ctrls fields of act converted to an unsigned int
.SH SYNOPSIS
-.B unsigned int XkbActionCtrls macro
-(
-.I act
-)
-.br
- XkbCtrlsAction \fIact\fP\^;
+.HP
+.B unsigned int XkbActionCtrls
+.BI "(\^XkbCtrlsAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddDeviceLedInfo.man b/libX11/man/xkb/XkbAddDeviceLedInfo.man
index 90db51c51..0d8cc03d1 100644
--- a/libX11/man/xkb/XkbAddDeviceLedInfo.man
+++ b/libX11/man/xkb/XkbAddDeviceLedInfo.man
@@ -31,18 +31,11 @@
.SH NAME
XkbAddDeviceLedInfo \- Initialize an XkbDeviceLedInfoRec structure
.SH SYNOPSIS
+.HP
.B XkbDeviceLedInfoPtr XkbAddDeviceLedInfo
-(
-.I device_info,
-.I led_class,
-.I led_id
-)
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- unsigned int \fIled_class\fP\^;
-.br
- unsigned int \fIled_id\fP\^;
+.BI "(\^XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "unsigned int " "led_class" "\^,"
+.BI "unsigned int " "led_id" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomColor.man b/libX11/man/xkb/XkbAddGeomColor.man
index 4d6df3dc2..57d788104 100644
--- a/libX11/man/xkb/XkbAddGeomColor.man
+++ b/libX11/man/xkb/XkbAddGeomColor.man
@@ -31,18 +31,11 @@
XkbAddGeomColor \- Add one color name to an existing keyboard geometry
description
.SH SYNOPSIS
+.HP
.B XkbColorPtr XkbAddGeomColor
-(
-.I geom,
-.I spec,
-.I pixel
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- char * \fIspec\fP\^;
-.br
- unsigned int \fIpixel\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "char *" "spec" "\^,"
+.BI "unsigned int " "pixel" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomDoodad.man b/libX11/man/xkb/XkbAddGeomDoodad.man
index f6be93cb1..cdc731b4e 100644
--- a/libX11/man/xkb/XkbAddGeomDoodad.man
+++ b/libX11/man/xkb/XkbAddGeomDoodad.man
@@ -31,18 +31,11 @@
XkbAddGeomDoodad \- Add one doodad to a section of a keyboard geometry or to the
top-level geometry
.SH SYNOPSIS
+.HP
.B XkbDoodadPtr XkbAddGeomDoodad
-(
-.I geom ,
-.I section,
-.I name
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- Atom \fIname\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "XkbSectionPtr " "section" "\^,"
+.BI "Atom " "name" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomKey.man b/libX11/man/xkb/XkbAddGeomKey.man
index a4040dcbb..c16944ef1 100644
--- a/libX11/man/xkb/XkbAddGeomKey.man
+++ b/libX11/man/xkb/XkbAddGeomKey.man
@@ -30,12 +30,9 @@
.SH NAME
XkbAddGeomKey \- Add one key at the end of an existing row of keys
.SH SYNOPSIS
+.HP
.B XkbKeyPtr XkbAddGeomKey
-(
-.I row
-)
-.br
- XkbRowPtr \fIrow\fP\^;
+.BI "(\^XkbRowPtr " "row" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomKeyAlias.man b/libX11/man/xkb/XkbAddGeomKeyAlias.man
index 09997324a..e3de21cec 100644
--- a/libX11/man/xkb/XkbAddGeomKeyAlias.man
+++ b/libX11/man/xkb/XkbAddGeomKeyAlias.man
@@ -31,18 +31,11 @@
XkbAddGeomKeyAlias \- Add one key alias to an existing keyboard geometry
description
.SH SYNOPSIS
+.HP
.B XkbKeyAliasPtr XkbAddGeomKeyAlias
-(
-.I geom,
-.I alias,
-.I real
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- char * \fIalias\fP\^;
-.br
- char * \fIreal\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "char *" "alias" "\^,"
+.BI "char *" "real" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomOutline.man b/libX11/man/xkb/XkbAddGeomOutline.man
index 521614ef4..28d9db33d 100644
--- a/libX11/man/xkb/XkbAddGeomOutline.man
+++ b/libX11/man/xkb/XkbAddGeomOutline.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAddGeomOutline \- Add one outline to an existing shape
.SH SYNOPSIS
+.HP
.B XkbOutlinePtr XkbAddGeomOutline
-(
-.I shape,
-.I sz_points
-)
-.br
- XkbShapePtr \fIshape\fP\^;
-.br
- int \fIsz_points\fP\^;
+.BI "(\^XkbShapePtr " "shape" "\^,"
+.BI "int " "sz_points" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomOverlay.man b/libX11/man/xkb/XkbAddGeomOverlay.man
index 40cb85418..61dd37712 100644
--- a/libX11/man/xkb/XkbAddGeomOverlay.man
+++ b/libX11/man/xkb/XkbAddGeomOverlay.man
@@ -30,18 +30,11 @@
.SH NAME
XkbAddGeomOverlay \- Add one overlay to a section
.SH SYNOPSIS
+.HP
.B XkbOverlayPtr XkbAddGeomOverlay
-(
-.I section,
-.I name,
-.I sz_rows
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- Atom \fIname\fP\^;
-.br
- int \fIsz_rows\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "Atom " "name" "\^,"
+.BI "int " "sz_rows" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomOverlayKey.man b/libX11/man/xkb/XkbAddGeomOverlayKey.man
index dfb8a4225..3fc62d427 100644
--- a/libX11/man/xkb/XkbAddGeomOverlayKey.man
+++ b/libX11/man/xkb/XkbAddGeomOverlayKey.man
@@ -30,18 +30,11 @@
.SH NAME
XkbAddGeomOverlayKey \- Add a key to an existing overlay row
.SH SYNOPSIS
+.HP
.B XkbOverlayKeyPtr XkbAddGeomOverlayKey
-(
-.I overlay,
-.I row,
-.I under
-)
-.br
- XkbOverlayPtr \fIoverlay\fP\^;
-.br
- XkbRowPtr \fIrow\fP\^;
-.br
- char * \fIunder\fP\^;
+.BI "(\^XkbOverlayPtr " "overlay" "\^,"
+.BI "XkbRowPtr " "row" "\^,"
+.BI "char *" "under" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomOverlayRow.man b/libX11/man/xkb/XkbAddGeomOverlayRow.man
index c6866fa03..7bd85a6e2 100644
--- a/libX11/man/xkb/XkbAddGeomOverlayRow.man
+++ b/libX11/man/xkb/XkbAddGeomOverlayRow.man
@@ -30,18 +30,11 @@
.SH NAME
XkbAddGeomOverlayRow \- Add a row to an existing overlay
.SH SYNOPSIS
+.HP
.B XkbOverlayRowPtr XkbAddGeomOverlayRow
-(
-.I overlay,
-.I row_under,
-.I sz_keys
-)
-.br
- XkbOverlayPtr \fIoverlay\fP\^;
-.br
- XkbRowPtr \fIrow_under\fP\^;
-.br
- int \fIsz_keys\fP\^;
+.BI "(\^XkbOverlayPtr " "overlay" "\^,"
+.BI "XkbRowPtr " "row_under" "\^,"
+.BI "int " "sz_keys" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomProperty.man b/libX11/man/xkb/XkbAddGeomProperty.man
index f80b7715d..28ac451b1 100644
--- a/libX11/man/xkb/XkbAddGeomProperty.man
+++ b/libX11/man/xkb/XkbAddGeomProperty.man
@@ -31,18 +31,11 @@
XkbAddGeomProperty \- Add one property to an existing keyboard geometry
description
.SH SYNOPSIS
+.HP
.B XkbPropertyPtr XkbAddGeomProperty
-(
-.I geom,
-.I name,
-.I value
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- char * \fIname\fP\^;
-.br
- char * \fIvalue\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "char *" "name" "\^,"
+.BI "char *" "value" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomRow.man b/libX11/man/xkb/XkbAddGeomRow.man
index a74bddb98..166c2cbab 100644
--- a/libX11/man/xkb/XkbAddGeomRow.man
+++ b/libX11/man/xkb/XkbAddGeomRow.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAddGeomRow \- Add a row to a section
.SH SYNOPSIS
+.HP
.B XkbRowPtr XkbAddGeomRow
-(
-.I section,
-.I sz_keys
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- int \fIsz_keys\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "int " "sz_keys" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomSection.man b/libX11/man/xkb/XkbAddGeomSection.man
index 96df43068..1ffc56de8 100644
--- a/libX11/man/xkb/XkbAddGeomSection.man
+++ b/libX11/man/xkb/XkbAddGeomSection.man
@@ -30,24 +30,13 @@
.SH NAME
XkbAddGeomSection \- Add one section to an existing keyboard geometry
.SH SYNOPSIS
+.HP
.B XkbSectionPtr XkbAddGeomSection
-(
-.I geom,
-.I name,
-.I sz_rows,
-.I sz_doodads,
-.I sz_overlays
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- Atom \fIname\fP\^;
-.br
- int \fIsz_rows\fP\^;
-.br
- int \fIsz_doodads\fP\^;
-.br
- int \fIsz_overlays\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "Atom " "name" "\^,"
+.BI "int " "sz_rows" "\^,"
+.BI "int " "sz_doodads" "\^,"
+.BI "int " "sz_overlays" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddGeomShape.man b/libX11/man/xkb/XkbAddGeomShape.man
index 8743aa537..a3ec9e89f 100644
--- a/libX11/man/xkb/XkbAddGeomShape.man
+++ b/libX11/man/xkb/XkbAddGeomShape.man
@@ -30,18 +30,11 @@
.SH NAME
XkbAddGeomShape \- Add a shape to a keyboard geometry
.SH SYNOPSIS
+.HP
.B XkbShapePtr XkbAddGeomShape
-(
-.I geom,
-.I name,
-.I sz_outlines
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- Atom \fIname\fP\^;
-.br
- int \fIsz_outlines\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "Atom " "name" "\^,"
+.BI "int " "sz_outlines" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAddSymInterpret.man b/libX11/man/xkb/XkbAddSymInterpret.man
index b9aa4f63c..f851d3d9d 100644
--- a/libX11/man/xkb/XkbAddSymInterpret.man
+++ b/libX11/man/xkb/XkbAddSymInterpret.man
@@ -31,21 +31,12 @@
XkbAddSymInterpret \- Add a symbol interpretation to the list of symbol
interpretations in an XkbCompatRec
.SH SYNOPSIS
+.HP
.B XkbSymInterpretPtr XkbAddSymInterpret
-(
-.I xkb,
-.I si,
-.I updateMap,
-.I changes
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbSymInterpretPtr \fIsi\fP\^;
-.br
- Bool \fIupdateMap\fP\^;
-.br
- XkbChangesPtr \fIchanges\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "XkbSymInterpretPtr " "si" "\^,"
+.BI "Bool " "updateMap" "\^,"
+.BI "XkbChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocClientMap.man b/libX11/man/xkb/XkbAllocClientMap.man
index e371753b9..280608b4d 100644
--- a/libX11/man/xkb/XkbAllocClientMap.man
+++ b/libX11/man/xkb/XkbAllocClientMap.man
@@ -32,18 +32,11 @@
XkbAllocClientMap \- Allocate and initialize an empty client map description
record
.SH SYNOPSIS
+.HP
.B Status XkbAllocClientMap
-(
-.I xkb,
-.I which,
-.I type_count
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fItype_count\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "type_count" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocCompatMap.man b/libX11/man/xkb/XkbAllocCompatMap.man
index 82336976b..1b819747e 100644
--- a/libX11/man/xkb/XkbAllocCompatMap.man
+++ b/libX11/man/xkb/XkbAllocCompatMap.man
@@ -31,18 +31,11 @@
.SH NAME
XkbAllocCompatMap \- Allocate a new compatibility map if you do not already have one available
.SH SYNOPSIS
+.HP
.B Status XkbAllocCompatMap
-(
-.I xkb,
-.I which,
-.I num_si
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fInum_si\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "num_si" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocControls.man b/libX11/man/xkb/XkbAllocControls.man
index d62ce9b94..5038721b6 100644
--- a/libX11/man/xkb/XkbAllocControls.man
+++ b/libX11/man/xkb/XkbAllocControls.man
@@ -31,15 +31,10 @@
.SH NAME
XkbAllocControls \- Allocates an XkbControlsRec structure in the XkbDescRec
.SH SYNOPSIS
+.HP
.B Status XkbAllocControls
-(
-.I xkb,
-.I which
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocDeviceInfo.man b/libX11/man/xkb/XkbAllocDeviceInfo.man
index c0f60426b..0aea7a6b0 100644
--- a/libX11/man/xkb/XkbAllocDeviceInfo.man
+++ b/libX11/man/xkb/XkbAllocDeviceInfo.man
@@ -31,18 +31,11 @@
.SH NAME
XkbAllocDeviceInfo \- Obtain an XkbDeviceInfoRec structure
.SH SYNOPSIS
+.HP
.B XkbDeviceInfoPtr XkbAllocDeviceInfo
-(
-.I device_spec,
-.I n_buttons,
-.I sz_leds
-)
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIn_buttons\fP\^;
-.br
- unsigned int \fIsz_leds\fP\^;
+.BI "(\^unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "n_buttons" "\^,"
+.BI "unsigned int " "sz_leds" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocDeviceLedInfo.man b/libX11/man/xkb/XkbAllocDeviceLedInfo.man
index 180dd1d8a..6dbe10399 100644
--- a/libX11/man/xkb/XkbAllocDeviceLedInfo.man
+++ b/libX11/man/xkb/XkbAllocDeviceLedInfo.man
@@ -31,15 +31,10 @@
.SH NAME
XkbAllocDeviceLedInfo \- Obtain an XkbDeviceLedInfoRec structure
.SH SYNOPSIS
+.HP
.B Status XkbAllocDeviceLedInfo
-(
-.I device_info,
-.I num_needed
-)
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomColors.man b/libX11/man/xkb/XkbAllocGeomColors.man
index 9efe169da..b89ea3619 100644
--- a/libX11/man/xkb/XkbAllocGeomColors.man
+++ b/libX11/man/xkb/XkbAllocGeomColors.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomColors \- Allocate geometry colors
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomColors
-(
-.I geom,
-.I num_needed
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomDoodads.man b/libX11/man/xkb/XkbAllocGeomDoodads.man
index f2d2fa383..fca81f9c3 100644
--- a/libX11/man/xkb/XkbAllocGeomDoodads.man
+++ b/libX11/man/xkb/XkbAllocGeomDoodads.man
@@ -31,15 +31,10 @@
.SH NAME
XkbAllocGeomDoodads \- Allocate doodads that are global to a keyboard geometry
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomDoodads
-(
-.I geom,
-.I num_needed
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomKeyAliases.man b/libX11/man/xkb/XkbAllocGeomKeyAliases.man
index 381bed1ae..49a330a08 100644
--- a/libX11/man/xkb/XkbAllocGeomKeyAliases.man
+++ b/libX11/man/xkb/XkbAllocGeomKeyAliases.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomKeyAliases \- Allocate geometry key aliases
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomKeyAliases
-(
-.I geom,
-.I num_needed
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomKeys.man b/libX11/man/xkb/XkbAllocGeomKeys.man
index dcd5d786f..675178533 100644
--- a/libX11/man/xkb/XkbAllocGeomKeys.man
+++ b/libX11/man/xkb/XkbAllocGeomKeys.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomKeys \- Allocate space for an arbitrary number of keys to a row
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomKeys
-(
-.I row,
-.I num_needed
-)
-.br
- XkbRowPtr \fIrow\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbRowPtr " "row" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomOutlines.man b/libX11/man/xkb/XkbAllocGeomOutlines.man
index 779829175..3cd71f913 100644
--- a/libX11/man/xkb/XkbAllocGeomOutlines.man
+++ b/libX11/man/xkb/XkbAllocGeomOutlines.man
@@ -31,15 +31,10 @@
XkbAllocGeomOutlines \- Allocate space for an arbitrary number of outlines to a
shape
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomOutlines
-(
-.I shape,
-.I num_needed
-)
-.br
- XkbShapePtr \fIshape\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbShapePtr " "shape" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomOverlayKey.man b/libX11/man/xkb/XkbAllocGeomOverlayKey.man
index f33dd366c..541c14d71 100644
--- a/libX11/man/xkb/XkbAllocGeomOverlayKey.man
+++ b/libX11/man/xkb/XkbAllocGeomOverlayKey.man
@@ -31,15 +31,10 @@
.SH NAME
XkbAllocGeomOverlayKeys \- Allocate keys in an overlay row
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomOverlayKeys
-(
-.I row,
-.I num_needed
-)
-.br
- XkbRowPtr \fIrow\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbOverlayRowPtr " "row" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomOverlayRows.man b/libX11/man/xkb/XkbAllocGeomOverlayRows.man
index 8b18092f7..c3e5caf94 100644
--- a/libX11/man/xkb/XkbAllocGeomOverlayRows.man
+++ b/libX11/man/xkb/XkbAllocGeomOverlayRows.man
@@ -26,19 +26,14 @@
.\" or other dealings in this Software without prior written authorization
.\" of the copyright holder.
.\"
-.TH XkbAllocGeomOverlayRows 3Xkb "Release 6.1" "X Version 11" "XKBLIB FUNCTION"
+.TH XkbAllocGeomOverlayRows __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
XkbAllocGeomOverlayRows \- Allocate rows in a overlay
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomOverlayRows
-(
-.I overlay,
-.I num_needed
-)
-.br
- XkbSectionPtr \fIoverlay\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbOverlayPtr " "overlay" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomOverlays.man b/libX11/man/xkb/XkbAllocGeomOverlays.man
index 6320f1c2d..1165fe427 100644
--- a/libX11/man/xkb/XkbAllocGeomOverlays.man
+++ b/libX11/man/xkb/XkbAllocGeomOverlays.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomOverlays \- Allocate overlays in a section
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomOverlays
-(
-.I section,
-.I num_needed
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomPoints.man b/libX11/man/xkb/XkbAllocGeomPoints.man
index f9e8cd0a2..752358f96 100644
--- a/libX11/man/xkb/XkbAllocGeomPoints.man
+++ b/libX11/man/xkb/XkbAllocGeomPoints.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomPoints \- Allocate points in an outline
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomPoints
-(
-.I outline,
-.I num_needed
-)
-.br
- XkbOutlinePtr \fIoutline\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbOutlinePtr " "outline" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomProps.man b/libX11/man/xkb/XkbAllocGeomProps.man
index 56c086e19..6eaf7d32c 100644
--- a/libX11/man/xkb/XkbAllocGeomProps.man
+++ b/libX11/man/xkb/XkbAllocGeomProps.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomProps \- Allocate geometry properties
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomProps
-(
-.I geom,
-.I num_needed
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomRows.man b/libX11/man/xkb/XkbAllocGeomRows.man
index daa87114f..7c79bf994 100644
--- a/libX11/man/xkb/XkbAllocGeomRows.man
+++ b/libX11/man/xkb/XkbAllocGeomRows.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomRows \- Allocate rows in a section
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomRows
-(
-.I section,
-.I num_needed
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomSectionDoodads.man b/libX11/man/xkb/XkbAllocGeomSectionDoodads.man
index 2f0e7847d..aacd50d45 100644
--- a/libX11/man/xkb/XkbAllocGeomSectionDoodads.man
+++ b/libX11/man/xkb/XkbAllocGeomSectionDoodads.man
@@ -27,20 +27,14 @@
.\" or other dealings in this Software without prior written authorization
.\" of the copyright holder.
.\"
-.TH XkbAllocGeomSectionDoodads 3Xkb "Release 6.1" "X Version 11" "XKBLIB
-FUNCTION"
+.TH XkbAllocGeomSectionDoodads __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
XkbAllocGeomSectionDoodads \- Allocate doodads that are specific to a section
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomSectionDoodads
-(
-.I section,
-.I num_needed
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomSections.man b/libX11/man/xkb/XkbAllocGeomSections.man
index 7eb8fad46..1e9fcbcb5 100644
--- a/libX11/man/xkb/XkbAllocGeomSections.man
+++ b/libX11/man/xkb/XkbAllocGeomSections.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomSections \- Allocate geometry sections
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomSections
-(
-.I geom,
-.I num_needed
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeomShapes.man b/libX11/man/xkb/XkbAllocGeomShapes.man
index e197636a3..82a9a26c1 100644
--- a/libX11/man/xkb/XkbAllocGeomShapes.man
+++ b/libX11/man/xkb/XkbAllocGeomShapes.man
@@ -30,15 +30,10 @@
.SH NAME
XkbAllocGeomShapes \- Allocate space for an arbitrary number of geometry shapes
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeomShapes
-(
-.I geom,
-.I num_needed
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fInum_needed\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "num_needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocGeometry.man b/libX11/man/xkb/XkbAllocGeometry.man
index 7de54d772..651bf350b 100644
--- a/libX11/man/xkb/XkbAllocGeometry.man
+++ b/libX11/man/xkb/XkbAllocGeometry.man
@@ -31,15 +31,10 @@
.SH NAME
XkbAllocGeometry \- Allocate an entire geometry
.SH SYNOPSIS
+.HP
.B Status XkbAllocGeometry
-(
-.I xkb,
-.I sizes
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbGeometrySizesPtr \fIsizes\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "XkbGeometrySizesPtr " "sizes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocIndicatorMaps.man b/libX11/man/xkb/XkbAllocIndicatorMaps.man
index f64cc0520..8cef40042 100644
--- a/libX11/man/xkb/XkbAllocIndicatorMaps.man
+++ b/libX11/man/xkb/XkbAllocIndicatorMaps.man
@@ -32,12 +32,9 @@ XkbAllocIndicatorMaps \- Allocates, directly, the
.I indicators
member of the keyboard description record
.SH SYNOPSIS
+.HP
.B Status XkbAllocIndicatorMaps
-(
-.I xkb
-)
-.br
- variable_type *\fIxkb\fP\^;
+.BI "(\^variable_type *" "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocKeyboard.man b/libX11/man/xkb/XkbAllocKeyboard.man
index d1c38cdb8..0ee7599fc 100644
--- a/libX11/man/xkb/XkbAllocKeyboard.man
+++ b/libX11/man/xkb/XkbAllocKeyboard.man
@@ -30,10 +30,9 @@
.SH NAME
XkbAllocKeyboard \- Creates a keyboard description from scratch
.SH SYNOPSIS
+.HP
.B XkbDescRec XkbAllocKeyboard
-(
-.I void
-)
+.BI "(\^void\^);"
.if n .ti +5n
.if t .ti +.5i
.SH DESCRIPTION
diff --git a/libX11/man/xkb/XkbAllocNames.man b/libX11/man/xkb/XkbAllocNames.man
index eec606b5f..3cd6c7250 100644
--- a/libX11/man/xkb/XkbAllocNames.man
+++ b/libX11/man/xkb/XkbAllocNames.man
@@ -31,21 +31,12 @@
.SH NAME
XkbAllocNames \- Allocate symbolic names structures
.SH SYNOPSIS
+.HP
.B Status XkbAllocNames
-(
-.I xkb,
-.I which,
-.I num_rg,
-.I num_key_aliases
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- int \fInum_rg\fP\^;
-.br
- int \fInum_key_aliases\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "int " "num_rg" "\^,"
+.BI "int " "num_key_aliases" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbAllocServerMap.man b/libX11/man/xkb/XkbAllocServerMap.man
index 9994b35e5..eb9bcc399 100644
--- a/libX11/man/xkb/XkbAllocServerMap.man
+++ b/libX11/man/xkb/XkbAllocServerMap.man
@@ -31,18 +31,11 @@
.SH NAME
XkbAllocServerMap \- Allocate and initialize an empty server map description record
.SH SYNOPSIS
+.HP
.B Status XkbAllocServerMap
-(
-.I xkb,
-.I which,
-.I count_acts
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fIcount_acts\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "count_acts" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbApplyCompatMapToKey.man b/libX11/man/xkb/XkbApplyCompatMapToKey.man
index 921496077..af771cef0 100644
--- a/libX11/man/xkb/XkbApplyCompatMapToKey.man
+++ b/libX11/man/xkb/XkbApplyCompatMapToKey.man
@@ -32,18 +32,11 @@
XkbApplyCompatMapToKey \- Apply the new compatibility mapping to an individual
key to get its semantics updated
.SH SYNOPSIS
+.HP
.B Bool XkbApplyCompatMapToKey
-(
-.I xkb,
-.I key,
-.I changes
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkey\fP\^;
-.br
- XkbChangesPtr \fIchanges\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "key" "\^,"
+.BI "XkbChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbBell.man b/libX11/man/xkb/XkbBell.man
index 2a8a0e1fc..6ee2a16c7 100644
--- a/libX11/man/xkb/XkbBell.man
+++ b/libX11/man/xkb/XkbBell.man
@@ -31,21 +31,12 @@
.SH NAME
XkbBell \- Rings the bell on the default keyboard
.SH SYNOPSIS
+.HP
.B Bool XkbBell
-(
-.I display,
-.I window,
-.I percent,
-.I name
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- Window \fIwindow\fP\^;
-.br
- int \fIpercent\fP\^;
-.br
- Atom \fIname\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Window " "window" "\^,"
+.BI "int " "percent" "\^,"
+.BI "Atom " "name" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -330,7 +321,7 @@ receives
a bell event, use the window ID in the XkbBellNotifyEvent, if present.
.SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
.BR XkbBellNotify (__libmansuffix__),
.BR XkbChangeEnabledControls (__libmansuffix__),
.BR XkbDeviceBell (__libmansuffix__),
diff --git a/libX11/man/xkb/XkbBellEvent.man b/libX11/man/xkb/XkbBellEvent.man
index 4b4edc145..9fd6fb74a 100644
--- a/libX11/man/xkb/XkbBellEvent.man
+++ b/libX11/man/xkb/XkbBellEvent.man
@@ -32,21 +32,12 @@
XkbBellEvent \- Provides a function that initiates a bell event for the keyboard
without ringing the bell
.SH SYNOPSIS
+.HP
.B Bool XkbBellEvent
-(
-.I display,
-.I window,
-.I percent,
-.I name
-)
-.br
- Display *\fI display \fP\^;
-.br
- Window \fI window \fP\^;
-.br
- int \fI percent \fP\^;
-.br
- Atom \fI name \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Window " "window" "\^,"
+.BI "int " "percent" "\^,"
+.BI "Atom " "name" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeControls.man b/libX11/man/xkb/XkbChangeControls.man
index e44140079..5a2800b24 100644
--- a/libX11/man/xkb/XkbChangeControls.man
+++ b/libX11/man/xkb/XkbChangeControls.man
@@ -33,18 +33,11 @@ XkbChangeControls \- Provides a flexible method for updating the controls in a
server to match those in
the changed keyboard description
.SH SYNOPSIS
+.HP
.B Bool XkbChangeControls
-(
-.I dpy,
-.I xkb,
-.I changes
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbControlsChangesPtr \fIchanges\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "XkbControlsChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeDeviceInfo.man b/libX11/man/xkb/XkbChangeDeviceInfo.man
index e427ff738..7d78de399 100644
--- a/libX11/man/xkb/XkbChangeDeviceInfo.man
+++ b/libX11/man/xkb/XkbChangeDeviceInfo.man
@@ -32,18 +32,11 @@
XkbChangeDeviceInfo \- Update the server's description of a device with the changes noted in an
XkbDeviceChangesRec
.SH SYNOPSIS
+.HP
.B Bool XkbChangeDeviceInfo
-(
-.I dpy,
-.I device_info,
-.I changes
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- XkbDeviceChangesPtr \fIchanges\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "XkbDeviceChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeEnabledControls.man b/libX11/man/xkb/XkbChangeEnabledControls.man
index 5470a15e8..cd2058b39 100644
--- a/libX11/man/xkb/XkbChangeEnabledControls.man
+++ b/libX11/man/xkb/XkbChangeEnabledControls.man
@@ -31,21 +31,12 @@
.SH NAME
XkbChangeEnabledControls \- Manipulates the EnabledControls control
.SH SYNOPSIS
+.HP
.B Bool XkbChangeEnabledControls
-(
-.I dpy,
-.I device_spec,
-.I mask,
-.I values
-)
-.br
- Display *\fI dpy \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned int \fI mask \fP\^;
-.br
- unsigned int \fI values \fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "mask" "\^,"
+.BI "unsigned int " "values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeIndicators.man b/libX11/man/xkb/XkbChangeIndicators.man
index a0604ced4..5c023fd5c 100644
--- a/libX11/man/xkb/XkbChangeIndicators.man
+++ b/libX11/man/xkb/XkbChangeIndicators.man
@@ -31,21 +31,12 @@
XkbChangeIndicators \- Changes indicator maps or state without passing the
entire keyboard description
.SH SYNOPSIS
+.HP
.B Bool XkbChangeIndicators
-(
-.I dpy,
-.I xkb,
-.I changes,
-.I state
-)
-.br
- Display *\fI dpy \fP\^;
-.br
- XkbDescPtr \fI xkb \fP\^;
-.br
- XkbIndicatorChangesPtr \fI changes \fP\^;
-.br
- unsigned int \fI state \fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "XkbIndicatorChangesPtr " "changes" "\^,"
+.BI "unsigned int " "state" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeMap.man b/libX11/man/xkb/XkbChangeMap.man
index e65a5ec5a..3b2c39bed 100644
--- a/libX11/man/xkb/XkbChangeMap.man
+++ b/libX11/man/xkb/XkbChangeMap.man
@@ -33,18 +33,11 @@ XkbChangeMap \- Update only partial components of a keyboard description, modify
the appropriate fields in the server and map components of a local copy of the
keyboard description
.SH SYNOPSIS
+.HP
.B Bool XkbChangeMap
-(
-.I dpy,
-.I xkb,
-.I changes
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbMapChangesPtr \fIchanges\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "XkbMapChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeNames.man b/libX11/man/xkb/XkbChangeNames.man
index 75f815d6d..b647c63e1 100644
--- a/libX11/man/xkb/XkbChangeNames.man
+++ b/libX11/man/xkb/XkbChangeNames.man
@@ -31,18 +31,11 @@
.SH NAME
XkbChangeNames \- _summary-line_
.SH SYNOPSIS
+.HP
.B Bool XkbChangeNames
-(
-.I dpy,
-.I which,
-.I Xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIXkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "Xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbChangeTypesOfKey.man b/libX11/man/xkb/XkbChangeTypesOfKey.man
index ce2ef46a9..9118b4584 100644
--- a/libX11/man/xkb/XkbChangeTypesOfKey.man
+++ b/libX11/man/xkb/XkbChangeTypesOfKey.man
@@ -31,27 +31,14 @@
.SH NAME
XkbChangeTypesOfKey \- Change the number of groups and the types bound to a key
.SH SYNOPSIS
+.HP
.B Status XkbChangeTypesOfKey
-(
-.I xkb,
-.I key,
-.I n_groups,
-.I groups,
-.I new_types_in,
-.I p_changes
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- int \fIkey\fP\^;
-.br
- int \fIn_groups\fP\^;
-.br
- unsigned int \fIgroups\fP\^;
-.br
- int * \fInew_types_in\fP\^;
-.br
- XkbMapChangesPtr \fIp_changes\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "int " "key" "\^,"
+.BI "int " "n_groups" "\^,"
+.BI "unsigned int " "groups" "\^,"
+.BI "int *" "new_types_in" "\^,"
+.BI "XkbMapChangesPtr " "p_changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbComputeRowBounds.man b/libX11/man/xkb/XkbComputeRowBounds.man
index 523505e0b..a2d5fd2f4 100644
--- a/libX11/man/xkb/XkbComputeRowBounds.man
+++ b/libX11/man/xkb/XkbComputeRowBounds.man
@@ -30,18 +30,11 @@
.SH NAME
XkbComputeRowBounds \- Update the bounding box of a row
.SH SYNOPSIS
+.HP
.B Bool XkbComputeRowBounds
-(
-.I geom,
-.I section,
-.I row
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- XkbRowPtr \fIrow\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "XkbSectionPtr " "section" "\^,"
+.BI "XkbRowPtr " "row" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbComputeSectionBounds.man b/libX11/man/xkb/XkbComputeSectionBounds.man
index 0ba9348ad..081e01765 100644
--- a/libX11/man/xkb/XkbComputeSectionBounds.man
+++ b/libX11/man/xkb/XkbComputeSectionBounds.man
@@ -30,15 +30,10 @@
.SH NAME
XkbComputeSectionBounds \- Update the bounding box of a section
.SH SYNOPSIS
+.HP
.B Bool XkbComputeSectionBounds
-(
-.I geom,
-.I section
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- XkbSectionPtr \fIsection\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "XkbSectionPtr " "section" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbComputeShapeBounds.man b/libX11/man/xkb/XkbComputeShapeBounds.man
index c77093d80..65321450e 100644
--- a/libX11/man/xkb/XkbComputeShapeBounds.man
+++ b/libX11/man/xkb/XkbComputeShapeBounds.man
@@ -30,12 +30,9 @@
.SH NAME
XkbComputeShapeBounds \- Updates the bounding box of a shape
.SH SYNOPSIS
+.HP
.B Bool XkbComputeShapeBounds
-(
-.I shape
-)
-.br
- XkbShapePtr \fIshape\fP\^;
+.BI "(\^XkbShapePtr " "shape" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbComputeShapeTop.man b/libX11/man/xkb/XkbComputeShapeTop.man
index db71a7e4a..12ef0c2cb 100644
--- a/libX11/man/xkb/XkbComputeShapeTop.man
+++ b/libX11/man/xkb/XkbComputeShapeTop.man
@@ -30,15 +30,10 @@
.SH NAME
XkbComputeShapeTop \- Determines the bounding box of the top surface of a shape
.SH SYNOPSIS
+.HP
.B Bool XkbComputeShapeTop
-(
-.I shape,
-.I bounds_rtrn
-)
-.br
- XkbShapePtr \fIshape\fP\^;
-.br
- XkbBoundsPtr \fIbounds_rtrn\fP\^;
+.BI "(\^XkbShapePtr " "shape" "\^,"
+.BI "XkbBoundsPtr " "bounds_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbCopyKeyType.man b/libX11/man/xkb/XkbCopyKeyType.man
index 36967046a..d3b6cae69 100644
--- a/libX11/man/xkb/XkbCopyKeyType.man
+++ b/libX11/man/xkb/XkbCopyKeyType.man
@@ -30,15 +30,10 @@
.SH NAME
XkbCopyKeyType \- Copy one XkbKeyTypeRec structures
.SH SYNOPSIS
+.HP
.B Status XkbCopyKeyType
-(
-.I from,
-.I into
-)
-.br
- XkbKeyTypePtr \fIfrom\fP\^;
-.br
- XkbKeyTypePtr \fIinto\fP\^;
+.BI "(\^XkbKeyTypePtr " "from" "\^,"
+.BI "XkbKeyTypePtr " "into" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbCopyKeyTypes.man b/libX11/man/xkb/XkbCopyKeyTypes.man
index abf0f7e1d..acabde9d6 100644
--- a/libX11/man/xkb/XkbCopyKeyTypes.man
+++ b/libX11/man/xkb/XkbCopyKeyTypes.man
@@ -30,18 +30,11 @@
.SH NAME
XkbCopyKeyTypes \- Copy more than one XkbKeyTypeRec structure
.SH SYNOPSIS
+.HP
.B Status XkbCopyKeyTypes
-(
-.I from,
-.I into,
-.I num_types
-)
-.br
- XkbKeyTypePtr \fIfrom\fP\^;
-.br
- XkbKeyTypePtr \fIinto\fP\^;
-.br
- int \fInum_types\fP\^;
+.BI "(\^XkbKeyTypePtr " "from" "\^,"
+.BI "XkbKeyTypePtr " "into" "\^,"
+.BI "int " "num_types" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbDeviceBell.man b/libX11/man/xkb/XkbDeviceBell.man
index d5d05cdea..f11dd394f 100644
--- a/libX11/man/xkb/XkbDeviceBell.man
+++ b/libX11/man/xkb/XkbDeviceBell.man
@@ -31,30 +31,15 @@
.SH NAME
XkbDeviceBell \- Rings the bell on an X input extension device or the default keyboard
.SH SYNOPSIS
+.HP
.B Bool XkbDeviceBell
-(
-.I display,
-.I window,
-.I device_spec,
-.I bell_class,
-.I bell_id,
-.I percent,
-.I name
-)
-.br
- Display *\fI display \fP\^;
-.br
- Window \fI window \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned int \fI bell_class \fP\^;
-.br
- unsigned int \fI bell_id \fP\^;
-.br
- int \fI percent \fP\^;
-.br
- Atom \fI name \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Window " "window" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "bell_class" "\^,"
+.BI "unsigned int " "bell_id" "\^,"
+.BI "int " "percent" "\^,"
+.BI "Atom " "name" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -302,7 +287,7 @@ If your application needs to generate visual bell feedback on the screen when it
a bell event, use the window ID in the XkbBellNotifyEvent, if present.
.SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
.BR XkbBellNotify (__libmansuffix__),
.BR XkbChangeEnabledControls (__libmansuffix__),
.BR XkbDeviceBell (__libmansuffix__),
diff --git a/libX11/man/xkb/XkbDeviceBellEvent.man b/libX11/man/xkb/XkbDeviceBellEvent.man
index a28a868f9..cf797890b 100644
--- a/libX11/man/xkb/XkbDeviceBellEvent.man
+++ b/libX11/man/xkb/XkbDeviceBellEvent.man
@@ -32,30 +32,15 @@
XkbDeviceBellEvent \- Creates a bell event for an X input extension device or
for the keyboard, without ringing the corresponding bell
.SH SYNOPSIS
+.HP
.B Bool XkbDeviceBellEvent
-(
-.I display,
-.I window,
-.I device_spec,
-.I bell_class,
-.I bell_id,
-.I percent,
-.I name
-)
-.br
- Display *\fI display \fP\^;
-.br
- Window \fI window \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned int \fI bell_class \fP\^;
-.br
- unsigned int \fI bell_id \fP\^;
-.br
- int \fI percent \fP\^;
-.br
- Atom \fI name \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Window " "window" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "bell_class" "\^,"
+.BI "unsigned int " "bell_id" "\^,"
+.BI "int " "percent" "\^,"
+.BI "Atom " "name" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -330,7 +315,7 @@ receives
a bell event, use the window ID in the XkbBellNotifyEvent, if present.
.SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
.BR XkbBellNotify (__libmansuffix__),
.BR XkbChangeEnabledControls (__libmansuffix__),
.BR XkbDeviceBell (__libmansuffix__),
diff --git a/libX11/man/xkb/XkbFindOverlayForKey.man b/libX11/man/xkb/XkbFindOverlayForKey.man
index 783fddf12..0ce65f2b5 100644
--- a/libX11/man/xkb/XkbFindOverlayForKey.man
+++ b/libX11/man/xkb/XkbFindOverlayForKey.man
@@ -31,18 +31,11 @@
XkbFindOverlayForKey \- Find the alternate name by using the primary name for a
key that is part of an overlay
.SH SYNOPSIS
+.HP
.B char * XkbFindOverlayForKey
-(
-.I geom,
-.I section,
-.I under
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- char * \fIunder\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "XkbSectionPtr " "section" "\^,"
+.BI "char *" "under" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbForceBell.man b/libX11/man/xkb/XkbForceBell.man
index b149974a2..24297af18 100644
--- a/libX11/man/xkb/XkbForceBell.man
+++ b/libX11/man/xkb/XkbForceBell.man
@@ -32,15 +32,10 @@
XkbForceBell \- Overrides user preference settings for audible bells to ring the
bell on the default keyboard
.SH SYNOPSIS
+.HP
.B Bool XkbForceBell
-(
-.I display,
-.I percent
-)
-.br
- Display *\fI display \fP\^;
-.br
- int \fI percent \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "int " "percent" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -318,7 +313,7 @@ receives
a bell event, use the window ID in the XkbBellNotifyEvent, if present.
.SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
.BR XkbBell (__libmansuffix__),
.BR XkbChangeEnabledControls (__libmansuffix__),
.BR XkbForceDeviceBell (__libmansuffix__),
diff --git a/libX11/man/xkb/XkbForceDeviceBell.man b/libX11/man/xkb/XkbForceDeviceBell.man
index 6842aa696..7e45ffa09 100644
--- a/libX11/man/xkb/XkbForceDeviceBell.man
+++ b/libX11/man/xkb/XkbForceDeviceBell.man
@@ -32,27 +32,14 @@
XkbForceDeviceBell \- Rings the bell on any keyboard, overriding user preference
settings for audible bells
.SH SYNOPSIS
+.HP
.B Bool XkbForceDeviceBell
-(
-.I display,
-.I window,
-.I device_spec,
-.I bell_class,
-.I bell_id,
-.I percent
-)
-.br
- Display *\fI display \fP\^;
-.br
- Window \fI window \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned int \fI bell_class \fP\^;
-.br
- unsigned int \fI bell_id \fP\^;
-.br
- int \fI percent \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Window " "window" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "bell_class" "\^,"
+.BI "unsigned int " "bell_id" "\^,"
+.BI "int " "percent" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -304,7 +291,7 @@ If your application needs to generate visual bell feedback on the screen when it
receives
a bell event, use the window ID in the XkbBellNotifyEvent, if present.
.SH "SEE ALSO"
-.BR XBell (3X11),
+.BR XBell (__libmansuffix__),
.BR XkbBell (__libmansuffix__),
.BR XkbBellNotify (__libmansuffix__),
.BR XkbChangeEnabledControls (__libmansuffix__),
diff --git a/libX11/man/xkb/XkbFreeClientMap.man b/libX11/man/xkb/XkbFreeClientMap.man
index 1a5610c9c..78a46800e 100644
--- a/libX11/man/xkb/XkbFreeClientMap.man
+++ b/libX11/man/xkb/XkbFreeClientMap.man
@@ -32,18 +32,11 @@
XkbFreeClientMap \- Free memory used by the client map member of an XkbDescRec
structure
.SH SYNOPSIS
+.HP
.B void XkbFreeClientMap
-(
-.I xkb,
-.I which,
-.I free_all
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeCompatMap.man b/libX11/man/xkb/XkbFreeCompatMap.man
index 8b7263f58..36db2fae2 100644
--- a/libX11/man/xkb/XkbFreeCompatMap.man
+++ b/libX11/man/xkb/XkbFreeCompatMap.man
@@ -31,18 +31,11 @@
.SH NAME
XkbFreeCompatMap \- Free an entire compatibility map or selected portions of one
.SH SYNOPSIS
+.HP
.B void XkbFreeCompatMap
-(
-.I xkb,
-.I which,
-.I free_map
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_map\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_map" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeComponentList.man b/libX11/man/xkb/XkbFreeComponentList.man
index 137fd707c..f2e8d0a5b 100644
--- a/libX11/man/xkb/XkbFreeComponentList.man
+++ b/libX11/man/xkb/XkbFreeComponentList.man
@@ -32,12 +32,9 @@
XkbFreeComponentList \- Free the structure returned by
.I XkbListComponents
.SH SYNOPSIS
+.HP
.B void XkbFreeComponentList
-(
-.I list
-)
-.br
- XkbComponentListPtr \fIlist\fP\^;
+.BI "(\^XkbComponentListPtr " "list" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeControls.man b/libX11/man/xkb/XkbFreeControls.man
index 905a894ba..8c5c2662a 100644
--- a/libX11/man/xkb/XkbFreeControls.man
+++ b/libX11/man/xkb/XkbFreeControls.man
@@ -31,18 +31,11 @@
.SH NAME
XkbFreeControls \- Frees memory used by the ctrls member of an XkbDescRec structure
.SH SYNOPSIS
+.HP
.B void XkbFreeControls
-(
-.I xkb,
-.I which,
-.I free_all
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeDeviceInfo.man b/libX11/man/xkb/XkbFreeDeviceInfo.man
index 0f162c008..a7c38933a 100644
--- a/libX11/man/xkb/XkbFreeDeviceInfo.man
+++ b/libX11/man/xkb/XkbFreeDeviceInfo.man
@@ -31,18 +31,11 @@
.SH NAME
XkbFreeDeviceInfo \- Free an XkbDeviceInfoRec structure
.SH SYNOPSIS
+.HP
.B void XkbFreeDeviceInfo
-(
-.I device_info,
-.I which,
-.I free_all
-)
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomColors.man b/libX11/man/xkb/XkbFreeGeomColors.man
index 02827ae98..3cf4108a1 100644
--- a/libX11/man/xkb/XkbFreeGeomColors.man
+++ b/libX11/man/xkb/XkbFreeGeomColors.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomColors \- Free geometry colors
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomColors
-(
-.I geom,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomDoodads.man b/libX11/man/xkb/XkbFreeGeomDoodads.man
index 56256e366..a4f1be4c1 100644
--- a/libX11/man/xkb/XkbFreeGeomDoodads.man
+++ b/libX11/man/xkb/XkbFreeGeomDoodads.man
@@ -30,18 +30,11 @@
.SH NAME
XkbFreeGeomDoodads \- Free geometry doodads
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomDoodads
-(
-.I doodads,
-.I count,
-.I free_all
-)
-.br
- XkbDoodadPtr \fIdoodads\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbDoodadPtr " "doodads" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomKeyAliases.man b/libX11/man/xkb/XkbFreeGeomKeyAliases.man
index f5efa4f06..d8491bbe9 100644
--- a/libX11/man/xkb/XkbFreeGeomKeyAliases.man
+++ b/libX11/man/xkb/XkbFreeGeomKeyAliases.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomKeyAliases \- Free geometry key aliases
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomKeyAliases
-(
-.I geom,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomKeys.man b/libX11/man/xkb/XkbFreeGeomKeys.man
index b325daf44..8464bcc07 100644
--- a/libX11/man/xkb/XkbFreeGeomKeys.man
+++ b/libX11/man/xkb/XkbFreeGeomKeys.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomKeys \- Free geometry keys
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomKeys
-(
-.I row,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbRowPtr \fIrow\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbRowPtr " "row" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomOutlines.man b/libX11/man/xkb/XkbFreeGeomOutlines.man
index 3ed6c3d31..b8ab7db37 100644
--- a/libX11/man/xkb/XkbFreeGeomOutlines.man
+++ b/libX11/man/xkb/XkbFreeGeomOutlines.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomOutlines \- Free geometry outlines
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomOutlines
-(
-.I shape,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbShapePtr \fIshape\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbShapePtr " "shape" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomOverlayKeys.man b/libX11/man/xkb/XkbFreeGeomOverlayKeys.man
index a065ace6d..cea7cab6e 100644
--- a/libX11/man/xkb/XkbFreeGeomOverlayKeys.man
+++ b/libX11/man/xkb/XkbFreeGeomOverlayKeys.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomOverlayKeys \- Free keys in an overlay row
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomOverlayKeys
-(
-.I row,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbRowPtr \fIrow\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbRowPtr " "row" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomOverlayRows.man b/libX11/man/xkb/XkbFreeGeomOverlayRows.man
index f31fca216..f595bc249 100644
--- a/libX11/man/xkb/XkbFreeGeomOverlayRows.man
+++ b/libX11/man/xkb/XkbFreeGeomOverlayRows.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomOverlayRows \- Free rows in an overlay
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomOverlayRows
-(
-.I overlay,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbSectionPtr \fIoverlay\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbSectionPtr " "overlay" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomOverlays.man b/libX11/man/xkb/XkbFreeGeomOverlays.man
index afeb35822..1ce4daa6d 100644
--- a/libX11/man/xkb/XkbFreeGeomOverlays.man
+++ b/libX11/man/xkb/XkbFreeGeomOverlays.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomOverlays \- Free rows in a section
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomOverlays
-(
-.I section,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomPoints.man b/libX11/man/xkb/XkbFreeGeomPoints.man
index ce941eb1b..f21f43f4d 100644
--- a/libX11/man/xkb/XkbFreeGeomPoints.man
+++ b/libX11/man/xkb/XkbFreeGeomPoints.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomPoints \- Free points in a outline
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomPoints
-(
-.I outline,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbOutlinePtr \fIoutline\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbOutlinePtr " "outline" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomProperties.man b/libX11/man/xkb/XkbFreeGeomProperties.man
index 586dfb1d1..b01505492 100644
--- a/libX11/man/xkb/XkbFreeGeomProperties.man
+++ b/libX11/man/xkb/XkbFreeGeomProperties.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomProperties \- Free geometry properties
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomProperties
-(
-.I geom,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool * \fIfree_all\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool *" "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomRows.man b/libX11/man/xkb/XkbFreeGeomRows.man
index 0a67af5ca..7857501f9 100644
--- a/libX11/man/xkb/XkbFreeGeomRows.man
+++ b/libX11/man/xkb/XkbFreeGeomRows.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomRows \- Free rows in a section
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomRows
-(
-.I section,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbSectionPtr \fIsection\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbSectionPtr " "section" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomSections.man b/libX11/man/xkb/XkbFreeGeomSections.man
index 2f8e59e8b..c2d4e1fc6 100644
--- a/libX11/man/xkb/XkbFreeGeomSections.man
+++ b/libX11/man/xkb/XkbFreeGeomSections.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomSections \- Free geometry sections
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomSections
-(
-.I geom,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeomShapes.man b/libX11/man/xkb/XkbFreeGeomShapes.man
index 43ab964da..059a291f1 100644
--- a/libX11/man/xkb/XkbFreeGeomShapes.man
+++ b/libX11/man/xkb/XkbFreeGeomShapes.man
@@ -30,21 +30,12 @@
.SH NAME
XkbFreeGeomShapes \- Free geometry shapes
.SH SYNOPSIS
+.HP
.B void XkbFreeGeomShapes
-(
-.I geom,
-.I first,
-.I count,
-.I free_all
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- int \fIfirst\fP\^;
-.br
- int \fIcount\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "int " "first" "\^,"
+.BI "int " "count" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeGeometry.man b/libX11/man/xkb/XkbFreeGeometry.man
index 8b3425678..6c85ca40e 100644
--- a/libX11/man/xkb/XkbFreeGeometry.man
+++ b/libX11/man/xkb/XkbFreeGeometry.man
@@ -30,18 +30,11 @@
.SH NAME
XkbFreeGeometry \- Free an entire geometry
.SH SYNOPSIS
+.HP
.B void XkbFreeGeometry
-(
-.I geom,
-.I which,
-.I free_all
-)
-.br
- XkbGeometryPtr \fIgeom\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbGeometryPtr " "geom" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeIndicatorMaps.man b/libX11/man/xkb/XkbFreeIndicatorMaps.man
index 9dd6272a0..463406124 100644
--- a/libX11/man/xkb/XkbFreeIndicatorMaps.man
+++ b/libX11/man/xkb/XkbFreeIndicatorMaps.man
@@ -32,12 +32,9 @@ XkbFreeIndicatorMaps \- Frees memory used by the
.I indicators
member of an XkbDescRec structure
.SH SYNOPSIS
+.HP
.B void XkbFreeIndicatorMaps
-(
-.I xkb
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeKeyboard.man b/libX11/man/xkb/XkbFreeKeyboard.man
index 0d13bb124..e3ffc03be 100644
--- a/libX11/man/xkb/XkbFreeKeyboard.man
+++ b/libX11/man/xkb/XkbFreeKeyboard.man
@@ -31,18 +31,11 @@
XkbFreeKeyboard \- Destroys either an entire XkbDescRec or just some of its
members
.SH SYNOPSIS
+.HP
.B void XkbFreeKeyboard
-(
-.I xkb,
-.I which,
-.I free_all
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeNames.man b/libX11/man/xkb/XkbFreeNames.man
index 576bf916d..3ac701745 100644
--- a/libX11/man/xkb/XkbFreeNames.man
+++ b/libX11/man/xkb/XkbFreeNames.man
@@ -31,18 +31,11 @@
.SH NAME
XkbFreeNames \- Free symbolic names structures
.SH SYNOPSIS
+.HP
.B void XkbFreeNames
-(
-.I xkb,
-.I which,
-.I free_map
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_map\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_map" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbFreeServerMap.man b/libX11/man/xkb/XkbFreeServerMap.man
index 63454257f..438f56da5 100644
--- a/libX11/man/xkb/XkbFreeServerMap.man
+++ b/libX11/man/xkb/XkbFreeServerMap.man
@@ -32,18 +32,11 @@
XkbFreeServerMap \- Free memory used by the server member of an XkbDescRec
structure
.SH SYNOPSIS
+.HP
.B void XkbFreeServerMap
-(
-.I xkb,
-.I which,
-.I free_all
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- Bool \fIfree_all\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "Bool " "free_all" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetAccessXTimeout.man b/libX11/man/xkb/XkbGetAccessXTimeout.man
index 7a53cc995..73f4b536a 100644
--- a/libX11/man/xkb/XkbGetAccessXTimeout.man
+++ b/libX11/man/xkb/XkbGetAccessXTimeout.man
@@ -31,30 +31,15 @@
XkbGetAccessXTimeout \- Queries the current AccessXTimeout options for a
keyboard device
.SH SYNOPSIS
+.HP
.B Bool XkbGetAccessXTimeout
-(
-.I display,
-.I device_spec,
-.I timeout_rtrn,
-.I ctrls_mask_rtrn,
-.I ctrls_values_rtrn,
-.I options_mask_rtrn,
-.I options_values_rtrn
-)
-.br
- Display *\fI display \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned short *\fI timeout_rtrn \fP\^;
-.br
- unsigned int *\fI ctrls_mask_rtrn \fP\^;
-.br
- unsigned int *\fI ctrls_values_rtrn \fP\^;
-.br
- unsigned short *\fI options_mask_rtrn \fP\^;
-.br
- unsigned short *\fI options_values_rtrn \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned short *" "timeout_rtrn" "\^,"
+.BI "unsigned int *" "ctrls_mask_rtrn" "\^,"
+.BI "unsigned int *" "ctrls_values_rtrn" "\^,"
+.BI "unsigned short *" "options_mask_rtrn" "\^,"
+.BI "unsigned short *" "options_values_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetAutoRepeatRate.man b/libX11/man/xkb/XkbGetAutoRepeatRate.man
index 677819d2b..1b6c9fc44 100644
--- a/libX11/man/xkb/XkbGetAutoRepeatRate.man
+++ b/libX11/man/xkb/XkbGetAutoRepeatRate.man
@@ -31,21 +31,12 @@
XkbGetAutoRepeatRate \- Gets the current attributes of the RepeatKeys control
for a keyboard device
.SH SYNOPSIS
+.HP
.B Bool XkbGetAutoRepeatRate
-(
-.I display,
-.I device_spec,
-.I timeout_rtrn,
-.I interval_rtrn
-)
-.br
- Display *\fI display \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned int *\fI timeout_rtrn \fP\^;
-.br
- unsigned int *\fI interval_rtrn \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int *" "timeout_rtrn" "\^,"
+.BI "unsigned int *" "interval_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetAutoResetControls.man b/libX11/man/xkb/XkbGetAutoResetControls.man
index 23d8dd274..cd18b6306 100644
--- a/libX11/man/xkb/XkbGetAutoResetControls.man
+++ b/libX11/man/xkb/XkbGetAutoResetControls.man
@@ -30,18 +30,11 @@
.SH NAME
XkbGetAutoResetControls \- Gets the current values of the auto-reset controls
.SH SYNOPSIS
+.HP
.B Bool XkbGetAutoResetControls
-(
-.I dpy,
-.I auto_ctrls,
-.I auto_values
-)
-.br
- Display *\fI dpy \fP\^;
-.br
- unsigned int *\fI auto_ctrls \fP\^;
-.br
- unsigned int *\fI auto_values \fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int *" "auto_ctrls" "\^,"
+.BI "unsigned int *" "auto_values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetBounceKeysDelay.man b/libX11/man/xkb/XkbGetBounceKeysDelay.man
index 917296bb6..8138fc3a7 100644
--- a/libX11/man/xkb/XkbGetBounceKeysDelay.man
+++ b/libX11/man/xkb/XkbGetBounceKeysDelay.man
@@ -32,18 +32,11 @@
XkbGetBounceKeysDelay \- Queries the current BounceKeys delay for a keyboard
device.
.SH SYNOPSIS
+.HP
.B Bool XkbGetBounceKeysDelay
-(
-.I display,
-.I device_spec,
-.I delay_rtrn
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int *\fIdelay_rtrn\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int *" "delay_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetCompatMap.man b/libX11/man/xkb/XkbGetCompatMap.man
index cb8be2eae..b3e0b2ba8 100644
--- a/libX11/man/xkb/XkbGetCompatMap.man
+++ b/libX11/man/xkb/XkbGetCompatMap.man
@@ -32,18 +32,11 @@
XkbGetCompatMap \- Fetch any combination of the current compatibility map
components from the server
.SH SYNOPSIS
+.HP
.B Status XkbGetCompatMap
-(
-.I display,
-.I which,
-.I xkb
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescRec * \fIxkb\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescRec *" "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetControls.man b/libX11/man/xkb/XkbGetControls.man
index b4631f109..377ccb362 100644
--- a/libX11/man/xkb/XkbGetControls.man
+++ b/libX11/man/xkb/XkbGetControls.man
@@ -31,18 +31,11 @@
.SH NAME
XkbGetControls \- Finds the current state of Xkb server controls
.SH SYNOPSIS
+.HP
.B Status XkbGetControls
-(
-.I display,
-.I which,
-.I xkb
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned long \fIwhich\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned long " "which" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetControlsChanges.man b/libX11/man/xkb/XkbGetControlsChanges.man
index e293e080d..53824df30 100644
--- a/libX11/man/xkb/XkbGetControlsChanges.man
+++ b/libX11/man/xkb/XkbGetControlsChanges.man
@@ -32,18 +32,11 @@
XkbGetControlsChanges \- Updates a local copy of a keyboard description with the
changes previously noted by one or more calls to XkbNoteControlsChanges
.SH SYNOPSIS
+.HP
XkbGetControlsChanges
-(
-.I dpy,
-.I xkb,
-.I changes
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbNameChangesPtr \fIchanges\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "XkbNameChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetDetectableAutorepeat.man b/libX11/man/xkb/XkbGetDetectableAutorepeat.man
index 24ebc5efd..b14b0a75c 100644
--- a/libX11/man/xkb/XkbGetDetectableAutorepeat.man
+++ b/libX11/man/xkb/XkbGetDetectableAutorepeat.man
@@ -31,15 +31,10 @@
XkbGetDetectableAutorepeat \- Determines whether or not the server supports
DetectableAutorepeat
.SH SYNOPSIS
+.HP
.B Bool XkbGetDetectableAutorepeat
-(
-.I display,
-.I supported_rtrn
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- Bool * \fIsupported_rtrn\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Bool *" "supported_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetDeviceButtonActions.man b/libX11/man/xkb/XkbGetDeviceButtonActions.man
index b1a076b54..66255492b 100644
--- a/libX11/man/xkb/XkbGetDeviceButtonActions.man
+++ b/libX11/man/xkb/XkbGetDeviceButtonActions.man
@@ -32,24 +32,13 @@
XkbGetDeviceButtonActions \- Query the button actions associated with an X Input
Extension device
.SH SYNOPSIS
+.HP
.B Status XkbGetDeviceButtonActions
-(
-.I dpy,
-.I device_info,
-.I all_buttons,
-.I first_button,
-.I num_buttons
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- Bool \fIall_buttons\fP\^;
-.br
- unsigned int \fIfirst_button\fP\^;
-.br
- unsigned int \fInum_buttons\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "Bool " "all_buttons" "\^,"
+.BI "unsigned int " "first_button" "\^,"
+.BI "unsigned int " "num_buttons" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetDeviceInfo.man b/libX11/man/xkb/XkbGetDeviceInfo.man
index 4157296e7..c6c3d418d 100644
--- a/libX11/man/xkb/XkbGetDeviceInfo.man
+++ b/libX11/man/xkb/XkbGetDeviceInfo.man
@@ -33,24 +33,13 @@ XkbGetDeviceInfo \- Determine whether the X server allows Xkb access to particul
the core X keyboard, or to determine the status of indicator maps, indicator names or button actions on a non-KeyClass
extension device
.SH SYNOPSIS
+.HP
.B XkbDeviceInfoPtr XkbGetDeviceInfo
-(
-.I dpy,
-.I which,
-.I device_spec,
-.I ind_class,
-.I ind_id
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIind_class\fP\^;
-.br
- unsigned int \fIind_id\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "ind_class" "\^,"
+.BI "unsigned int " "ind_id" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -262,4 +251,4 @@ typedef struct {
.fi
.SH "SEE ALSO"
.BR XkbAllocDeviceInfo (__libmansuffix__),
-.BR XListInputDevices (3X11)
+.BR XListInputDevices (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbGetDeviceInfoChanges.man b/libX11/man/xkb/XkbGetDeviceInfoChanges.man
index ed873a982..ceda76d28 100644
--- a/libX11/man/xkb/XkbGetDeviceInfoChanges.man
+++ b/libX11/man/xkb/XkbGetDeviceInfoChanges.man
@@ -33,18 +33,11 @@ XkbGetDeviceInfoChanges \- Query the changes that have occurred in the button
actions or indicator names and indicator maps associated with an input extension
device
.SH SYNOPSIS
+.HP
.B Status XkbGetDeviceInfoChanges
-(
-.I dpy,
-.I device_info,
-.I changes
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- XkbDeviceChangesPtr \fIchanges\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "XkbDeviceChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetDeviceLedInfo.man b/libX11/man/xkb/XkbGetDeviceLedInfo.man
index 33e83f544..3a3c4a1b6 100644
--- a/libX11/man/xkb/XkbGetDeviceLedInfo.man
+++ b/libX11/man/xkb/XkbGetDeviceLedInfo.man
@@ -32,24 +32,13 @@
XkbGetDeviceLedInfo \- Query the indicator names, maps, and state associated
with an LED feedback of an input extension device
.SH SYNOPSIS
+.HP
.B Status XkbGetDeviceLedInfo
-(
-.I dpy,
-.I device_info,
-.I led_class,
-.I led_id,
-.I which
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- unsigned int \fIled_class\fP\^;
-.br
- unsigned int \fIled_id\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "unsigned int " "led_class" "\^,"
+.BI "unsigned int " "led_id" "\^,"
+.BI "unsigned int " "which" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetGeometry.man b/libX11/man/xkb/XkbGetGeometry.man
index 6add607ec..6af9907b2 100644
--- a/libX11/man/xkb/XkbGetGeometry.man
+++ b/libX11/man/xkb/XkbGetGeometry.man
@@ -31,15 +31,10 @@
XkbGetGeometry \- Loads a keyboard geometry if you already have the keyboard
description
.SH SYNOPSIS
+.HP
.B Status XkbGetGeometry
-(
-.I dpy,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetIndicatorChanges.man b/libX11/man/xkb/XkbGetIndicatorChanges.man
index 04faaba79..272112ebe 100644
--- a/libX11/man/xkb/XkbGetIndicatorChanges.man
+++ b/libX11/man/xkb/XkbGetIndicatorChanges.man
@@ -31,21 +31,12 @@
XkbGetIndicatorChanges \- Updates a local copy of the keyboard description with
the actual values of one or more calls to XkbNoteIndicatorChanges
.SH SYNOPSIS
+.HP
.B Status XkbGetIndicatorChanges
-(
-.I dpy,
-.I xkb,
-.I changes,
-.I state
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbIndicatorChangesPtr \fIchanges\fP\^;
-.br
- unsigned int \fIstate\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "XkbIndicatorChangesPtr " "changes" "\^,"
+.BI "unsigned int " "state" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetIndicatorMap.man b/libX11/man/xkb/XkbGetIndicatorMap.man
index 931842a4e..8c14313c2 100644
--- a/libX11/man/xkb/XkbGetIndicatorMap.man
+++ b/libX11/man/xkb/XkbGetIndicatorMap.man
@@ -31,18 +31,11 @@
XkbGetIndicatorMap \- Gets the map for one or more indicators, using a mask to
specify the indicators
.SH SYNOPSIS
+.HP
.B Status XkbGetIndicatorMap
-(
-.I dpy,
-.I which,
-.I desc
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIdesc\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "desc" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetIndicatorState.man b/libX11/man/xkb/XkbGetIndicatorState.man
index ad2e0aa7c..a00e66af3 100644
--- a/libX11/man/xkb/XkbGetIndicatorState.man
+++ b/libX11/man/xkb/XkbGetIndicatorState.man
@@ -30,18 +30,11 @@
.SH NAME
XkbGetIndicatorState \- Obtains the current state of the keyboard indicators
.SH SYNOPSIS
+.HP
.B Status XkbGetIndicatorState
-(
-.I display,
-.I device_spec,
-.I state_return
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIstate_return\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "state_return" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyActions.man b/libX11/man/xkb/XkbGetKeyActions.man
index 93385bca6..f82411da8 100644
--- a/libX11/man/xkb/XkbGetKeyActions.man
+++ b/libX11/man/xkb/XkbGetKeyActions.man
@@ -31,21 +31,12 @@
XkbGetKeyActions \- Update the actions (the key_acts array) for a subset of the
keys in a keyboard description
.SH SYNOPSIS
+.HP
.B Status XkbGetKeyActions
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyBehaviors.man b/libX11/man/xkb/XkbGetKeyBehaviors.man
index 82584cdf6..90d0d4f97 100644
--- a/libX11/man/xkb/XkbGetKeyBehaviors.man
+++ b/libX11/man/xkb/XkbGetKeyBehaviors.man
@@ -31,21 +31,12 @@
XkbChangeTypesOfKey \- Obtain the behaviors (the behaviors array) for a subset of the keys in
a keyboard description from the server
.SH SYNOPSIS
+.HP
.B Status XkbChangeTypesOfKey
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyExplicitComponents.man b/libX11/man/xkb/XkbGetKeyExplicitComponents.man
index b06a38296..8ad000016 100644
--- a/libX11/man/xkb/XkbGetKeyExplicitComponents.man
+++ b/libX11/man/xkb/XkbGetKeyExplicitComponents.man
@@ -27,27 +27,17 @@
.\" or other dealings in this Software without prior written authorization
.\" of the copyright holder.
.\"
-.TH XkbGetKeyExplicitComponents 3Xkb "20 Jul 1999" "X v11 Rel. 6.4" "XKB
-FUNCTION"
+.TH XkbGetKeyExplicitComponents __libmansuffix__ "20 Jul 1999" "X v11 Rel. 6.4" "XKB FUNCTION"
.SH NAME
XkbGetKeyExplicitComponents \- Obtain the explicit components (the explicit
array) for a subset of the keys in a keyboard description
.SH SYNOPSIS
+.HP
.B Status XkbGetKeyExplicitComponents
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyModifierMap.man b/libX11/man/xkb/XkbGetKeyModifierMap.man
index ab7978fa1..802138219 100644
--- a/libX11/man/xkb/XkbGetKeyModifierMap.man
+++ b/libX11/man/xkb/XkbGetKeyModifierMap.man
@@ -31,21 +31,12 @@
XkbGetKeyModifierMap \- Update the modifier map for one or more of the keys in a
keyboard description
.SH SYNOPSIS
+.HP
.B Status XkbGetKeyModifierMap
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeySyms.man b/libX11/man/xkb/XkbGetKeySyms.man
index 95e073748..aff18a883 100644
--- a/libX11/man/xkb/XkbGetKeySyms.man
+++ b/libX11/man/xkb/XkbGetKeySyms.man
@@ -31,21 +31,12 @@
XkbGetKeySyms \- Obtain the symbols for a subset of the keys in a keyboard
description
.SH SYNOPSIS
+.HP
.B Status XkbGetKeySyms
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyTypes.man b/libX11/man/xkb/XkbGetKeyTypes.man
index 68ed52c6f..35c870c3b 100644
--- a/libX11/man/xkb/XkbGetKeyTypes.man
+++ b/libX11/man/xkb/XkbGetKeyTypes.man
@@ -32,21 +32,12 @@
XkbGetKeyTypes \- Obtain the list of available key types in the server's
keyboard mapping
.SH SYNOPSIS
+.HP
.B Status XkbGetKeyTypes
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyVirtualModMap.man b/libX11/man/xkb/XkbGetKeyVirtualModMap.man
index 6b35a7723..c34fffeb7 100644
--- a/libX11/man/xkb/XkbGetKeyVirtualModMap.man
+++ b/libX11/man/xkb/XkbGetKeyVirtualModMap.man
@@ -31,21 +31,12 @@
XkbGetKeyVirtualModMap \- Obtain the virtual modifier map (the vmodmap array)
for a subset of the keys in a keyboard description
.SH SYNOPSIS
+.HP
.B Status XkbGetKeyVirtualModMap
-(
-.I dpy,
-.I first,
-.I num,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIfirst\fP\^;
-.br
- unsigned int \fInum\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "first" "\^,"
+.BI "unsigned int " "num" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyboard.man b/libX11/man/xkb/XkbGetKeyboard.man
index 2f5769bcf..bd949c2ca 100644
--- a/libX11/man/xkb/XkbGetKeyboard.man
+++ b/libX11/man/xkb/XkbGetKeyboard.man
@@ -32,18 +32,11 @@
XkbGetKeyboard \- Retrieves one or more components of a keyboard device
description
.SH SYNOPSIS
+.HP
.B XkbDescPtr XkbGetKeyboard
-(
-.I display,
-.I which,
-.I device_spec
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "device_spec" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetKeyboardByName.man b/libX11/man/xkb/XkbGetKeyboardByName.man
index b27b07c7f..dabed8d91 100644
--- a/libX11/man/xkb/XkbGetKeyboardByName.man
+++ b/libX11/man/xkb/XkbGetKeyboardByName.man
@@ -33,27 +33,14 @@ XkbGetKeyboardByName \- Build a new keyboard description from a set of named
components, and to optionally have the server use the resulting description to
replace an active one
.SH SYNOPSIS
+.HP
.B XkbDescPtr XkbGetKeyboardByName
-(
-.I dpy,
-.I device_spec,
-.I names,
-.I want,
-.I need,
-.I load
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- XkbComponentNamesPtr \fInames\fP\^;
-.br
- unsigned int \fIwant\fP\^;
-.br
- unsigned int \fIneed\fP\^;
-.br
- Bool \fIload\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "XkbComponentNamesPtr " "names" "\^,"
+.BI "unsigned int " "want" "\^,"
+.BI "unsigned int " "need" "\^,"
+.BI "Bool " "load" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetMap.man b/libX11/man/xkb/XkbGetMap.man
index ab1c7893b..f43e53f22 100644
--- a/libX11/man/xkb/XkbGetMap.man
+++ b/libX11/man/xkb/XkbGetMap.man
@@ -33,18 +33,11 @@ XkbGetMap \- Allocate an XkbDescRec structure and populate it with the server's
keyboard
client map and server map
.SH SYNOPSIS
+.HP
.B XkbDescPtr XkbGetMap
-(
-.I display,
-.I which,
-.I device_spec
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "device_spec" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetNameChanges.man b/libX11/man/xkb/XkbGetNameChanges.man
index 08921a0ef..245092cdf 100644
--- a/libX11/man/xkb/XkbGetNameChanges.man
+++ b/libX11/man/xkb/XkbGetNameChanges.man
@@ -33,18 +33,11 @@ XkbGetNameChanges \- Update the local copy of the keyboard description with the
actual values of the results of one or more calls to
.I XkbNoteNameChanges
.SH SYNOPSIS
+.HP
.B Status XkbGetNameChanges
-(
-.I dpy,
-.I xkb,
-.I changes
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- XkbNameChangesPtr \fIchanges\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "XkbNameChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetNamedGeometry.man b/libX11/man/xkb/XkbGetNamedGeometry.man
index c142decaa..2a76d0b69 100644
--- a/libX11/man/xkb/XkbGetNamedGeometry.man
+++ b/libX11/man/xkb/XkbGetNamedGeometry.man
@@ -27,23 +27,16 @@
.\" or other dealings in this Software without prior written authorization
.\" of the copyright holder.
.\"
-.TH XkbGetNamedGeometry 3Xkb "Release 6.1" "X Version 11" "XKBLIB FUNCTION"
+.TH XkbGetNamedGeometry __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
XkbGetNamedGeometry \- Loads a keyboard geometry description from this database
by name
.SH SYNTAX
+.HP
.B Status XkbGetNamedGeometry
-(
-.I dpy,
-.I xkb,
-.I name
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- Atom \fIname\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "Atom " "name" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetNamedIndicator.man b/libX11/man/xkb/XkbGetNamedIndicator.man
index 8abad9dc2..c335d29fd 100644
--- a/libX11/man/xkb/XkbGetNamedIndicator.man
+++ b/libX11/man/xkb/XkbGetNamedIndicator.man
@@ -31,30 +31,15 @@
XkbGetNamedIndicator \- Look up the indicator map and other information for an
indicator by name
.SH SYNOPSIS
+.HP
.B Bool XkbGetNamedIndicator
-(
-.I dpy,
-.I dev_spec,
-.I name,
-.I ndx_rtrn,
-.I state_rtrn,
-.I map_rtrn,
-.I real_rtrn
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- unsigned int \fIdev_spec\fP\^;
-.br
- Atom \fIname\fP\^;
-.br
- int *\fIndx_rtrn\fP\^;
-.br
- Bool *\fIstate_rtrn\fP\^;
-.br
- XkbIndicatorMapPtr \fImap_rtrn\fP\^;
-.br
- Bool *\fIreal_rtrn\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "dev_spec" "\^,"
+.BI "Atom " "name" "\^,"
+.BI "int *" "ndx_rtrn" "\^,"
+.BI "Bool *" "state_rtrn" "\^,"
+.BI "XkbIndicatorMapPtr " "map_rtrn" "\^,"
+.BI "Bool *" "real_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetNames.man b/libX11/man/xkb/XkbGetNames.man
index 6d29a4ff2..a96fcd806 100644
--- a/libX11/man/xkb/XkbGetNames.man
+++ b/libX11/man/xkb/XkbGetNames.man
@@ -31,18 +31,11 @@
.SH NAME
XkbGetNames \- Obtain symbolic names from the server
.SH SYNOPSIS
+.HP
.B Status XkbGetNames
-(
-.I dpy,
-.I which,
-.I Xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIXkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "Xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetSlowKeysDelay.man b/libX11/man/xkb/XkbGetSlowKeysDelay.man
index ff7b29f35..86e54ac14 100644
--- a/libX11/man/xkb/XkbGetSlowKeysDelay.man
+++ b/libX11/man/xkb/XkbGetSlowKeysDelay.man
@@ -31,18 +31,11 @@
.SH NAME
XkbGetSlowKeysDelay \- Gets the SlowKeys acceptance delay for a keyboard device
.SH SYNOPSIS
+.HP
.B Bool XkbGetSlowKeysDelay
-(
-.I display,
-.I device_spec,
-.I delay_rtrn
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int *\fIdelay_rtrn \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int *" "delay_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetState.man b/libX11/man/xkb/XkbGetState.man
index dbdcd4705..1d98e7f87 100644
--- a/libX11/man/xkb/XkbGetState.man
+++ b/libX11/man/xkb/XkbGetState.man
@@ -30,18 +30,11 @@
.SH NAME
XkbGetState \- Obtains the keyboard state
.SH SYNOPSIS
+.HP
.B Bool XkbGetState
-(
-.I display,
-.I device_spec,
-.I state_return
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- XkbStatePtr \fIstate_return\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "XkbStatePtr " "state_return" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetStickyKeysOptions.man b/libX11/man/xkb/XkbGetStickyKeysOptions.man
index 7d3547d68..2ae1242f2 100644
--- a/libX11/man/xkb/XkbGetStickyKeysOptions.man
+++ b/libX11/man/xkb/XkbGetStickyKeysOptions.man
@@ -30,18 +30,11 @@
.SH NAME
XkbGetStickyKeysOptions \- Queries the current StickyKeys attributes for a keyboard device
.SH SYNOPSIS
+.HP
.B Bool XkbGetStickyKeysOptions
-(
-.I display,
-.I device_spec,
-.I options_rtrn
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int *\fIoptions_rtrn\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int *" "options_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetUpdatedMap.man b/libX11/man/xkb/XkbGetUpdatedMap.man
index 97cefe96e..ed1401884 100644
--- a/libX11/man/xkb/XkbGetUpdatedMap.man
+++ b/libX11/man/xkb/XkbGetUpdatedMap.man
@@ -32,18 +32,11 @@
XkbGetUpdatedMap \- Update the client or server map information in an existing
keyboard description
.SH SYNOPSIS
+.HP
.B Status XkbGetUpdatedMap
-(
-.I display,
-.I which,
-.I xkb
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetVirtualMods.man b/libX11/man/xkb/XkbGetVirtualMods.man
index e62670e44..5aa31a280 100644
--- a/libX11/man/xkb/XkbGetVirtualMods.man
+++ b/libX11/man/xkb/XkbGetVirtualMods.man
@@ -32,18 +32,11 @@
XkbGetVirtualMods \- Obtain a subset of the virtual modifier bindings (the vmods
array) in a keyboard description
.SH SYNOPSIS
+.HP
.B Status XkbGetVirtualMods
-(
-.I dpy,
-.I which,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbGetXlibControls.man b/libX11/man/xkb/XkbGetXlibControls.man
index 91860a76e..b9f5428a8 100644
--- a/libX11/man/xkb/XkbGetXlibControls.man
+++ b/libX11/man/xkb/XkbGetXlibControls.man
@@ -31,12 +31,9 @@
.SH NAME
XkbGetXlibControls \- Determines the current state of the Library Controls
.SH SYNOPSIS
+.HP
.B unsigned int XkbGetXlibControls
-(
-.I display
-)
-.br
- Display *\fIdisplay\fP\^;
+.BI "(\^Display *" "display" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbIgnoreExtension.man b/libX11/man/xkb/XkbIgnoreExtension.man
index 8b0cc4a70..addb095b1 100644
--- a/libX11/man/xkb/XkbIgnoreExtension.man
+++ b/libX11/man/xkb/XkbIgnoreExtension.man
@@ -31,12 +31,9 @@
XkbIgnoreExtension \- Prevents core X library keyboard functions from using the
X Keyboard Extension
.SH SYNOPSIS
+.HP
.B Bool XkbIgnoreExtension
-(
-.I ignore
-)
-.br
- Bool *\fIignore\fP\^;
+.BI "(\^Bool *" "ignore" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -86,4 +83,4 @@ The
.I XkbIgnoreExtension
function returns False if it was unable to apply the ignore request.
.SH "SEE ALSO"
-.BR XOpenDisplay (3X11)
+.BR XOpenDisplay (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbInitCanonicalKeyTypes.man b/libX11/man/xkb/XkbInitCanonicalKeyTypes.man
index 13aed6176..658b979bc 100644
--- a/libX11/man/xkb/XkbInitCanonicalKeyTypes.man
+++ b/libX11/man/xkb/XkbInitCanonicalKeyTypes.man
@@ -32,18 +32,11 @@
XkbInitCanonicalKeyTypes \- Set the definitions of the canonical key types in a
client map to their default values
.SH SYNOPSIS
+.HP
.B Status XkbInitCanonicalKeyTypes
-(
-.I xkb,
-.I which,
-.I keypadVMod
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- int \fIkeypadVMod\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "int " "keypadVMod" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyAction.man b/libX11/man/xkb/XkbKeyAction.man
index e6a2902bd..d67c3c14f 100644
--- a/libX11/man/xkb/XkbKeyAction.man
+++ b/libX11/man/xkb/XkbKeyAction.man
@@ -30,18 +30,11 @@
.SH NAME
XkbKeyAction \- Returns the key action
.SH SYNOPSIS
+.HP
.B XkbAction XkbKeyAction
-(
-.I xkb,
-.I keycode,
-.I idx
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
-.br
- int \fIidx\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^,"
+.BI "int " "idx" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyActionEntry.man b/libX11/man/xkb/XkbKeyActionEntry.man
index 4dd54aa21..6fbfe7d38 100644
--- a/libX11/man/xkb/XkbKeyActionEntry.man
+++ b/libX11/man/xkb/XkbKeyActionEntry.man
@@ -33,21 +33,12 @@ level lvl from the
two-dimensional table of key actions associated with the key corresponding to
keycode
.SH SYNOPSIS
-.B XkbAction XkbKeyActionEntry macro
-(
-.I xkb,
-.I keycode,
-.I shift,
-.I grp
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
-.br
- int \fIshift\fP\^;
-.br
- int \fIgrp\fP\^;
+.HP
+.B XkbAction XkbKeyActionEntry
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^,"
+.BI "int " "shift" "\^,"
+.BI "int " "grp" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyActionsPtr.man b/libX11/man/xkb/XkbKeyActionsPtr.man
index c9d4a29fb..64e84d442 100644
--- a/libX11/man/xkb/XkbKeyActionsPtr.man
+++ b/libX11/man/xkb/XkbKeyActionsPtr.man
@@ -33,15 +33,10 @@ XkbKeyActionsPtr \- Returns a pointer to the two-dimensional array of key
actions associated with
the key corresponding to keycode
.SH SYNOPSIS
-.B XkbKeyActionPtr XkbKeyActionsPtr macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B XkbKeyActionPtr XkbKeyActionsPtr
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyGroupInfo.man b/libX11/man/xkb/XkbKeyGroupInfo.man
index 50787b415..749888187 100644
--- a/libX11/man/xkb/XkbKeyGroupInfo.man
+++ b/libX11/man/xkb/XkbKeyGroupInfo.man
@@ -33,15 +33,10 @@ XkbKeyGroupInfo \- Returns the number of groups of symbols bound to the key
corresponding to
keycode
.SH SYNOPSIS
-.B unsigned char XkbKeyGroupInfo macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B unsigned char XkbKeyGroupInfo
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyGroupWidth.man b/libX11/man/xkb/XkbKeyGroupWidth.man
index 0a3b7fb2c..09244f057 100644
--- a/libX11/man/xkb/XkbKeyGroupWidth.man
+++ b/libX11/man/xkb/XkbKeyGroupWidth.man
@@ -34,18 +34,11 @@ XkbKeyGroupWidth \- Computes the width of the type associated with the group
for the key corresponding to
.I keycode
.SH SYNOPSIS
-.B int XkbKeyGroupWidth macro
-(
-.I xkb,
-.I keycode,
-.I grp
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
-.br
- int \fIgrp\fP\^;
+.HP
+.B int XkbKeyGroupWidth
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^,"
+.BI "int " "grp" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyGroupsWidth.man b/libX11/man/xkb/XkbKeyGroupsWidth.man
index a8b59ae65..3dcc003f0 100644
--- a/libX11/man/xkb/XkbKeyGroupsWidth.man
+++ b/libX11/man/xkb/XkbKeyGroupsWidth.man
@@ -32,15 +32,10 @@ XkbKeyGroupsWidth \- Computes the maximum width associated with the key
corresponding to
.I keycode
.SH SYNOPSIS
-.B int XkbKeyGroupsWidth macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B int XkbKeyGroupsWidth
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyHasActions.man b/libX11/man/xkb/XkbKeyHasActions.man
index f1b457f7a..d448b501a 100644
--- a/libX11/man/xkb/XkbKeyHasActions.man
+++ b/libX11/man/xkb/XkbKeyHasActions.man
@@ -32,15 +32,10 @@ XkbKeyHasActions \- Determines if the key corresponding to
.I keycode
has any actions associated with it
.SH SYNOPSIS
-.B int XkbKeyHasActions macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B int XkbKeyHasActions
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyNumActions.man b/libX11/man/xkb/XkbKeyNumActions.man
index b37897b0d..e1d3ef204 100644
--- a/libX11/man/xkb/XkbKeyNumActions.man
+++ b/libX11/man/xkb/XkbKeyNumActions.man
@@ -32,15 +32,10 @@
XkbKeyNumActions \- Computes the number of actions associated with the key corresponding to
keycode
.SH SYNOPSIS
-.B int XkbKeyNumActions macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B int XkbKeyNumActions
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyNumGroups.man b/libX11/man/xkb/XkbKeyNumGroups.man
index 70daba5fc..cf0fdc783 100644
--- a/libX11/man/xkb/XkbKeyNumGroups.man
+++ b/libX11/man/xkb/XkbKeyNumGroups.man
@@ -32,15 +32,10 @@
XkbKeyNumGroups \- Returns the number of groups of symbols bound to the key
corresponding to keycode
.SH SYNOPSIS
-.B int XkbKeyNumGroups macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B int XkbKeyNumGroups
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyNumSyms.man b/libX11/man/xkb/XkbKeyNumSyms.man
index 95fa50048..83b10efe7 100644
--- a/libX11/man/xkb/XkbKeyNumSyms.man
+++ b/libX11/man/xkb/XkbKeyNumSyms.man
@@ -33,15 +33,10 @@ XkbKeyNumSyms \- Returns the total number of keysyms for the key corresponding
to
.I keycode
.SH SYNOPSIS
-.B int XkbKeyNumSyms macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B int XkbKeyNumSyms
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeySymEntry.man b/libX11/man/xkb/XkbKeySymEntry.man
index 9fed16559..4c3527934 100644
--- a/libX11/man/xkb/XkbKeySymEntry.man
+++ b/libX11/man/xkb/XkbKeySymEntry.man
@@ -35,21 +35,12 @@ and group
from the two-dimensional array of keysyms for the key corresponding to
.I keycode
.SH SYNOPSIS
-.B KeySym XkbKeySymEntry macro
-(
-.I xkb,
-.I keycode,
-.I shift,
-.I grp
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
-.br
- int \fIshift\fP\^;
-.br
- int \fIgrp\fP\^;
+.HP
+.B KeySym XkbKeySymEntry
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^,"
+.BI "int " "shift" "\^,"
+.BI "int " "grp" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeySymsOffset.man b/libX11/man/xkb/XkbKeySymsOffset.man
index 4bbc12b95..ec145c35a 100644
--- a/libX11/man/xkb/XkbKeySymsOffset.man
+++ b/libX11/man/xkb/XkbKeySymsOffset.man
@@ -33,15 +33,10 @@ XkbKeySymsOffset \- Returns the offset of the two-dimensional array of keysyms
for the key corresponding to
.I keycode
.SH SYNOPSIS
-.B int XkbKeySymsOffset macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B int XkbKeySymsOffset
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeySymsPtr.man b/libX11/man/xkb/XkbKeySymsPtr.man
index d83199ae4..a0a1df9fb 100644
--- a/libX11/man/xkb/XkbKeySymsPtr.man
+++ b/libX11/man/xkb/XkbKeySymsPtr.man
@@ -33,15 +33,10 @@ XkbKeySymsPtr \- Returns the pointer to the two-dimensional array of keysyms for
the key corresponding to
.I keycode
.SH SYNOPSIS
-.B KeySym * XkbKeySymsPtr macro
-(
-.I xkb,
-.I keycode
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
+.HP
+.B KeySym * XkbKeySymsPtr
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyType.man b/libX11/man/xkb/XkbKeyType.man
index 2d0358225..5847c584a 100644
--- a/libX11/man/xkb/XkbKeyType.man
+++ b/libX11/man/xkb/XkbKeyType.man
@@ -31,18 +31,11 @@
.SH NAME
XkbKeyType \- Obtain the index of a key type or the pointer to a key type
.SH SYNOPSIS
+.HP
.B XkbKeyTypePtr XkbKeyType
-(
-.I xkb,
-.I keycode,
-.I group
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
-.br
- int \fIgroup\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^,"
+.BI "int " "group" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyTypeIndex.man b/libX11/man/xkb/XkbKeyTypeIndex.man
index 806116545..b7ded7a7e 100644
--- a/libX11/man/xkb/XkbKeyTypeIndex.man
+++ b/libX11/man/xkb/XkbKeyTypeIndex.man
@@ -31,18 +31,11 @@
.SH NAME
XkbKeyTypeIndex \- Obtain the index of a key type or the pointer to a key type
.SH SYNOPSIS
+.HP
.B int XkbKeyTypeIndex
-(
-.I xkb,
-.I keycode,
-.I group
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkeycode\fP\^;
-.br
- int \fIgroup\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "keycode" "\^,"
+.BI "int " "group" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man b/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man
index ca35b76da..c44ff504f 100644
--- a/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man
+++ b/libX11/man/xkb/XkbKeyTypesForCoreSymbols.man
@@ -32,27 +32,14 @@
XkbKeyTypesForCoreSymbols \- Determine the Xkb key types appropriate for the
symbols bound to a key in a core keyboard mapping
.SH SYNOPSIS
+.HP
.B int XkbKeyTypesForCoreSymbols
-(
-.I xkb,
-.I map_width,
-.I core_syms,
-.I protected,
-.I types_inout,
-.I xkb_syms_rtrn
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- int \fImap_width\fP\^;
-.br
- KeySym * \fIcore_syms\fP\^;
-.br
- unsigned int \fIprotected\fP\^;
-.br
- int * \fItypes_inout\fP\^;
-.br
- KeySym * \fIxkb_syms_rtrn\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "int " "map_width" "\^,"
+.BI "KeySym *" "core_syms" "\^,"
+.BI "unsigned int " "protected" "\^,"
+.BI "int *" "types_inout" "\^,"
+.BI "KeySym *" "xkb_syms_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeycodeToKeysym.man b/libX11/man/xkb/XkbKeycodeToKeysym.man
index 130c1ded1..5e495d8bd 100644
--- a/libX11/man/xkb/XkbKeycodeToKeysym.man
+++ b/libX11/man/xkb/XkbKeycodeToKeysym.man
@@ -31,21 +31,12 @@
XkbKeycodeToKeysym \- Finds the keysym bound to a particular key at a specified
group and shift level
.SH SYNOPSIS
+.HP
.B KeySym XkbKeycodeToKeysym
-(
-.I dpy,
-.I kc,
-.I group,
-.I level
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- KeyCode \fIkc\fP\^;
-.br
- unsigned int \fIgroup\fP\^;
-.br
- unsigned int \fIlevel\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "KeyCode " "kc" "\^,"
+.BI "unsigned int " "group" "\^,"
+.BI "unsigned int " "level" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbKeysymToModifiers.man b/libX11/man/xkb/XkbKeysymToModifiers.man
index ff7e73607..ebccc21c0 100644
--- a/libX11/man/xkb/XkbKeysymToModifiers.man
+++ b/libX11/man/xkb/XkbKeysymToModifiers.man
@@ -31,15 +31,10 @@
XkbKeysymToModifiers \- Finds the set of modifiers bound to a particular keysym
on the core keyboard
.SH SYNOPSIS
+.HP
.B unsigned int XkbKeysymToModifiers
-(
-.I dpy,
-.I ks
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- KeySym \fIks\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "KeySym " "ks" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbLatchGroup.man b/libX11/man/xkb/XkbLatchGroup.man
index 8b516ba1a..61ad5cc50 100644
--- a/libX11/man/xkb/XkbLatchGroup.man
+++ b/libX11/man/xkb/XkbLatchGroup.man
@@ -31,18 +31,11 @@
.SH NAME
XkbLatchGroup \- Latches the keysym group
.SH SYNOPSIS
+.HP
.B Bool XkbLatchGroup
-(
-.I display,
-.I device_spec,
-.I group
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIgroup\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "group" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbLatchModifiers.man b/libX11/man/xkb/XkbLatchModifiers.man
index baf706698..319b37f83 100644
--- a/libX11/man/xkb/XkbLatchModifiers.man
+++ b/libX11/man/xkb/XkbLatchModifiers.man
@@ -32,21 +32,12 @@
XkbLatchModifiers \- Latches and unlatches any of the eight real keyboard
modifiers
.SH SYNOPSIS
+.HP
.B Bool XkbLatchModifiers
-(
-.I display,
-.I device_spec,
-.I affect,
-.I values
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIaffect\fP\^;
-.br
- unsigned int \fIvalues\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "affect" "\^,"
+.BI "unsigned int " "values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbLibraryVersion.man b/libX11/man/xkb/XkbLibraryVersion.man
index 1165e43d4..98d4ce9e8 100644
--- a/libX11/man/xkb/XkbLibraryVersion.man
+++ b/libX11/man/xkb/XkbLibraryVersion.man
@@ -30,15 +30,10 @@
.SH NAME
XkbLibraryVersion \- Determines the compatibility of a library at runtime.
.SH SYNOPSIS
+.HP
.B Bool XkbLibraryVersion
-(
-.I lib_major_in_out,
-.I lib_minor_in_out
-)
-.br
- int *\fIlib_major_in_out\fP\^;
-.br
- int *\fIlib_minor_in_out\fP\^;
+.BI "(\^int *" "lib_major_in_out" "\^,"
+.BI "int *" "lib_minor_in_out" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbListComponents.man b/libX11/man/xkb/XkbListComponents.man
index 6e6855def..f9f124248 100644
--- a/libX11/man/xkb/XkbListComponents.man
+++ b/libX11/man/xkb/XkbListComponents.man
@@ -31,21 +31,12 @@
.SH NAME
XkbListComponents \- List of components for one or more component types
.SH SYNOPSIS
+.HP
.B XkbComponentListPtr XkbListComponents
-(
-.I dpy,
-.I device_spec,
-.I ptrns,
-.I max_inout
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- XkbComponentNamesPtr \fIptrnst\fP\^;
-.br
- int * \fImax_inout\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "XkbComponentNamesPtr " "ptrns" "\^,"
+.BI "int *" "max_inout" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbLockGroup.man b/libX11/man/xkb/XkbLockGroup.man
index 87eb8e270..42a30f717 100644
--- a/libX11/man/xkb/XkbLockGroup.man
+++ b/libX11/man/xkb/XkbLockGroup.man
@@ -31,18 +31,11 @@
.SH NAME
XkbLockGroup \- Locks the keysym group
.SH SYNOPSIS
+.HP
.B Bool XkbLockGroup
-(
-.I display,
-.I device_spec,
-.I group
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIgroup\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "group" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbLockModifiers.man b/libX11/man/xkb/XkbLockModifiers.man
index 25df6accf..add98f0f7 100644
--- a/libX11/man/xkb/XkbLockModifiers.man
+++ b/libX11/man/xkb/XkbLockModifiers.man
@@ -31,21 +31,12 @@
.SH NAME
XkbLockModifiers \- Locks and unlocks any of the eight real keyboard modifiers
.SH SYNOPSIS
+.HP
.B Bool XkbLockModifiers
-(
-.I display,
-.I device_spec,
-.I affect,
-.I values
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIaffect\fP\^;
-.br
- unsigned int \fIvalues\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "affect" "\^,"
+.BI "unsigned int " "values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbLookupKeyBinding.man b/libX11/man/xkb/XkbLookupKeyBinding.man
index 6f2022278..3a1463db3 100644
--- a/libX11/man/xkb/XkbLookupKeyBinding.man
+++ b/libX11/man/xkb/XkbLookupKeyBinding.man
@@ -30,27 +30,14 @@
.SH NAME
XkbLookupKeyBinding \- Find the string bound to a key by XRebindKeySym
.SH SYNOPSIS
+.HP
.B int XkbLookupKeyBinding
-(
-.I dpy,
-.I sym,
-.I state,
-.I buf,
-.I nbytes,
-.I extra_rtrn
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- KeySym \fIsym\fP\^;
-.br
- unsigned int \fIstate\fP\^;
-.br
- char * \fIbuf\fP\^;
-.br
- int \fInbytes\fP\^;
-.br
- int * \fIextra_rtrn\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "KeySym " "sym" "\^,"
+.BI "unsigned int " "state" "\^,"
+.BI "char *" "buf" "\^,"
+.BI "int " "nbytes" "\^,"
+.BI "int *" "extra_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -100,5 +87,5 @@ returns the number of bytes that it placed into
.I buf.
.SH "SEE ALSO"
.BR XkbTranslateKeySym (__libmansuffix__),
-.BR XLookupString (3X11),
-.BR XRebindKeysym (3X11)
+.BR XLookupString (__libmansuffix__),
+.BR XRebindKeysym (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbLookupKeySym.man b/libX11/man/xkb/XkbLookupKeySym.man
index c3af29b44..eae13a4c1 100644
--- a/libX11/man/xkb/XkbLookupKeySym.man
+++ b/libX11/man/xkb/XkbLookupKeySym.man
@@ -30,24 +30,13 @@
.SH NAME
XkbLookupKeySym \- Find the symbol associated with a key for a particular state
.SH SYNOPSIS
+.HP
.B Bool XkbLookupKeySym
-(
-.I dpy,
-.I key,
-.I state,
-.I mods_rtrn,
-.I sym_rtrn
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- KeyCode \fIkey\fP\^;
-.br
- unsigned int \fIstate\fP\^;
-.br
- unsigned int *\fImods_rtrn\fP\^;
-.br
- KeySym *\fIsym_rtrn\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "KeyCode " "key" "\^,"
+.BI "unsigned int " "state" "\^,"
+.BI "unsigned int *" "mods_rtrn" "\^,"
+.BI "KeySym *" "sym_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -85,5 +74,5 @@ parameter is the state from a KeyPress or KeyRelease event.
.I XkbLookupKeySym
returns True if it succeeds.
.SH "SEE ALSO"
-.BR XLookupKeySym (3X11)
+.BR XLookupKeySym (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbModActionVMods.man b/libX11/man/xkb/XkbModActionVMods.man
index 9120a6571..94a0f4a8e 100644
--- a/libX11/man/xkb/XkbModActionVMods.man
+++ b/libX11/man/xkb/XkbModActionVMods.man
@@ -32,12 +32,9 @@
XkbModActionVMods \- Returns the vmods1 and vmods2 fields of act converted to the vmods format of an
Xkb modifier description
.SH SYNOPSIS
-.B unsigned short XkbModActionVMods macro
-(
-.I act
-)
-.br
- XkbAction \fIact\fP\^;
+.HP
+.B unsigned short XkbModActionVMods
+.BI "(\^XkbAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbNoteControlsChanges.man b/libX11/man/xkb/XkbNoteControlsChanges.man
index 880e29c2e..125c7053a 100644
--- a/libX11/man/xkb/XkbNoteControlsChanges.man
+++ b/libX11/man/xkb/XkbNoteControlsChanges.man
@@ -32,18 +32,11 @@
XkbNoteControlsChanges \- Notes the changes in a changes structure when a client receives an XkbControlsNotify
event
.SH SYNOPSIS
+.HP
.B void XkbNoteControlsChanges
-(
-.I changes,
-.I new,
-.I wanted
-)
-.br
- XkbControlsChangesPtr \fIchanges\fP\^;
-.br
- XkbControlsNotifyEvent *\fInew\fP\^;
-.br
- unsigned int \fIwanted\fP\^;
+.BI "(\^XkbControlsChangesPtr " "changes" "\^,"
+.BI "XkbControlsNotifyEvent *" "new" "\^,"
+.BI "unsigned int " "wanted" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbNoteDeviceChanges.man b/libX11/man/xkb/XkbNoteDeviceChanges.man
index 8271e9f65..b62ec6cac 100644
--- a/libX11/man/xkb/XkbNoteDeviceChanges.man
+++ b/libX11/man/xkb/XkbNoteDeviceChanges.man
@@ -31,18 +31,11 @@
.SH NAME
XkbNoteDeviceChanges \- Note device changes reported in an XkbExtensionDeviceNotify event
.SH SYNOPSIS
+.HP
.B void XkbNoteDeviceChanges
-(
-.I old,
-.I new,
-.I wanted
-)
-.br
- XkbDeviceChangesPtr \fIold\fP\^;
-.br
- XkbExtensionDeviceNotifyEvent * \fInew\fP\^;
-.br
- unsigned int \fIwanted\fP\^;
+.BI "(\^XkbDeviceChangesPtr " "old" "\^,"
+.BI "XkbExtensionDeviceNotifyEvent *" "new" "\^,"
+.BI "unsigned int " "wanted" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbNoteIndicatorChanges.man b/libX11/man/xkb/XkbNoteIndicatorChanges.man
index 48975b775..911b1b614 100644
--- a/libX11/man/xkb/XkbNoteIndicatorChanges.man
+++ b/libX11/man/xkb/XkbNoteIndicatorChanges.man
@@ -30,18 +30,11 @@
.SH NAME
XkbNoteIndicatorChanges \- Notes the changes in a changes structure
.SH SYNOPSIS
+.HP
.B void XkbNoteIndicatorChanges
-(
-.I old,
-.I new,
-.I wanted
-)
-.br
- XkbIndicatorChangesPtr \fIold\fP\^;
-.br
- XkbIndicatorNotifyEvent *\fInew\fP\^;
-.br
- unsigned int \fIwanted\fP\^;
+.BI "(\^XkbIndicatorChangesPtr " "old" "\^,"
+.BI "XkbIndicatorNotifyEvent *" "new" "\^,"
+.BI "unsigned int " "wanted" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbNoteNameChanges.man b/libX11/man/xkb/XkbNoteNameChanges.man
index a17a4aa22..f4809be24 100644
--- a/libX11/man/xkb/XkbNoteNameChanges.man
+++ b/libX11/man/xkb/XkbNoteNameChanges.man
@@ -31,18 +31,11 @@
.SH NAME
XkbNoteNameChanges \- Note the changed names in a changes structure
.SH SYNOPSIS
+.HP
.B void XkbNoteNameChanges
-(
-.I old,
-.I new,
-.I wanted
-)
-.br
- XkbNameChangesPtr \fIold\fP\^;
-.br
- XkbNamesNotifyEvent * \fInew\fP\^;
-.br
- unsigned int \fIwanted\fP\^;
+.BI "(\^XkbNameChangesPtr " "old" "\^,"
+.BI "XkbNamesNotifyEvent *" "new" "\^,"
+.BI "unsigned int " "wanted" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbOpenDisplay.man b/libX11/man/xkb/XkbOpenDisplay.man
index 22a44c814..0d74303eb 100644
--- a/libX11/man/xkb/XkbOpenDisplay.man
+++ b/libX11/man/xkb/XkbOpenDisplay.man
@@ -31,27 +31,14 @@
XkbOpenDisplay \- Checks for a compatible version of the Xkb extension in both
the library and the server, and initializes the extension for use.
.SH SYNOPSIS
+.HP
.B Display XkbOpenDisplay
-(
-.I display_name,
-.I event_rtrn,
-.I error_rtrn,
-.I major_in_out,
-.I minor_in_out,
-.I reason_rtrn
-)
-.br
- char *\fIdisplay_name\fP\^;
-.br
- int *\fIevent_rtrn\fP\^;
-.br
- int *\fIerror_rtrn\fP\^;
-.br
- int *\fImajor_in_out\fP\^;
-.br
- int *\fIminor_in_out\fP\^;
-.br
- int *\fIreason_rtrn\fP\^;
+.BI "(\^char *" "display_name" "\^,"
+.BI "int *" "event_rtrn" "\^,"
+.BI "int *" "error_rtrn" "\^,"
+.BI "int *" "major_in_out" "\^,"
+.BI "int *" "minor_in_out" "\^,"
+.BI "int *" "reason_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -167,4 +154,4 @@ The Xkb extension has not been properly initialized
.SH "SEE ALSO"
.BR XkbLibraryVersion (__libmansuffix__),
.BR XkbQueryExtension (__libmansuffix__),
-.BR XOpenDisplay (3X11)
+.BR XOpenDisplay (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbOutOfRangeGroupInfo.man b/libX11/man/xkb/XkbOutOfRangeGroupInfo.man
index 8a02612f0..e12f8c33b 100644
--- a/libX11/man/xkb/XkbOutOfRangeGroupInfo.man
+++ b/libX11/man/xkb/XkbOutOfRangeGroupInfo.man
@@ -32,12 +32,9 @@
XkbOutOfRangeGroupInfo \- Returns only the out-of-range processing information
from the group_info field of an XkbSymMapRec structure
.SH SYNOPSIS
-.B unsigned char XkbOutOfRangeGroupInfo macro
-(
-.I grp_inf
-)
-.br
- unsigned char \fIgrp_inf\fP\^;
+.HP
+.B unsigned char XkbOutOfRangeGroupInfo
+.BI "(\^unsigned char " "grp_inf" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbOutOfRangeGroupNumber.man b/libX11/man/xkb/XkbOutOfRangeGroupNumber.man
index c38b3d866..7e3a9a5ba 100644
--- a/libX11/man/xkb/XkbOutOfRangeGroupNumber.man
+++ b/libX11/man/xkb/XkbOutOfRangeGroupNumber.man
@@ -32,12 +32,9 @@
XkbOutOfRangeGroupNumber \- Returns the out-of-range group number, represented
as a group index, from the group_info field of an XkbSymMapRec structure
.SH SYNOPSIS
-.B unsigned char XkbOutOfRangeGroupNumber macro
-(
-.I grp_inf
-)
-.br
- unsigned char \fIgrp_inf\fP\^;
+.HP
+.B unsigned char XkbOutOfRangeGroupNumber
+.BI "(\^unsigned char " "grp_inf" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbPtrActionX.man b/libX11/man/xkb/XkbPtrActionX.man
index 7bf9e2aa4..7dfaabc06 100644
--- a/libX11/man/xkb/XkbPtrActionX.man
+++ b/libX11/man/xkb/XkbPtrActionX.man
@@ -32,12 +32,9 @@
XkbPtrActionX \- Returns the high_XXX and low_XXX fields of act converted to a
signed int
.SH SYNOPSIS
-.B int XkbPtrActionX macro
-(
-.I act
-)
-.br
- XkbPtrAction \fIact\fP\^;
+.HP
+.B int XkbPtrActionX
+.BI "(\^XkbPtrAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbPtrActionY.man b/libX11/man/xkb/XkbPtrActionY.man
index 9370e9ac2..c342a0940 100644
--- a/libX11/man/xkb/XkbPtrActionY.man
+++ b/libX11/man/xkb/XkbPtrActionY.man
@@ -32,12 +32,9 @@
XkbPtrActionY \- Returns the high_YYY and low_YYY fields of act converted to a
signed int
.SH SYNOPSIS
-.B int XkbPtrActionY macro
-(
-.I act
-)
-.br
- XkbPtrAction \fIact\fP\^;
+.HP
+.B int XkbPtrActionY
+.BI "(\^XkbPtrAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbQueryExtension.man b/libX11/man/xkb/XkbQueryExtension.man
index c5f2e9337..11fed2df4 100644
--- a/libX11/man/xkb/XkbQueryExtension.man
+++ b/libX11/man/xkb/XkbQueryExtension.man
@@ -30,27 +30,14 @@
.SH NAME
XkbQueryExtension \- Determines the compatibility of a library at runtime.
.SH SYNOPSIS
+.HP
.B Bool XkbQueryExtension
-(
-.I dpy,
-.I opcode_rtrn,
-.I event_rtrn,
-.I error_rtrn,
-.I major_in_out,
-.I minor_in_out
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- int \fIopcode_rtrn\fP\^;
-.br
- int \fIevent_rtrn\fP\^;
-.br
- int *\fIerror_rtrn\fP\^;
-.br
- int \fImajor_in_out\fP\^;
-.br
- int \fIminor_in_out\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "int *" "opcode_rtrn" "\^,"
+.BI "int *" "event_rtrn" "\^,"
+.BI "int *" "error_rtrn" "\^,"
+.BI "int *" "major_in_out" "\^,"
+.BI "int *" "minor_in_out" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbRefreshKeyboardMapping.man b/libX11/man/xkb/XkbRefreshKeyboardMapping.man
index 4e910eb1b..bc54d3b5b 100644
--- a/libX11/man/xkb/XkbRefreshKeyboardMapping.man
+++ b/libX11/man/xkb/XkbRefreshKeyboardMapping.man
@@ -31,12 +31,9 @@
XkbRefreshKeyboardMapping \- Update the keyboard description that is internal to the X
library
.SH SYNOPSIS
+.HP
.B Status XkbRefreshKeyboardMapping
-(
-.I event
-)
-.br
- XkbMapNotifyEvent * \fIevent\fP\^;
+.BI "(\^XkbMapNotifyEvent *" "event" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -75,4 +72,4 @@ type and range, but is otherwise invalid
.BR XkbChangeMap (__libmansuffix__),
.BR XkbGetKeyboardByName (__libmansuffix__),
.BR XkbSetMap (__libmansuffix__),
-.BR XRefreshKeyboardMapping (3X11)
+.BR XRefreshKeyboardMapping (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbResizeDeviceButtonActions.man b/libX11/man/xkb/XkbResizeDeviceButtonActions.man
index 9bace20a9..e1d9b52a2 100644
--- a/libX11/man/xkb/XkbResizeDeviceButtonActions.man
+++ b/libX11/man/xkb/XkbResizeDeviceButtonActions.man
@@ -31,15 +31,10 @@
.SH NAME
XkbResizeDeviceButtonActions \- Allocate additional space for button actions in an XkbDeviceInfoRec structure
.SH SYNOPSIS
+.HP
.B Status XkbResizeDeviceButtonActions
-(
-.I device_info,
-.I new_total
-)
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
-.br
- unsigned int \fInew_total\fP\^;
+.BI "(\^XkbDeviceInfoPtr " "device_info" "\^,"
+.BI "unsigned int " "new_total" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbResizeKeyActions.man b/libX11/man/xkb/XkbResizeKeyActions.man
index d5f88d301..8d851546d 100644
--- a/libX11/man/xkb/XkbResizeKeyActions.man
+++ b/libX11/man/xkb/XkbResizeKeyActions.man
@@ -31,18 +31,11 @@
.SH NAME
XkbResizeKeyActions \- Change the number of actions bound to a key
.SH SYNOPSIS
+.HP
.B XkbAction * XkbResizeKeyActions
-(
-.I xkb,
-.I key,
-.I needed
-)
-.br
- XkbDescRec * \fIxkb\fP\^;
-.br
- int \fIkey\fP\^;
-.br
- int \fIneeded\fP\^;
+.BI "(\^XkbDescRec *" "xkb" "\^,"
+.BI "int " "key" "\^,"
+.BI "int " "needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbResizeKeySyms.man b/libX11/man/xkb/XkbResizeKeySyms.man
index bba36d919..ce08a5a73 100644
--- a/libX11/man/xkb/XkbResizeKeySyms.man
+++ b/libX11/man/xkb/XkbResizeKeySyms.man
@@ -31,18 +31,11 @@
.SH NAME
XkbResizeKeySyms \- Change the number of symbols bound to a key
.SH SYNOPSIS
+.HP
.B KeySym * XkbResizeKeySyms
-(
-.I xkb,
-.I key,
-.I needed
-)
-.br
- XkbDescRec * \fIxkb\fP\^;
-.br
- int \fIkey\fP\^;
-.br
- int \fIneeded\fP\^;
+.BI "(\^XkbDescRec *" "xkb" "\^,"
+.BI "int " "key" "\^,"
+.BI "int " "needed" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbResizeKeyType.man b/libX11/man/xkb/XkbResizeKeyType.man
index 5ce2a816c..64427b434 100644
--- a/libX11/man/xkb/XkbResizeKeyType.man
+++ b/libX11/man/xkb/XkbResizeKeyType.man
@@ -31,24 +31,13 @@
.SH NAME
XkbResizeKeyType \- Change the number of levels in a key type
.SH SYNOPSIS
+.HP
.B Status XkbResizeKeyType
-(
-.I xkb,
-.I type_ndx,
-.I map_count,
-.I want_preserve,
-.I new_num_lvls
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- int \fItype_ndx\fP\^;
-.br
- int \fImap_count\fP\^;
-.br
- Bool \fIwant_preserve\fP\^;
-.br
- int \fInew_num_lvls\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "int " "type_ndx" "\^,"
+.BI "int " "map_count" "\^,"
+.BI "Bool " "want_preserve" "\^,"
+.BI "int " "new_num_lvls" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSAActionSetCtrls.man b/libX11/man/xkb/XkbSAActionSetCtrls.man
index b94288f3c..b1f870460 100644
--- a/libX11/man/xkb/XkbSAActionSetCtrls.man
+++ b/libX11/man/xkb/XkbSAActionSetCtrls.man
@@ -32,21 +32,16 @@
XkbSAActionSetCtrls \- Sets the
.I ctrls0
through
-I. ctrls3
+.I ctrls3
fields of
.I act
from
.I ctrls
.SH SYNOPSIS
-.B void XkbSAActionSetCtrls macro
-(
-.I act,
-.I ctrls
-)
-.br
- XkbCtrlsAction \fIact\fP\^;
-.br
- unsigned int \fIctrls\fP\^;
+.HP
+.B void XkbSAActionSetCtrls
+.BI "(\^XkbCtrlsAction " "act" "\^,"
+.BI "unsigned int " "ctrls" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSAGroup.man b/libX11/man/xkb/XkbSAGroup.man
index a3608c9a3..bf05a6bfd 100644
--- a/libX11/man/xkb/XkbSAGroup.man
+++ b/libX11/man/xkb/XkbSAGroup.man
@@ -31,12 +31,9 @@
.SH NAME
XkbSAGroup \- Returns the group_XXX field of act converted to a signed int
.SH SYNOPSIS
-.B int XkbSAGroup macro
-(
-.I act
-)
-.br
- XkbAction \fIact\fP\^;
+.HP
+.B int XkbSAGroup
+.BI "(\^XkbAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSAPtrDfltValue.man b/libX11/man/xkb/XkbSAPtrDfltValue.man
index da0543c38..9c9e2641f 100644
--- a/libX11/man/xkb/XkbSAPtrDfltValue.man
+++ b/libX11/man/xkb/XkbSAPtrDfltValue.man
@@ -31,12 +31,9 @@
.SH NAME
XkbSAPtrDfltValue \- Returns the valueXXX field of act converted to a signed int
.SH SYNOPSIS
-.B int XkbSAPtrDfltValue macro
-(
-.I act
-)
-.br
- XkbAction \fIact\fP\^;
+.HP
+.B int XkbSAPtrDfltValue
+.BI "(\^XkbAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSARedirectSetVMods.man b/libX11/man/xkb/XkbSARedirectSetVMods.man
index f1d964835..23b948eee 100644
--- a/libX11/man/xkb/XkbSARedirectSetVMods.man
+++ b/libX11/man/xkb/XkbSARedirectSetVMods.man
@@ -30,15 +30,10 @@
.SH NAME
XkbSARedirectSetVMods \- Sets the vmods0 and vmods1 of act from v
.SH SYNOPSIS
-.B void XkbSARedirectSetVMods macro
-(
-.I act,
-.I v
-)
-.br
- XkbRedirectKeyAction \fIact\fP\^;
-.br
- unsigned int \fIv\fP\^;
+.HP
+.B void XkbSARedirectSetVMods
+.BI "(\^XkbRedirectKeyAction " "act" "\^,"
+.BI "unsigned int " "v" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSARedirectSetVModsMask.man b/libX11/man/xkb/XkbSARedirectSetVModsMask.man
index 6675066b8..18e4085bc 100644
--- a/libX11/man/xkb/XkbSARedirectSetVModsMask.man
+++ b/libX11/man/xkb/XkbSARedirectSetVModsMask.man
@@ -32,15 +32,10 @@
XkbSARedirectSetVModsMask \- Sets the vmods_mask0 and vmods_mask1 fields of act
from vm
.SH SYNOPSIS
-.B void XkbSARedirectSetVModsMask macro
-(
-.I act,
-.I vm
-)
-.br
- XkbRedirectKeyAction \fIact\fP\^;
-.br
- unsigned int \fIvm\fP\^;
+.HP
+.B void XkbSARedirectSetVModsMask
+.BI "(\^XkbRedirectKeyAction " "act" "\^,"
+.BI "unsigned int " "vm" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSARedirectVMods.man b/libX11/man/xkb/XkbSARedirectVMods.man
index 202654c69..114fde674 100644
--- a/libX11/man/xkb/XkbSARedirectVMods.man
+++ b/libX11/man/xkb/XkbSARedirectVMods.man
@@ -31,12 +31,9 @@
XkbSARedirectVMods \- Returns the vmods0 and vmods1 fields of act converted to
an unsigned int
.SH SYNOPSIS
-.B unsigned int XkbSARedirectVMods macro
-(
-.I act
-)
-.br
- XkbRedirectKeyAction \fIact\fP\^;
+.HP
+.B unsigned int XkbSARedirectVMods
+.BI "(\^XkbRedirectKeyAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSARedirectVModsMask.man b/libX11/man/xkb/XkbSARedirectVModsMask.man
index 6e78513df..cba3b98fc 100644
--- a/libX11/man/xkb/XkbSARedirectVModsMask.man
+++ b/libX11/man/xkb/XkbSARedirectVModsMask.man
@@ -31,12 +31,9 @@
XkbSARedirectVModsMask \- Returns the vmods_mask0 and vmods_mask1 fields of act
converted to an unsigned int
.SH SYNOPSIS
-.B unsigned int XkbSARedirectVModsMask macro
-(
-.I act
-)
-.br
- XkbRedirectKeyAction \fIact\fP\^;
+.HP
+.B unsigned int XkbSARedirectVModsMask
+.BI "(\^XkbRedirectKeyAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSAScreen.man b/libX11/man/xkb/XkbSAScreen.man
index 8f857d982..93ab5a29a 100644
--- a/libX11/man/xkb/XkbSAScreen.man
+++ b/libX11/man/xkb/XkbSAScreen.man
@@ -31,12 +31,9 @@
.SH NAME
XkbSAScreen \- Returns the screenXXX field of act converted to a signed int
.SH SYNOPSIS
+.HP
.B int XkbSAScreen
-(
-.I act
-)
-.br
- XkbSwitchScreenAction \fIact\fP\^;
+.BI "(\^XkbSwitchScreenAction " "act" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSASetGroup.man b/libX11/man/xkb/XkbSASetGroup.man
index 01e86d935..3b03fa554 100644
--- a/libX11/man/xkb/XkbSASetGroup.man
+++ b/libX11/man/xkb/XkbSASetGroup.man
@@ -27,19 +27,14 @@
.\" or other dealings in this Software without prior written authorization
.\" of the copyright holder.
.\"
-.TH XkbSASetGroup 3Xkb "Release 6.1" "X Version 11" "XKBLIB FUNCTION"
+.TH XkbSASetGroup __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
XkbSASetGroup \- Sets the group_XXX field of act from the group index grp
.SH SYNTAX
-.B void XkbSASetGroup macro
-(
-.I act,
-.I grp
-)
-.br
- XkbAction \fIact\fP\^;
-.br
- int \fIgrp\fP\^;
+.HP
+.B void XkbSASetGroup
+.BI "(\^XkbAction " "act" "\^,"
+.BI "int " "grp" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSASetPtrDfltValue.man b/libX11/man/xkb/XkbSASetPtrDfltValue.man
index 284e466da..41041d9aa 100644
--- a/libX11/man/xkb/XkbSASetPtrDfltValue.man
+++ b/libX11/man/xkb/XkbSASetPtrDfltValue.man
@@ -31,15 +31,10 @@
.SH NAME
XkbSASetPtrDfltValue \- Sets the valueXXX field of act from val
.SH SYNOPSIS
-.B void XkbSASetPtrDfltValue macro
-(
-.I act,
-.I val
-)
-.br
- XkbAction \fIact\fP\^;
-.br
- int \fIval\fP\^;
+.HP
+.B void XkbSASetPtrDfltValue
+.BI "(\^XkbAction " "act" "\^,"
+.BI "int " "val" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSASetScreen.man b/libX11/man/xkb/XkbSASetScreen.man
index 5a4dc22cc..63645daec 100644
--- a/libX11/man/xkb/XkbSASetScreen.man
+++ b/libX11/man/xkb/XkbSASetScreen.man
@@ -31,15 +31,10 @@
.SH NAME
XkbSASetScreen \- Sets the screenXXX field of act from s
.SH SYNOPSIS
-.B void XkbSASetScreen macro
-(
-.I act,
-.I s
-)
-.br
- XkbSwitchScreenAction \fIact\fP\^;
-.br
- int \fIs\fP\^;
+.HP
+.B void XkbSASetScreen
+.BI "(\^XkbSwitchScreenAction " "act" "\^,"
+.BI "int " "s" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSelectEventDetails.man b/libX11/man/xkb/XkbSelectEventDetails.man
index 85f8cf705..6d8d3ff75 100644
--- a/libX11/man/xkb/XkbSelectEventDetails.man
+++ b/libX11/man/xkb/XkbSelectEventDetails.man
@@ -32,24 +32,13 @@ XkbSelectEventDetails \- Selects or deselects for a specific Xkb event and
optionally places conditions on when events of that type are reported to your
client
.SH SYNOPSIS
+.HP
.B Bool XkbSelectEventDetails
-(
-.I display,
-.I device_spec,
-.I event_type,
-.I bits_to_change,
-.I values_for_bits
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIevent_type\fP\^;
-.br
- unsigned long int \fIbits_to_change\fP\^;
-.br
- unsigned long int \fIvalues_for_bits\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "event_type" "\^,"
+.BI "unsigned long int " "bits_to_change" "\^,"
+.BI "unsigned long int " "values_for_bits" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSelectEvents.man b/libX11/man/xkb/XkbSelectEvents.man
index cb302c7dd..80f4ffa92 100644
--- a/libX11/man/xkb/XkbSelectEvents.man
+++ b/libX11/man/xkb/XkbSelectEvents.man
@@ -32,21 +32,12 @@
XkbSelectEvents \- Selects and / or deselects for delivery of one or more Xkb
events and has them delivered under all conditions
.SH SYNOPSIS
+.HP
.B Bool XkbSelectEvents
-(
-.I display,
-.I device_spec,
-.I bits_to_change,
-.I values_for_bits
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned long int \fIbits_to_change\fP\^;
-.br
- unsigned long int \fIvalues_for_bits\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned long int " "bits_to_change" "\^,"
+.BI "unsigned long int " "values_for_bits" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetAccessXTimeout.man b/libX11/man/xkb/XkbSetAccessXTimeout.man
index fd7d6248d..4d07a0262 100644
--- a/libX11/man/xkb/XkbSetAccessXTimeout.man
+++ b/libX11/man/xkb/XkbSetAccessXTimeout.man
@@ -32,30 +32,15 @@
XkbSetAccessXTimeout \- Configures the AccessXTimeout options for a keyboard
device
.SH SYNOPSIS
+.HP
.B Bool XkbSetAccessXTimeout
-(
-.I display,
-.I device_spec,
-.I timeout,
-.I ctrls_mask,
-.I ctrls_values,
-.I opts_mask,
-.I opts_values
-)
-.br
- Display *\fI display \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned short \fI timeout \fP\^;
-.br
- unsigned int \fI ctrls_mask \fP\^;
-.br
- unsigned int \fI ctrls_values \fP\^;
-.br
- unsigned short \fI opts_mask \fP\^;
-.br
- unsigned short \fI opts_values \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned short " "timeout" "\^,"
+.BI "unsigned int " "ctrls_mask" "\^,"
+.BI "unsigned int " "ctrls_values" "\^,"
+.BI "unsigned short " "opts_mask" "\^,"
+.BI "unsigned short " "opts_values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetAutoRepeatRate.man b/libX11/man/xkb/XkbSetAutoRepeatRate.man
index 1334c0598..a033e7f4b 100644
--- a/libX11/man/xkb/XkbSetAutoRepeatRate.man
+++ b/libX11/man/xkb/XkbSetAutoRepeatRate.man
@@ -31,21 +31,12 @@
XkbSetAutoRepeatRate \- Sets the attributes of the RepeatKeys control for a
keyboard device
.SH SYNOPSIS
+.HP
.B Bool XkbSetAutoRepeatRate
-(
-.I display,
-.I device_spec,
-.I timeout,
-.I interval
-)
-.br
- Display *\fI display \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- unsigned int \fI timeout \fP\^;
-.br
- unsigned int \fI interval \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "timeout" "\^,"
+.BI "unsigned int " "interval" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetAutoResetControls.man b/libX11/man/xkb/XkbSetAutoResetControls.man
index 5c7765177..7f2ed5d0f 100644
--- a/libX11/man/xkb/XkbSetAutoResetControls.man
+++ b/libX11/man/xkb/XkbSetAutoResetControls.man
@@ -31,21 +31,12 @@
XkbSetAutoResetControls \- Changes the current values of the AutoReset control
attributes
.SH SYNOPSIS
+.HP
.B Bool XkbSetAutoResetControls
-(
-.I dpy,
-.I changes,
-.I auto_ctrls,
-.I auto_values
-)
-.br
- Display *\fI dpy \fP\^;
-.br
- unsigned int \fI changes \fP\^;
-.br
- unsigned int *\fI auto_ctrls \fP\^;
-.br
- unsigned int *\fI auto_values \fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "changes" "\^,"
+.BI "unsigned int *" "auto_ctrls" "\^,"
+.BI "unsigned int *" "auto_values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetBounceKeysDelay.man b/libX11/man/xkb/XkbSetBounceKeysDelay.man
index a4cfc2629..4f43a3fdc 100644
--- a/libX11/man/xkb/XkbSetBounceKeysDelay.man
+++ b/libX11/man/xkb/XkbSetBounceKeysDelay.man
@@ -31,18 +31,11 @@
.SH NAME
XkbSetBounceKeysDelay \- Sets the BounceKeys delay for a keyboard device
.SH SYNOPSIS
+.HP
.B Bool XkbSetBounceKeysDelay
-(
-.I display,
-.I device_spec,
-.I delay
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int *\fIdelay\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int *" "delay" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetCompatMap.man b/libX11/man/xkb/XkbSetCompatMap.man
index 96e374293..700ce55f6 100644
--- a/libX11/man/xkb/XkbSetCompatMap.man
+++ b/libX11/man/xkb/XkbSetCompatMap.man
@@ -31,21 +31,12 @@
.SH NAME
XkbSetCompatMap \- Modify the server's compatibility map
.SH SYNOPSIS
+.HP
.B Bool XkbSetCompatMap
-(
-.I display,
-.I which,
-.I xkb,
-.I update_actions
-)
-.br
- Display * \fIdisplay\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- Bool \fIupdate_actions\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "xkb" "\^,"
+.BI "Bool " "update_actions" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetControls.man b/libX11/man/xkb/XkbSetControls.man
index caf662b4d..2f3e4a5e4 100644
--- a/libX11/man/xkb/XkbSetControls.man
+++ b/libX11/man/xkb/XkbSetControls.man
@@ -32,18 +32,11 @@
XkbSetControls \- Copies changes to the X server based on a modified ctrls
structure in a local copy of the keyboard description
.SH SYNOPSIS
+.HP
.B Bool XkbSetControls
-(
-.I display,
-.I which,
-.I xkb
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned long \fIwhich\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned long " "which" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetDebuggingFlags.man b/libX11/man/xkb/XkbSetDebuggingFlags.man
index c877d3208..abf1db9ec 100644
--- a/libX11/man/xkb/XkbSetDebuggingFlags.man
+++ b/libX11/man/xkb/XkbSetDebuggingFlags.man
@@ -31,33 +31,16 @@
.SH NAME
XkbSetDebuggingFlags \- Change the values of any of the debug controls
.SH SYNOPSIS
+.HP
.B Bool XkbSetDebuggingFlags
-(
-.I display,
-.I mask,
-.I flags,
-.I msg,
-.I ctrls_mask,
-.I ctrls,
-.I ret_flags,
-.I ret_ctrls
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fImask\fP\^;
-.br
- unsigned int \fIflags\fP\^;
-.br
- char *\fImsg\fP\^;
-.br
- unsigned int \fIctrls_mask\fP\^;
-.br
- unsigned int \fIctrls\fP\^;
-.br
- unsigned int *\fIret_flags\fP\^;
-.br
- unsigned int *\fIret_ctrls\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "mask" "\^,"
+.BI "unsigned int " "flags" "\^,"
+.BI "char *" "msg" "\^,"
+.BI "unsigned int " "ctrls_mask" "\^,"
+.BI "unsigned int " "ctrls" "\^,"
+.BI "unsigned int *" "ret_flags" "\^,"
+.BI "unsigned int *" "ret_ctrls" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetDetectableAutorepeat.man b/libX11/man/xkb/XkbSetDetectableAutorepeat.man
index 9ba780bd9..566cd3917 100644
--- a/libX11/man/xkb/XkbSetDetectableAutorepeat.man
+++ b/libX11/man/xkb/XkbSetDetectableAutorepeat.man
@@ -30,18 +30,11 @@
.SH NAME
XkbSetDetectableAutorepeat \- Sets DetectableAutorepeat
.SH SYNTAX
+.HP
.B Bool XkbSetDetectableAutorepeat
-(
-.I display,
-.I detectable,
-.I supported_rtrn
-)
-.br
- Display *\fI display \fP\^;
-.br
- Bool \fI detectable \fP\^;
-.br
- Bool *\fI supported_rtrn \fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "Bool " "detectable" "\^,"
+.BI "Bool *" "supported_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetDeviceButtonActions.man b/libX11/man/xkb/XkbSetDeviceButtonActions.man
index ebfc5230f..83e4b4f14 100644
--- a/libX11/man/xkb/XkbSetDeviceButtonActions.man
+++ b/libX11/man/xkb/XkbSetDeviceButtonActions.man
@@ -27,28 +27,16 @@
.\" or other dealings in this Software without prior written authorization
.\" of the copyright holder.
.\"
-.TH XkbSetDeviceButtonActions 3Xkb "Release 6.1" "X Version 11" "XKBLIB FUNCTION"
+.TH XkbSetDeviceButtonActions __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
XkbSetDeviceButtonActions \- Change only the button actions for an input extension device
.SH SYNTAX
+.HP
.B Bool XkbSetDeviceButtonActions
-(
-.I dpy,
-.I device,
-.I first_button,
-.I num_buttons,
-.I actions
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- XkbDeviceInfoPtr \fIdevice\fP\^;
-.br
- unsigned int \fIfirst_button\fP\^;
-.br
- unsigned int \fInum_buttons\fP\^;
-.br
- *** MISSING *** \fIactions\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "XkbDeviceInfoPtr " "device" "\^,"
+.BI "unsigned int " "first_button" "\^,"
+.BI "unsigned int " "num_buttons" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -64,9 +52,6 @@ number of first button to update, 0 relative
.TP
.I \- num_buttons
number of buttons to update
-.TP
-.I \- actions
-*** MISSING ***
.SH DESCRIPTION
.LP
.I XkbSetDeviceButtonActions
diff --git a/libX11/man/xkb/XkbSetDeviceInfo.man b/libX11/man/xkb/XkbSetDeviceInfo.man
index 593defcc1..53e4fc803 100644
--- a/libX11/man/xkb/XkbSetDeviceInfo.man
+++ b/libX11/man/xkb/XkbSetDeviceInfo.man
@@ -32,18 +32,11 @@
XkbSetDeviceInfo \- Modify some or all of the characteristics of an X Input
Extension device
.SH SYNOPSIS
+.HP
.B Bool XkbSetDeviceInfo
-(
-.I dpy,
-.I which,
-.I device_info
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDeviceInfoPtr \fIdevice_info\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDeviceInfoPtr " "device_info" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetIgnoreLockMods.man b/libX11/man/xkb/XkbSetIgnoreLockMods.man
index 19684cf79..9ed3b0b6c 100644
--- a/libX11/man/xkb/XkbSetIgnoreLockMods.man
+++ b/libX11/man/xkb/XkbSetIgnoreLockMods.man
@@ -32,27 +32,14 @@
XkbSetIgnoreLockMods \- Sets the modifiers that, if locked, are not to be
reported in matching events to passive grabs
.SH SYNOPSIS
+.HP
.B Bool XkbSetIgnoreLockMods
-(
-.I display,
-.I device_spec,
-.I affect_real,
-.I real_values,
-.I affect_virtual,
-.I virtual_values
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIaffect_real\fP\^;
-.br
- unsigned int \fIreal_values\fP\^;
-.br
- unsigned int \fIaffect_virtual\fP\^;
-.br
- unsigned int \fIvirtual_values\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "affect_real" "\^,"
+.BI "unsigned int " "real_values" "\^,"
+.BI "unsigned int " "affect_virtual" "\^,"
+.BI "unsigned int " "virtual_values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetIndicatorMap.man b/libX11/man/xkb/XkbSetIndicatorMap.man
index d419cc7b6..bd4686a4e 100644
--- a/libX11/man/xkb/XkbSetIndicatorMap.man
+++ b/libX11/man/xkb/XkbSetIndicatorMap.man
@@ -33,18 +33,11 @@ XkbSetIndicatorMap \- Downloads the changes to the server based on modifications
to a local copy of the keyboard description which will update the maps for one
or more indicators
.SH SYNOPSIS
+.HP
.B Bool XkbSetIndicatorMap
-(
-.I dpy,
-.I which,
-.I desc
-)
-.br
- Display *\fI dpy \fP\^;
-.br
- unsigned int \fI which \fP\^;
-.br
- XkbDescPtr \fI desc \fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "desc" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetMap.man b/libX11/man/xkb/XkbSetMap.man
index f822cbf7b..036fbd537 100644
--- a/libX11/man/xkb/XkbSetMap.man
+++ b/libX11/man/xkb/XkbSetMap.man
@@ -32,18 +32,11 @@
XkbSetMap \- Send a complete new set of values for entire components to the
server.
.SH SYNOPSIS
+.HP
.B Bool XkbSetMap
-(
-.I dpy,
-.I which,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetModActionVMods.man b/libX11/man/xkb/XkbSetModActionVMods.man
index 3805be602..150361f2c 100644
--- a/libX11/man/xkb/XkbSetModActionVMods.man
+++ b/libX11/man/xkb/XkbSetModActionVMods.man
@@ -32,15 +32,10 @@
XkbSetModActionVMods \- Sets the vmods1 and vmods2 fields of act using the vmods
format of an Xkb modifier description
.SH SYNOPSIS
-.B void XkbSetModActionVMods macro
-(
-.I act,
-.I vmods
-)
-.br
- XkbAction \fIact\fP\^;
-.br
- unsigned short \fIvmods\fP\^;
+.HP
+.B void XkbSetModActionVMods
+.BI "(\^XkbAction " "act" "\^,"
+.BI "unsigned short " "vmods" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetNamedIndicator.man b/libX11/man/xkb/XkbSetNamedIndicator.man
index d21cb1643..04ff572f6 100644
--- a/libX11/man/xkb/XkbSetNamedIndicator.man
+++ b/libX11/man/xkb/XkbSetNamedIndicator.man
@@ -32,30 +32,15 @@ XkbSetNamedIndicator \- Names an indicator if it is not already named; toggles
the state of the indicator; sets the indicator to a specified state and sets the
indicator map for the indicator
.SH SYNOPSIS
+.HP
.B Bool XkbSetNamedIndicator
-(
-.I dpy,
-.I device_spec,
-.I name,
-.I change_state,
-.I state,
-.I create_new,
-.I map
-)
-.br
- Display *\fI dpy \fP\^;
-.br
- unsigned int \fI device_spec \fP\^;
-.br
- Atom \fI name \fP\^;
-.br
- Bool \fI change_state \fP\^;
-.br
- Bool \fI state \fP\^;
-.br
- Bool \fI create_new \fP\^;
-.br
- XkbIndicatorMapPtr \fI map \fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "Atom " "name" "\^,"
+.BI "Bool " "change_state" "\^,"
+.BI "Bool " "state" "\^,"
+.BI "Bool " "create_new" "\^,"
+.BI "XkbIndicatorMapPtr " "map" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetNames.man b/libX11/man/xkb/XkbSetNames.man
index 2a072d8c7..66d34a72a 100644
--- a/libX11/man/xkb/XkbSetNames.man
+++ b/libX11/man/xkb/XkbSetNames.man
@@ -31,24 +31,13 @@
.SH NAME
XkbSetNames \- Change the symbolic names in the server
.SH SYNOPSIS
+.HP
.B Bool XkbSetNames
-(
-.I dpy,
-.I which,
-.I first_type,
-.I num_types ,
-.I xkb
-)
-.br
- Display * \fIdpy\fP\^;
-.br
- unsigned int \fIwhich\fP\^;
-.br
- unsigned int \fIfirst_type\fP\^;
-.br
- unsigned int \fInum_types\fP\^;
-.br
- XkbDescPtr \fIxkb\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "unsigned int " "which" "\^,"
+.BI "unsigned int " "first_type" "\^,"
+.BI "unsigned int " "num_types" "\^,"
+.BI "XkbDescPtr " "xkb" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetPtrActionX.man b/libX11/man/xkb/XkbSetPtrActionX.man
index 51b34a1e4..666001d34 100644
--- a/libX11/man/xkb/XkbSetPtrActionX.man
+++ b/libX11/man/xkb/XkbSetPtrActionX.man
@@ -32,15 +32,10 @@
XkbSetPtrActionX \- Sets the high_XXX and low_XXX fields of act from the signed
integer value x
.SH SYNOPSIS
-.B void XkbSetPtrActionX macro
-(
-.I act,
-.I x
-)
-.br
- XkbPtrAction \fIact\fP\^;
-.br
- int \fIx\fP\^;
+.HP
+.B void XkbSetPtrActionX
+.BI "(\^XkbPtrAction " "act" "\^,"
+.BI "int " "x" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetPtrActionY.man b/libX11/man/xkb/XkbSetPtrActionY.man
index ba3d30d60..3bab0fad8 100644
--- a/libX11/man/xkb/XkbSetPtrActionY.man
+++ b/libX11/man/xkb/XkbSetPtrActionY.man
@@ -32,15 +32,10 @@
XkbSetPtrActionY \- Sets the high_YYY and low_YYY fields of act from the signed
integer value y
.SH SYNOPSIS
-.B void XkbSetPtrActionY macro
-(
-.I act,
-.I y
-)
-.br
- XkbPtrAction \fIact\fP\^;
-.br
- int \fIy\fP\^;
+.HP
+.B void XkbSetPtrActionY
+.BI "(\^XkbPtrAction " "act" "\^,"
+.BI "int " "y" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetServerInternalMods.man b/libX11/man/xkb/XkbSetServerInternalMods.man
index 949e435f4..46c80013e 100644
--- a/libX11/man/xkb/XkbSetServerInternalMods.man
+++ b/libX11/man/xkb/XkbSetServerInternalMods.man
@@ -32,27 +32,14 @@
XkbSetServerInternalMods \- Sets the modifiers that are consumed by the server
before events are delivered to the client
.SH SYNOPSIS
+.HP
.B Bool XkbSetServerInternalMods
-(
-.I display,
-.I device_spec,
-.I affect_real,
-.I real_values,
-.I affect_virtual,
-.I virtual_values
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned int \fIdevice_spec\fP\^;
-.br
- unsigned int \fIaffect_real\fP\^;
-.br
- unsigned int \fIreal_values\fP\^;
-.br
- unsigned int \fIaffect_virtual\fP\^;
-.br
- unsigned int \fIvirtual_values\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned int " "device_spec" "\^,"
+.BI "unsigned int " "affect_real" "\^,"
+.BI "unsigned int " "real_values" "\^,"
+.BI "unsigned int " "affect_virtual" "\^,"
+.BI "unsigned int " "virtual_values" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbSetXlibControls.man b/libX11/man/xkb/XkbSetXlibControls.man
index 35cd43a9b..77ac22175 100644
--- a/libX11/man/xkb/XkbSetXlibControls.man
+++ b/libX11/man/xkb/XkbSetXlibControls.man
@@ -31,18 +31,11 @@
.SH NAME
XkbSetXlibControls \- Changes the state of the Library Controls
.SH SYNOPSIS
+.HP
.B unsigned int XkbSetXlibControls
-(
-.I display,
-.I bits_to_change,
-.I values_for_bits
-)
-.br
- Display *\fIdisplay\fP\^;
-.br
- unsigned long \fIbits_to_change\fP\^;
-.br
- unsigned long \fIvalues_for_bits\fP\^;
+.BI "(\^Display *" "display" "\^,"
+.BI "unsigned long " "bits_to_change" "\^,"
+.BI "unsigned long " "values_for_bits" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbTranslateKeyCode.man b/libX11/man/xkb/XkbTranslateKeyCode.man
index 4e4455be0..36ec0c7f0 100644
--- a/libX11/man/xkb/XkbTranslateKeyCode.man
+++ b/libX11/man/xkb/XkbTranslateKeyCode.man
@@ -30,24 +30,13 @@
.SH NAME
XkbTranslateKeyCode \- Translate a keycode to a key symbol and modifiers
.SH SYNOPSIS
+.HP
.B Bool XkbTranslateKeyCode
-(
-.I xkb,
-.I key,
-.I mods,
-.I mods_rtrn,
-.I keysym_rtrn
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIkey\fP\^;
-.br
- unsigned int \fImods\fP\^;
-.br
- unsigned int * \fImods_rtrn\fP\^;
-.br
- KeySym * \fIkeysym_rtrn\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "key" "\^,"
+.BI "unsigned int " "mods" "\^,"
+.BI "unsigned int *" "mods_rtrn" "\^,"
+.BI "KeySym *" "keysym_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
@@ -86,4 +75,4 @@ to consume the Shift and Lock modifiers when processing all keys, even if the
definition for the key type does not specify these modifiers. The
AlwaysConsumeShiftAndLock control is unset by default.
.SH "SEE ALSO"
-.BR XLookupString (3X11)
+.BR XLookupString (__libmansuffix__)
diff --git a/libX11/man/xkb/XkbTranslateKeySym.man b/libX11/man/xkb/XkbTranslateKeySym.man
index 526a012ea..e6f10b9a7 100644
--- a/libX11/man/xkb/XkbTranslateKeySym.man
+++ b/libX11/man/xkb/XkbTranslateKeySym.man
@@ -31,27 +31,14 @@
XkbTranslateKeySym \- Find the string and symbol associated with a keysym for a
given keyboard state
.SH SYNOPSIS
+.HP
.B int XkbTranslateKeySym
-(
-.I dpy ,
-.I sym_inout ,
-.I mods ,
-.I buf ,
-.I nbytes ,
-.I extra_rtrn
-)
-.br
- Display *\fIdpy\fP\^;
-.br
- KeySym *\fIsym_inout\fP\^;
-.br
- unsigned int \fImods\fP\^;
-.br
- char *\fIbuf\fP\^;
-.br
- int \fInbytes\fP\^;
-.br
- int *\fIextra_rtrn\fP\^;
+.BI "(\^Display *" "dpy" "\^,"
+.BI "KeySym *" "sym_inout" "\^,"
+.BI "unsigned int " "mods" "\^,"
+.BI "char *" "buf" "\^,"
+.BI "int " "nbytes" "\^,"
+.BI "int *" "extra_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbUpdateMapFromCore.man b/libX11/man/xkb/XkbUpdateMapFromCore.man
index 6f04d8c46..b53536837 100644
--- a/libX11/man/xkb/XkbUpdateMapFromCore.man
+++ b/libX11/man/xkb/XkbUpdateMapFromCore.man
@@ -32,27 +32,14 @@
XkbUpdateMapFromCore \- Update a local Xkb keyboard map to reflect the mapping
expressed by a core format mapping
.SH SYNOPSIS
+.HP
.B Bool XkbUpdateMapFromCore
-(
-.I xkb,
-.I first_key,
-.I num_keys,
-.I map_width,
-.I core_keysyms,
-.I changes
-)
-.br
- XkbDescPtr \fIxkb\fP\^;
-.br
- KeyCode \fIfirst_key\fP\^;
-.br
- int \fInum_keys\fP\^;
-.br
- int \fImap_width\fP\^;
-.br
- KeySym * \fIcore_keysyms\fP\^;
-.br
- XkbChangesPtr \fIchanges\fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "KeyCode " "first_key" "\^,"
+.BI "int " "num_keys" "\^,"
+.BI "int " "map_width" "\^,"
+.BI "KeySym *" "core_keysyms" "\^,"
+.BI "XkbChangesPtr " "changes" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS
diff --git a/libX11/man/xkb/XkbVirtualModsToReal.man b/libX11/man/xkb/XkbVirtualModsToReal.man
index 17785e365..1fe7e91cb 100644
--- a/libX11/man/xkb/XkbVirtualModsToReal.man
+++ b/libX11/man/xkb/XkbVirtualModsToReal.man
@@ -31,18 +31,11 @@
XkbVirtualModsToReal \- Determines the mapping of virtual modifiers to core X
protocol modifiers
.SH SYNOPSIS
+.HP
.B Bool XkbVirtualModsToReal
-(
-.I xkb,
-.I virtual_mask,
-.I mask_rtrn
-)
-.br
- XkbDescPtr \fI xkb \fP\^;
-.br
- unsigned int \fI virtual_mask \fP\^;
-.br
- unsigned int *\fI mask_rtrn \fP\^;
+.BI "(\^XkbDescPtr " "xkb" "\^,"
+.BI "unsigned int " "virtual_mask" "\^,"
+.BI "unsigned int *" "mask_rtrn" "\^);"
.if n .ti +5n
.if t .ti +.5i
.SH ARGUMENTS