libx11: Changes to 'upstream-experimental'
configure.ac | 43 -
cpprules.in | 10
man/AllPlanes.man | 8
man/BlackPixelOfScreen.man | 6
man/DisplayOfCCC.man | 10
man/ImageByteOrder.man | 8
man/IsCursorKey.man | 6
man/Makefile.am | 999 +++++++++++++++++--------------
man/XAddHost.man | 2
man/XAllocClassHint.man | 28
man/XAllocColor.man | 6
man/XAllocIconSize.man | 28
man/XAllocSizeHints.man | 28
man/XAllocStandardColormap.man | 8
man/XAllocWMHints.man | 28
man/XAnyEvent.man | 50 -
man/XButtonEvent.man | 50 -
man/XChangeKeyboardControl.man | 4
man/XChangeKeyboardMapping.man | 4
man/XChangeSaveSet.man | 2
man/XChangeWindowAttributes.man | 14
man/XCirculateEvent.man | 50 -
man/XCirculateRequestEvent.man | 50 -
man/XClearArea.man | 2
man/XClientMessageEvent.man | 52 -
man/XColormapEvent.man | 52 -
man/XConfigureEvent.man | 50 -
man/XConfigureRequestEvent.man | 50 -
man/XConfigureWindow.man | 12
man/XCopyArea.man | 2
man/XCreateColormap.man | 10
man/XCreateFontCursor.man | 6
man/XCreateFontSet.man | 6
man/XCreateGC.man | 32
man/XCreateIC.man | 8
man/XCreateOC.man | 4
man/XCreatePixmap.man | 2
man/XCreateRegion.man | 4
man/XCreateWindow.man | 14
man/XCreateWindowEvent.man | 50 -
man/XCrossingEvent.man | 50 -
man/XDefineCursor.man | 4
man/XDestroyWindow.man | 12
man/XDestroyWindowEvent.man | 50 -
man/XDrawArc.man | 6
man/XDrawImageString.man | 8
man/XDrawLine.man | 6
man/XDrawPoint.man | 6
man/XDrawRectangle.man | 6
man/XDrawString.man | 6
man/XDrawText.man | 6
man/XEmptyRegion.man | 4
man/XErrorEvent.man | 52 -
man/XExposeEvent.man | 50 -
man/XExtentsOfFontSet.man | 6
man/XFillRectangle.man | 6
man/XFilterEvent.man | 2
man/XFlush.man | 8
man/XFocusChangeEvent.man | 50 -
man/XFontSetExtents.man | 6
man/XFontsOfFontSet.man | 10
man/XGetEventData.man | 2
man/XGetVisualInfo.man | 2
man/XGetWindowAttributes.man | 4
man/XGetWindowProperty.man | 4
man/XGetXCBConnection.man | 4
man/XGrabButton.man | 8
man/XGrabKey.man | 8
man/XGrabKeyboard.man | 8
man/XGrabPointer.man | 8
man/XGrabServer.man | 8
man/XGraphicsExposeEvent.man | 52 -
man/XGravityEvent.man | 50 -
man/XIconifyWindow.man | 14
man/XIfEvent.man | 8
man/XInitImage.man | 2
man/XInstallColormap.man | 8
man/XInternAtom.man | 4
man/XIntersectRegion.man | 6
man/XKeymapEvent.man | 50 -
man/XListFonts.man | 4
man/XLoadFont.man | 6
man/XLookupKeysym.man | 6
man/XMapEvent.man | 50 -
man/XMapRequestEvent.man | 50 -
man/XMapWindow.man | 12
man/XNextEvent.man | 8
man/XOpenDisplay.man | 6
man/XOpenIM.man | 8
man/XOpenOM.man | 4
man/XParseGeometry.man | 2
man/XPolygonRegion.man | 6
man/XPropertyEvent.man | 52 -
man/XPutBackEvent.man | 8
man/XQueryBestSize.man | 16
man/XQueryColor.man | 6
man/XQueryPointer.man | 4
man/XQueryTree.man | 15
man/XRaiseWindow.man | 12
man/XReadBitmapFile.man | 4
man/XRecolorCursor.man | 6
man/XReparentEvent.man | 50 -
man/XReparentWindow.man | 2
man/XResizeRequestEvent.man | 50 -
man/XSelectionClearEvent.man | 52 -
man/XSelectionEvent.man | 50 -
man/XSelectionRequestEvent.man | 52 -
man/XSendEvent.man | 8
man/XSetArcMode.man | 18
man/XSetClipOrigin.man | 18
man/XSetCommand.man | 26
man/XSetErrorHandler.man | 4
man/XSetEventQueueOwner.man | 4
man/XSetFillStyle.man | 16
man/XSetFont.man | 16
man/XSetFontPath.man | 4
man/XSetICFocus.man | 8
man/XSetICValues.man | 8
man/XSetInputFocus.man | 2
man/XSetLineAttributes.man | 16
man/XSetPointerMapping.man | 4
man/XSetState.man | 16
man/XSetTextProperty.man | 26
man/XSetTile.man | 16
man/XSetTransientForHint.man | 26
man/XSetWMClientMachine.man | 26
man/XSetWMColormapWindows.man | 28
man/XSetWMIconName.man | 28
man/XSetWMName.man | 28
man/XSetWMProperties.man | 30
man/XSetWMProtocols.man | 28
man/XStoreBytes.man | 2
man/XStoreColors.man | 6
man/XStringListToTextProperty.man | 28
man/XStringToKeysym.man | 2
man/XSynchronize.man | 2
man/XTextExtents.man | 4
man/XTextWidth.man | 4
man/XUnmapEvent.man | 50 -
man/XUnmapWindow.man | 12
man/XVisibilityEvent.man | 50 -
man/XWarpPointer.man | 2
man/XcmsAllocColor.man | 4
man/XcmsCCCOfColormap.man | 10
man/XcmsCIELabQueryMaxC.man | 6
man/XcmsCIELuvQueryMaxC.man | 6
man/XcmsColor.man | 6
man/XcmsConvertColors.man | 10
man/XcmsCreateCCC.man | 10
man/XcmsDefaultCCC.man | 10
man/XcmsQueryBlack.man | 6
man/XcmsQueryColor.man | 6
man/XcmsSetWhitePoint.man | 10
man/XcmsStoreColor.man | 4
man/XcmsTekHVCQueryMaxC.man | 6
man/XmbDrawImageString.man | 10
man/XmbDrawString.man | 10
man/XmbDrawText.man | 10
man/XmbLookupString.man | 2
man/XmbResetIC.man | 8
man/XmbTextEscapement.man | 4
man/XmbTextExtents.man | 4
man/XmbTextListToTextProperty.man | 4
man/XmbTextPerCharExtents.man | 4
man/XrmEnumerateDatabase.man | 6
man/XrmGetFileDatabase.man | 6
man/XrmGetResource.man | 8
man/XrmInitialize.man | 8
man/XrmMergeDatabases.man | 6
man/XrmPutResource.man | 8
man/XrmUniqueQuark.man | 8
man/xkb/Makefile.am | 2
man/xkb/XkbActionCtrls.man | 9
man/xkb/XkbAddDeviceLedInfo.man | 15
man/xkb/XkbAddGeomColor.man | 15
man/xkb/XkbAddGeomDoodad.man | 15
man/xkb/XkbAddGeomKey.man | 7
man/xkb/XkbAddGeomKeyAlias.man | 15
man/xkb/XkbAddGeomOutline.man | 11
man/xkb/XkbAddGeomOverlay.man | 15
man/xkb/XkbAddGeomOverlayKey.man | 15
man/xkb/XkbAddGeomOverlayRow.man | 15
man/xkb/XkbAddGeomProperty.man | 15
man/xkb/XkbAddGeomRow.man | 11
man/xkb/XkbAddGeomSection.man | 23
man/xkb/XkbAddGeomShape.man | 15
man/xkb/XkbAddSymInterpret.man | 19
man/xkb/XkbAllocClientMap.man | 15
man/xkb/XkbAllocCompatMap.man | 15
man/xkb/XkbAllocControls.man | 11
man/xkb/XkbAllocDeviceInfo.man | 15
man/xkb/XkbAllocDeviceLedInfo.man | 11
man/xkb/XkbAllocGeomColors.man | 11
man/xkb/XkbAllocGeomDoodads.man | 11
man/xkb/XkbAllocGeomKeyAliases.man | 11
man/xkb/XkbAllocGeomKeys.man | 11
man/xkb/XkbAllocGeomOutlines.man | 11
man/xkb/XkbAllocGeomOverlayKey.man | 11
man/xkb/XkbAllocGeomOverlayRows.man | 13
man/xkb/XkbAllocGeomOverlays.man | 11
man/xkb/XkbAllocGeomPoints.man | 11
man/xkb/XkbAllocGeomProps.man | 11
man/xkb/XkbAllocGeomRows.man | 11
man/xkb/XkbAllocGeomSectionDoodads.man | 14
man/xkb/XkbAllocGeomSections.man | 11
man/xkb/XkbAllocGeomShapes.man | 11
man/xkb/XkbAllocGeometry.man | 11
man/xkb/XkbAllocIndicatorMaps.man | 7
man/xkb/XkbAllocKeyboard.man | 5
man/xkb/XkbAllocNames.man | 19
man/xkb/XkbAllocServerMap.man | 15
man/xkb/XkbApplyCompatMapToKey.man | 15
man/xkb/XkbBell.man | 21
man/xkb/XkbBellEvent.man | 19
man/xkb/XkbChangeControls.man | 15
man/xkb/XkbChangeDeviceInfo.man | 15
man/xkb/XkbChangeEnabledControls.man | 19
man/xkb/XkbChangeIndicators.man | 19
man/xkb/XkbChangeMap.man | 15
man/xkb/XkbChangeNames.man | 15
man/xkb/XkbChangeTypesOfKey.man | 27
man/xkb/XkbComputeRowBounds.man | 15
man/xkb/XkbComputeSectionBounds.man | 11
man/xkb/XkbComputeShapeBounds.man | 7
man/xkb/XkbComputeShapeTop.man | 11
man/xkb/XkbCopyKeyType.man | 11
man/xkb/XkbCopyKeyTypes.man | 15
man/xkb/XkbDeviceBell.man | 33 -
man/xkb/XkbDeviceBellEvent.man | 33 -
man/xkb/XkbFindOverlayForKey.man | 15
man/xkb/XkbForceBell.man | 13
man/xkb/XkbForceDeviceBell.man | 29
man/xkb/XkbFreeClientMap.man | 15
man/xkb/XkbFreeCompatMap.man | 15
man/xkb/XkbFreeComponentList.man | 7
man/xkb/XkbFreeControls.man | 15
man/xkb/XkbFreeDeviceInfo.man | 15
man/xkb/XkbFreeGeomColors.man | 19
man/xkb/XkbFreeGeomDoodads.man | 15
man/xkb/XkbFreeGeomKeyAliases.man | 19
man/xkb/XkbFreeGeomKeys.man | 19
man/xkb/XkbFreeGeomOutlines.man | 19
man/xkb/XkbFreeGeomOverlayKeys.man | 19
man/xkb/XkbFreeGeomOverlayRows.man | 19
man/xkb/XkbFreeGeomOverlays.man | 19
man/xkb/XkbFreeGeomPoints.man | 19
man/xkb/XkbFreeGeomProperties.man | 19
man/xkb/XkbFreeGeomRows.man | 19
man/xkb/XkbFreeGeomSections.man | 19
man/xkb/XkbFreeGeomShapes.man | 19
man/xkb/XkbFreeGeometry.man | 15
man/xkb/XkbFreeIndicatorMaps.man | 7
man/xkb/XkbFreeKeyboard.man | 15
man/xkb/XkbFreeNames.man | 15
man/xkb/XkbFreeServerMap.man | 15
man/xkb/XkbGetAccessXTimeout.man | 31
man/xkb/XkbGetAutoRepeatRate.man | 19
man/xkb/XkbGetAutoResetControls.man | 15
man/xkb/XkbGetBounceKeysDelay.man | 15
man/xkb/XkbGetCompatMap.man | 15
man/xkb/XkbGetControls.man | 15
man/xkb/XkbGetControlsChanges.man | 15
man/xkb/XkbGetDetectableAutorepeat.man | 11
man/xkb/XkbGetDeviceButtonActions.man | 23
man/xkb/XkbGetDeviceInfo.man | 25
man/xkb/XkbGetDeviceInfoChanges.man | 15
man/xkb/XkbGetDeviceLedInfo.man | 23
man/xkb/XkbGetGeometry.man | 11
man/xkb/XkbGetIndicatorChanges.man | 19
man/xkb/XkbGetIndicatorMap.man | 15
man/xkb/XkbGetIndicatorState.man | 15
man/xkb/XkbGetKeyActions.man | 19
man/xkb/XkbGetKeyBehaviors.man | 19
man/xkb/XkbGetKeyExplicitComponents.man | 22
man/xkb/XkbGetKeyModifierMap.man | 19
man/xkb/XkbGetKeySyms.man | 19
man/xkb/XkbGetKeyTypes.man | 19
man/xkb/XkbGetKeyVirtualModMap.man | 19
man/xkb/XkbGetKeyboard.man | 15
man/xkb/XkbGetKeyboardByName.man | 27
man/xkb/XkbGetMap.man | 15
man/xkb/XkbGetNameChanges.man | 15
man/xkb/XkbGetNamedGeometry.man | 17
man/xkb/XkbGetNamedIndicator.man | 31
man/xkb/XkbGetNames.man | 15
man/xkb/XkbGetSlowKeysDelay.man | 15
man/xkb/XkbGetState.man | 15
man/xkb/XkbGetStickyKeysOptions.man | 15
man/xkb/XkbGetUpdatedMap.man | 15
man/xkb/XkbGetVirtualMods.man | 15
man/xkb/XkbGetXlibControls.man | 7
man/xkb/XkbIgnoreExtension.man | 9
man/xkb/XkbInitCanonicalKeyTypes.man | 15
man/xkb/XkbKeyAction.man | 15
man/xkb/XkbKeyActionEntry.man | 21
man/xkb/XkbKeyActionsPtr.man | 13
man/xkb/XkbKeyGroupInfo.man | 13
man/xkb/XkbKeyGroupWidth.man | 17
man/xkb/XkbKeyGroupsWidth.man | 13
man/xkb/XkbKeyHasActions.man | 13
man/xkb/XkbKeyNumActions.man | 13
man/xkb/XkbKeyNumGroups.man | 13
man/xkb/XkbKeyNumSyms.man | 13
man/xkb/XkbKeySymEntry.man | 21
man/xkb/XkbKeySymsOffset.man | 13
man/xkb/XkbKeySymsPtr.man | 13
man/xkb/XkbKeyType.man | 15
man/xkb/XkbKeyTypeIndex.man | 15
man/xkb/XkbKeyTypesForCoreSymbols.man | 27
man/xkb/XkbKeycodeToKeysym.man | 19
man/xkb/XkbKeysymToModifiers.man | 11
man/xkb/XkbLatchGroup.man | 15
man/xkb/XkbLatchModifiers.man | 19
man/xkb/XkbLibraryVersion.man | 11
man/xkb/XkbListComponents.man | 19
man/xkb/XkbLockGroup.man | 15
man/xkb/XkbLockModifiers.man | 19
man/xkb/XkbLookupKeyBinding.man | 31
man/xkb/XkbLookupKeySym.man | 25
man/xkb/XkbModActionVMods.man | 9
man/xkb/XkbNoteControlsChanges.man | 15
man/xkb/XkbNoteDeviceChanges.man | 15
man/xkb/XkbNoteIndicatorChanges.man | 15
man/xkb/XkbNoteNameChanges.man | 15
man/xkb/XkbOpenDisplay.man | 29
man/xkb/XkbOutOfRangeGroupInfo.man | 9
man/xkb/XkbOutOfRangeGroupNumber.man | 9
man/xkb/XkbPtrActionX.man | 9
man/xkb/XkbPtrActionY.man | 9
man/xkb/XkbQueryExtension.man | 27
man/xkb/XkbRefreshKeyboardMapping.man | 9
man/xkb/XkbResizeDeviceButtonActions.man | 11
man/xkb/XkbResizeKeyActions.man | 15
man/xkb/XkbResizeKeySyms.man | 15
man/xkb/XkbResizeKeyType.man | 23
man/xkb/XkbSAActionSetCtrls.man | 15
man/xkb/XkbSAGroup.man | 9
man/xkb/XkbSAPtrDfltValue.man | 9
man/xkb/XkbSARedirectSetVMods.man | 13
man/xkb/XkbSARedirectSetVModsMask.man | 13
man/xkb/XkbSARedirectVMods.man | 9
man/xkb/XkbSARedirectVModsMask.man | 9
man/xkb/XkbSAScreen.man | 7
man/xkb/XkbSASetGroup.man | 15
man/xkb/XkbSASetPtrDfltValue.man | 13
man/xkb/XkbSASetScreen.man | 13
man/xkb/XkbSelectEventDetails.man | 23
man/xkb/XkbSelectEvents.man | 19
man/xkb/XkbSetAccessXTimeout.man | 31
man/xkb/XkbSetAutoRepeatRate.man | 19
man/xkb/XkbSetAutoResetControls.man | 19
man/xkb/XkbSetBounceKeysDelay.man | 15
man/xkb/XkbSetCompatMap.man | 19
man/xkb/XkbSetControls.man | 15
man/xkb/XkbSetDebuggingFlags.man | 35 -
man/xkb/XkbSetDetectableAutorepeat.man | 15
man/xkb/XkbSetDeviceButtonActions.man | 27
man/xkb/XkbSetDeviceInfo.man | 15
man/xkb/XkbSetIgnoreLockMods.man | 27
man/xkb/XkbSetIndicatorMap.man | 15
man/xkb/XkbSetMap.man | 15
man/xkb/XkbSetModActionVMods.man | 13
man/xkb/XkbSetNamedIndicator.man | 31
man/xkb/XkbSetNames.man | 23
man/xkb/XkbSetPtrActionX.man | 13
man/xkb/XkbSetPtrActionY.man | 13
man/xkb/XkbSetServerInternalMods.man | 27
man/xkb/XkbSetXlibControls.man | 15
man/xkb/XkbTranslateKeyCode.man | 25
man/xkb/XkbTranslateKeySym.man | 27
man/xkb/XkbUpdateMapFromCore.man | 27
man/xkb/XkbVirtualModsToReal.man | 15
nls/Makefile.am | 6
nls/compose-check.pl | 163 +++++
nls/el_GR.UTF-8/Compose.pre | 8
nls/en_US.UTF-8/Compose.pre | 205 ++++++
nls/iso8859-2/Compose.pre | 4
nls/localerules.in | 5
nls/pt_BR.UTF-8/Compose.pre | 64 -
src/ConnDis.c | 2
src/CrGlCur.c | 2
src/XKeysymDB | 1
382 files changed, 3242 insertions(+), 4165 deletions(-)
New commits:
commit d54caf1c9c55af8247621b7ba6afb20b23699839
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 10:59:08 2009 +1000
libX11 1.3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index b8ccdce..655ea40 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.60)
AC_INIT([libX11],
- 1.2.99.901,
+ 1.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libX11)
AC_CONFIG_SRCDIR([Makefile.am])
commit dd201bcf9e7f8863b7ef32273a5ef021678133c1
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Oct 2 12:10:29 2009 +1000
nls: remove duplicate Compose sequences from pt_BR.UTF-8
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index d886485..bd938aa 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -4241,19 +4241,19 @@ XCOMM <Multi_key> <U1d158> <U1d165> <U1d16f> : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SI
<Multi_key> <U1d15f> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
XCOMM <Multi_key> <U1d158> <U1d165> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
<Multi_key> <U1d15f> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
-<Multi_key> <U1d158> <U1d165> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
+XCOMM <Multi_key> <U1d158> <U1d165> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
<Multi_key> <U1d15f> <U1d172> : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
-<Multi_key> <U1d158> <U1d165> <U1d172> : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
+XCOMM <Multi_key> <U1d158> <U1d165> <U1d172> : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
<Multi_key> <U1d1b9> <U1d165> : "𝆹𝅥" U1D1BB # MUSICAL SYMBOL MINIMA
<Multi_key> <U1d1ba> <U1d165> : "𝆺𝅥" U1D1BC # MUSICAL SYMBOL MINIMA BLACK
<Multi_key> <U1d1bb> <U1d16e> : "𝆹𝅥𝅮" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
-<Multi_key> <U1d1b9> <U1d165> <U1d16e> : "𝆹𝅥𝅮" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
+XCOMM <Multi_key> <U1d1b9> <U1d165> <U1d16e> : "𝆹𝅥𝅮" U1D1BD # MUSICAL SYMBOL SEMIMINIMA WHITE
<Multi_key> <U1d1bc> <U1d16e> : "𝆺𝅥𝅮" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
-<Multi_key> <U1d1ba> <U1d165> <U1d16e> : "𝆺𝅥𝅮" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
+XCOMM <Multi_key> <U1d1ba> <U1d165> <U1d16e> : "𝆺𝅥𝅮" U1D1BE # MUSICAL SYMBOL SEMIMINIMA BLACK
<Multi_key> <U1d1bb> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
-<Multi_key> <U1d1b9> <U1d165> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
+XCOMM <Multi_key> <U1d1b9> <U1d165> <U1d16f> : "𝆹𝅥𝅯" U1D1BF # MUSICAL SYMBOL FUSA WHITE
<Multi_key> <U1d1bc> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
-<Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
+XCOMM <Multi_key> <U1d1ba> <U1d165> <U1d16f> : "𝆺𝅥𝅯" U1D1C0 # MUSICAL SYMBOL FUSA BLACK
XCOMM
XCOMM Khmer digraphs
commit a293ae9e83739067fc92db1a39c262857bc2283e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 25 11:19:41 2009 +1000
Add XF86TouchpadToggle to XKeysymDB
Lenovo laptops provide a key to enable or disable the touchpad and the
trackstick. This key is usually located on Fn + F8.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Adam Jackson <ajax@redhat.com>
diff --git a/src/XKeysymDB b/src/XKeysymDB
index 5e66882..2dec6e2 100644
--- a/src/XKeysymDB
+++ b/src/XKeysymDB
@@ -353,6 +353,7 @@ XF86Yellow :1008FFA5
XF86Blue :1008FFA6
XF86Suspend :1008FFA7
XF86Hibernate :1008FFA8
+XF86TouchpadToggle :1008FFA9
! XFree86 special action keys
XF86_Switch_VT_1 :1008FE01
commit 69839f8903a24eab08f17a781b3797fb64dce9cf
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Sun Sep 27 10:34:16 2009 -0700
Bug 24173: libX11 from git fails to build with automake older then 1.11
AM_CONDITIONAL must come *before* the AC_OUTPUT that creates the
Makefiles, instead of after.
<http://bugs.freedesktop.org/show_bug.cgi?id=24173>
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 8bcbb32..b8ccdce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -428,6 +428,10 @@ AC_DEFINE_DIR(XERRORDB, XERRORDB, [Location of error message database])
XORG_CHECK_MALLOC_ZERO
+# Support AM_SILENT_RULES if automake-1.11 or later is used
+m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
+AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
+
AC_OUTPUT([Makefile
include/Makefile
man/Makefile
@@ -516,10 +520,6 @@ if test -z "$man_pages_suffix"; then
man_pages_suffix=none
fi
-# Support AM_SILENT_RULES if automake-1.11 or later is used
-m4_ifdef([AM_SILENT_RULES],[HAVE_AM_SILENT_RULES=yes])
-AM_CONDITIONAL(HAVE_AM_SILENT_RULES, test x$HAVE_AM_SILENT_RULES != x)
-
echo ""
echo "X11 will be built with the following settings:"
echo " Loadable i18n module support: "$XLIB_LOADABLE_I18N
commit f5effd041f58ef07703cca2b4f396758811e1eec
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 15 10:59:23 2009 -0700
Resolve conflicting Compose sequences in iso8859-2, el_GR.UTF-8 & pt_BR.UTF-8
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/nls/el_GR.UTF-8/Compose.pre b/nls/el_GR.UTF-8/Compose.pre
index 7769194..c00acb0 100644
--- a/nls/el_GR.UTF-8/Compose.pre
+++ b/nls/el_GR.UTF-8/Compose.pre
@@ -1923,10 +1923,10 @@ XCOMM Miscellaneous extensions.
<dead_acute> <underscore> : "´" acute
<dead_tilde> <underscore> : "~" asciitilde
-<Multi_key> <less> <apostrophe> : "‘" leftsinglequotemark
-<Multi_key> <apostrophe> <less> : "‘" leftsinglequotemark
-<Multi_key> <greater> <apostrophe> : "’" rightsinglequotemark
-<Multi_key> <apostrophe> <greater> : "’" rightsinglequotemark
+<Multi_key> <less> <apostrophe> <space> : "‘" leftsinglequotemark
+<Multi_key> <apostrophe> <less> <space> : "‘" leftsinglequotemark
+<Multi_key> <greater> <apostrophe> <space> : "’" rightsinglequotemark
+<Multi_key> <apostrophe> <greater> <space> : "’" rightsinglequotemark
<Multi_key> <asciitilde> <asciitilde> : "―" Greek_horizbar
<Multi_key> <asciicircum> <asciicircum> : "˘" breve
diff --git a/nls/iso8859-2/Compose.pre b/nls/iso8859-2/Compose.pre
index b9026b4..5d0b697 100644
--- a/nls/iso8859-2/Compose.pre
+++ b/nls/iso8859-2/Compose.pre
@@ -139,8 +139,8 @@ XCOMM are for compose sequences.
<Multi_key> <apostrophe> <z> : "\274" zacute
<Multi_key> <z> <acute> : "\274" zacute
<Multi_key> <acute> <z> : "\274" zacute
-<Multi_key> <apostrophe> <apostrophe> : "\275" doubleacute
-<Multi_key> <acute> <acute> : "\275" doubleacute
+<Multi_key> <apostrophe> <apostrophe> <space> : "\275" doubleacute
+<Multi_key> <acute> <acute> <space> : "\275" doubleacute
<Multi_key> <z> <less> : "\276" zcaron
<Multi_key> <less> <z> : "\276" zcaron
<Multi_key> <z> <caron> : "\276" zcaron
diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index 5c12af3..d886485 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -198,6 +198,7 @@ XCOMM There are some conflicts among sequences, but I left them alone.
XCOMM
XCOMM group 1: cluster jamos made of three basic jamos
+/* The following block gets overridden by later shorter compositions
<Multi_key> <U1107> <U1109> <U1100> : "ᄢ" U1122 : ᄇᅠ ᄉᅠ ᄀᅠ = ᄢᅠ
<Multi_key> <U1107> <U1109> <U1103> : "ᄣ" U1123 : ᄇᅠ ᄉᅠ ᄃᅠ = ᄣᅠ
<Multi_key> <U1107> <U1109> <U1107> : "ᄤ" U1124 : ᄇᅠ ᄉᅠ ᄇᅠ = ᄤᅠ
@@ -220,6 +221,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U11af> <U11ba> <U11ba> : "ᇖ" U11d6 : ᅟᅠᆯ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇖ
<Multi_key> <U11b7> <U11ba> <U11ba> : "ᇞ" U11de : ᅟᅠᆷ ᅟᅠᆺ ᅟᅠᆺ = ᅟᅠᇞ
<Multi_key> <U11bc> <U11a8> <U11a8> : "ᇭ" U11ed : ᅟᅠᆼ ᅟᅠᆨ ᅟᅠᆨ = ᅟᅠᇭ
+ */
<Multi_key> <U1100> <U1100> : "ᄁ" U1101 : ᄀᅠ ᄀᅠ = ᄁᅠ
<Multi_key> <U1103> <U1103> : "ᄄ" U1104 : ᄃᅠ ᄃᅠ = ᄄᅠ
<Multi_key> <U1107> <U1107> : "ᄈ" U1108 : ᄇᅠ ᄇᅠ = ᄈᅠ
@@ -1048,18 +1050,18 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_acute> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <Multi_key> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <acute> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<Multi_key> <acute> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+XCOMM <Multi_key> <acute> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <apostrophe> <dead_abovering> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
-<Multi_key> <apostrophe> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
+XCOMM <Multi_key> <apostrophe> <o> <A> : "Ǻ" U01FA # LATIN CAPITAL LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <acute> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <apostrophe> <aring> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <Multi_key> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <acute> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<Multi_key> <acute> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+XCOMM <Multi_key> <acute> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<Multi_key> <apostrophe> <dead_abovering> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
-<Multi_key> <apostrophe> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
+XCOMM <Multi_key> <apostrophe> <o> <a> : "ǻ" U01FB # LATIN SMALL LETTER A WITH RING ABOVE AND ACUTE
<dead_acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
<Multi_key> <acute> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
<Multi_key> <apostrophe> <AE> : "Ǽ" U01FC # LATIN CAPITAL LETTER AE WITH ACUTE
@@ -1506,14 +1508,12 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U0cc6> <U0cd6> : "ೈ" U0CC8 # KANNADA VOWEL SIGN AI
<Multi_key> <U0cc6> <U0cc2> : "ೊ" U0CCA # KANNADA VOWEL SIGN O
<Multi_key> <U0cca> <U0cd5> : "ೋ" U0CCB # KANNADA VOWEL SIGN OO
-<Multi_key> <U0cc6> <U0cc2> <U0cd5> : "ೋ" U0CCB # KANNADA VOWEL SIGN OO
<Multi_key> <U0d46> <U0d3e> : "ൊ" U0D4A # MALAYALAM VOWEL SIGN O
<Multi_key> <U0d47> <U0d3e> : "ോ" U0D4B # MALAYALAM VOWEL SIGN OO
<Multi_key> <U0d46> <U0d57> : "ൌ" U0D4C # MALAYALAM VOWEL SIGN AU
<Multi_key> <U0dd9> <U0dca> : "ේ" U0DDA # SINHALA VOWEL SIGN DIGA KOMBUVA
<Multi_key> <U0dd9> <U0dcf> : "ො" U0DDC # SINHALA VOWEL SIGN KOMBUVA HAA AELA-PILLA
<Multi_key> <U0ddc> <U0dca> : "ෝ" U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
-<Multi_key> <U0dd9> <U0dcf> <U0dca> : "ෝ" U0DDD # SINHALA VOWEL SIGN KOMBUVA HAA DIGA AELA-PILLA
<Multi_key> <U0dd9> <U0ddf> : "ෞ" U0DDE # SINHALA VOWEL SIGN KOMBUVA HAA GAYANUKITTA
<Multi_key> <U0fb7> <U0f42> : "གྷ" U0F43 # TIBETAN LETTER GHA
<Multi_key> <U0fb7> <U0f4c> : "ཌྷ" U0F4D # TIBETAN LETTER DDHA
@@ -1555,7 +1555,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <acute> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <dead_cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
+XCOMM <Multi_key> <apostrophe> <comma> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <cedilla> <C> : "Ḉ" U1E08 # LATIN CAPITAL LETTER C WITH CEDILLA AND ACUTE
<dead_acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <ccedilla> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
@@ -1567,7 +1567,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <acute> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <acute> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <dead_cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
-<Multi_key> <apostrophe> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
+XCOMM <Multi_key> <apostrophe> <comma> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<Multi_key> <apostrophe> <cedilla> <c> : "ḉ" U1E09 # LATIN SMALL LETTER C WITH CEDILLA AND ACUTE
<dead_abovedot> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
<Multi_key> <period> <D> : "Ḋ" U1E0A # LATIN CAPITAL LETTER D WITH DOT ABOVE
@@ -1906,13 +1906,13 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_abovedot> <dead_caron> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
<dead_abovedot> <Multi_key> <c> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
<Multi_key> <period> <dead_caron> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
-<Multi_key> <period> <c> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
+XCOMM <Multi_key> <period> <c> <S> : "Ṧ" U1E66 # LATIN CAPITAL LETTER S WITH CARON AND DOT ABOVE
<dead_abovedot> <scaron> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
<Multi_key> <period> <scaron> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
<dead_abovedot> <dead_caron> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
-<dead_abovedot> <Multi_key> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
+XCOMM <dead_abovedot> <Multi_key> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
<Multi_key> <period> <dead_caron> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
-<Multi_key> <period> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
+XCOMM <Multi_key> <period> <c> <s> : "ṧ" U1E67 # LATIN SMALL LETTER S WITH CARON AND DOT ABOVE
<dead_abovedot> <U1e62> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
<Multi_key> <period> <U1e62> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
<dead_abovedot> <dead_belowdot> <S> : "Ṩ" U1E68 # LATIN CAPITAL LETTER S WITH DOT BELOW AND DOT ABOVE
@@ -2119,10 +2119,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_acute> <Multi_key> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
<dead_acute> <Multi_key> <b> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
<Multi_key> <acute> <dead_breve> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<Multi_key> <acute> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+XCOMM <Multi_key> <acute> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
<Multi_key> <acute> <b> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
<Multi_key> <apostrophe> <dead_breve> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
-<Multi_key> <apostrophe> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
+XCOMM <Multi_key> <apostrophe> <U> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
<Multi_key> <apostrophe> <b> <A> : "Ắ" U1EAE # LATIN CAPITAL LETTER A WITH BREVE AND ACUTE
<dead_acute> <abreve> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<Multi_key> <acute> <abreve> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
@@ -2131,10 +2131,10 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_acute> <Multi_key> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<dead_acute> <Multi_key> <b> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<Multi_key> <acute> <dead_breve> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<Multi_key> <acute> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
+XCOMM <Multi_key> <acute> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<Multi_key> <acute> <b> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<Multi_key> <apostrophe> <dead_breve> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
-<Multi_key> <apostrophe> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
+XCOMM <Multi_key> <apostrophe> <U> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<Multi_key> <apostrophe> <b> <a> : "ắ" U1EAF # LATIN SMALL LETTER A WITH BREVE AND ACUTE
<dead_grave> <Abreve> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
<Multi_key> <grave> <Abreve> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
@@ -2142,7 +2142,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_grave> <Multi_key> <U> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
<dead_grave> <Multi_key> <b> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
<Multi_key> <grave> <dead_breve> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
-<Multi_key> <grave> <U> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
+XCOMM <Multi_key> <grave> <U> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
<Multi_key> <grave> <b> <A> : "Ằ" U1EB0 # LATIN CAPITAL LETTER A WITH BREVE AND GRAVE
<dead_grave> <abreve> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
<Multi_key> <grave> <abreve> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
@@ -2150,7 +2150,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_grave> <Multi_key> <U> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
<dead_grave> <Multi_key> <b> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
<Multi_key> <grave> <dead_breve> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
-<Multi_key> <grave> <U> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
+XCOMM <Multi_key> <grave> <U> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
<Multi_key> <grave> <b> <a> : "ằ" U1EB1 # LATIN SMALL LETTER A WITH BREVE AND GRAVE
<dead_hook> <Abreve> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
<Multi_key> <question> <Abreve> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
@@ -2158,7 +2158,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_hook> <Multi_key> <U> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
<dead_hook> <Multi_key> <b> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
<Multi_key> <question> <dead_breve> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
-<Multi_key> <question> <U> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
+XCOMM <Multi_key> <question> <U> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
<Multi_key> <question> <b> <A> : "Ẳ" U1EB2 # LATIN CAPITAL LETTER A WITH BREVE AND HOOK ABOVE
<dead_hook> <abreve> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
<Multi_key> <question> <abreve> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
@@ -2166,7 +2166,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_hook> <Multi_key> <U> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
<dead_hook> <Multi_key> <b> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
<Multi_key> <question> <dead_breve> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
-<Multi_key> <question> <U> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
+XCOMM <Multi_key> <question> <U> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
<Multi_key> <question> <b> <a> : "ẳ" U1EB3 # LATIN SMALL LETTER A WITH BREVE AND HOOK ABOVE
<dead_tilde> <Abreve> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <Abreve> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
@@ -2174,7 +2174,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_tilde> <Multi_key> <U> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
<dead_tilde> <Multi_key> <b> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <dead_breve> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
-<Multi_key> <asciitilde> <U> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
+XCOMM <Multi_key> <asciitilde> <U> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <b> <A> : "Ẵ" U1EB4 # LATIN CAPITAL LETTER A WITH BREVE AND TILDE
<dead_tilde> <abreve> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <abreve> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
@@ -2182,7 +2182,7 @@ XCOMM group 1: cluster jamos made of three basic jamos
<dead_tilde> <Multi_key> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<dead_tilde> <Multi_key> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <dead_breve> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
-<Multi_key> <asciitilde> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
+XCOMM <Multi_key> <asciitilde> <U> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<Multi_key> <asciitilde> <b> <a> : "ẵ" U1EB5 # LATIN SMALL LETTER A WITH BREVE AND TILDE
<dead_breve> <U1ea0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
<Multi_key> <U> <U1ea0> : "Ặ" U1EB6 # LATIN CAPITAL LETTER A WITH BREVE AND DOT BELOW
@@ -3645,9 +3645,9 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <underscore> <parenright> : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS
<Multi_key> <underbar> <parenright> : "₎" U208E # SUBSCRIPT RIGHT PARENTHESIS
<dead_circumflex> <Multi_key> <S> <M> : "℠" U2120 # SERVICE MARK
-<Multi_key> <asciicircum> <S> <M> : "℠" U2120 # SERVICE MARK
+<Multi_key> <S> <M> : "℠" U2120 # SERVICE MARK
<dead_circumflex> <Multi_key> <T> <M> : "™" U2122 # TRADE MARK SIGN
-<Multi_key> <asciicircum> <T> <M> : "™" U2122 # TRADE MARK SIGN
+<Multi_key> <T> <M> : "™" U2122 # TRADE MARK SIGN
<Multi_key> <1> <3> : "⅓" U2153 # VULGAR FRACTION ONE THIRD
<Multi_key> <2> <3> : "⅔" U2154 # VULGAR FRACTION TWO THIRDS
<Multi_key> <1> <5> : "⅕" U2155 # VULGAR FRACTION ONE FIFTH
@@ -4235,11 +4235,11 @@ XCOMM group 1: cluster jamos made of three basic jamos
<Multi_key> <U1d157> <U1d165> : "𝅗𝅥" U1D15E # MUSICAL SYMBOL HALF NOTE
<Multi_key> <U1d158> <U1d165> : "𝅘𝅥" U1D15F # MUSICAL SYMBOL QUARTER NOTE
<Multi_key> <U1d15f> <U1d16e> : "𝅘𝅥𝅮" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
-<Multi_key> <U1d158> <U1d165> <U1d16e> : "𝅘𝅥𝅮" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
+XCOMM <Multi_key> <U1d158> <U1d165> <U1d16e> : "𝅘𝅥𝅮" U1D160 # MUSICAL SYMBOL EIGHTH NOTE
<Multi_key> <U1d15f> <U1d16f> : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
-<Multi_key> <U1d158> <U1d165> <U1d16f> : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
+XCOMM <Multi_key> <U1d158> <U1d165> <U1d16f> : "𝅘𝅥𝅯" U1D161 # MUSICAL SYMBOL SIXTEENTH NOTE
<Multi_key> <U1d15f> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
-<Multi_key> <U1d158> <U1d165> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
+XCOMM <Multi_key> <U1d158> <U1d165> <U1d170> : "𝅘𝅥𝅰" U1D162 # MUSICAL SYMBOL THIRTY-SECOND NOTE
<Multi_key> <U1d15f> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
<Multi_key> <U1d158> <U1d165> <U1d171> : "𝅘𝅥𝅱" U1D163 # MUSICAL SYMBOL SIXTY-FOURTH NOTE
<Multi_key> <U1d15f> <U1d172> : "𝅘𝅥𝅲" U1D164 # MUSICAL SYMBOL ONE HUNDRED TWENTY-EIGHTH NOTE
commit 3843778358d3a0cd6a2d07dba5dd061248053ac9
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Wed Apr 15 10:56:09 2009 -0700
Add perl script to check for duplicate or conflicting compose file entries
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/configure.ac b/configure.ac
index 02e6f62..8bcbb32 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,6 +40,15 @@ AC_SUBST([CC_FOR_BUILD])
XORG_PROG_RAWCPP
+# Find perl for "make check" tests in nls/localerules.in
+AC_ARG_WITH(perl,
+ AC_HELP_STRING([--with-perl=<path>],
+ [path to perl interpreter for build-time tests]),
+ [PERL=$withval ; AC_MSG_CHECKING([perl]) ;
+ AC_MSG_RESULT([(from --with-perl) $PERL])],
+ AC_CHECK_PROGS([PERL], [perl], [no]))
+AM_CONDITIONAL(HAVE_PERL, test x$PERL != xno)
+
# Build with XCB support?
AC_ARG_WITH(xcb,
AC_HELP_STRING([--with-xcb], [use XCB for low-level protocol implementation]),
diff --git a/nls/compose-check.pl b/nls/compose-check.pl
new file mode 100755
index 0000000..d219812
--- /dev/null
+++ b/nls/compose-check.pl
@@ -0,0 +1,163 @@
+#! /usr/bin/perl
+#
+# Copyright 2009 Sun Microsystems, Inc. All rights reserved.
+# Use is subject to license terms.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, and/or sell copies of the Software, and to permit persons
+# to whom the Software is furnished to do so, provided that the above
+# copyright notice(s) and this permission notice appear in all copies of
+# the Software and that both the above copyright notice(s) and this
+# permission notice appear in supporting documentation.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+# OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
+# INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
+# FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+# NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+# WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+#
+# Except as contained in this notice, the name of a copyright holder
+# shall not be used in advertising or otherwise to promote the sale, use
+# or other dealings in this Software without prior written authorization
+# of the copyright holder.
+#
+
+#
+# Check a compose file for duplicate/conflicting entries and other common errors
+#
+
+# Compose file grammar is defined in modules/im/ximcp/imLcPrs.c
+
+use strict;
+use warnings;
+
+my $error_count = 0;
+
+if (scalar(@ARGV) == 0) {
+ push @ARGV, "Compose";
+}
+
+foreach my $cf (@ARGV) {
+ $error_count += check_compose_file($cf);
+}
+
+exit($error_count);
+
+sub check_compose_file {
+ my ($filename) = @_;
+ my $errors = 0;
+
+ my %compose_table = ();
+ my $line = 0;
+ my $pre_file = ($filename =~ m{\.pre$}) ? 1 : 0;
+ my $in_c_comment = 0;
+
+ open my $COMPOSE, '<', $filename or die "Could not open $filename: $!";
+
+ COMPOSE_LINE:
+ while (my $cl = <$COMPOSE>) {
+ $line++;
+ chomp($cl);
+ my $original_line = $cl;
+
+ # Special handling for changes cpp makes to .pre files
+ if ($pre_file == 1) {
+ if ($in_c_comment) { # Look for end of multi-line C comment
+ if ($cl =~ m{\*/(.*)$}) {
+ $cl = $1;
+ $in_c_comment = 0;
+ } else {
+ next;
+ }
+ }
+ $cl =~ s{/\*.\**/}{}; # Remove single line C comments
+ if ($cl =~ m{^(.*)/\*}) { # Start of a multi-line C comment
+ $cl = $1;
+ $in_c_comment = 1;
+ }
+ next if $cl =~ m{^\s*XCOMM}; # Skip pre-processing comments
+ }
+
+ $cl =~ s{#.*$}{}; # Remove comments
+ next if $cl =~ m{^\s*$}; # Skip blank (or comment-only) lines
+ chomp($cl);
+
+ if ($cl =~ m{^(STATE\s+|END_STATE)}) { # Sun extension to compose file syntax
+ %compose_table = ();
+ }
+ elsif ($cl =~ m{^([^:]+)\s*:\s*(.+)$}) {
+ my ($seq, $action) = ($1, $2);
+ $seq =~ s{\s+$}{};
+
+ my @keys = grep { $_ !~ m/^\s*$/ } split /[\s\<\>]+/, $seq;
+
+ my $final_key = pop @keys;
+ my $keytable = \%compose_table;
+
+ foreach my $k (@keys) {
+ if ($k =~ m{^U([[:xdigit:]]+)$}) {
+ $k = 'U' . lc($1);
+ }
+ if (exists $keytable->{$k}) {
+ $keytable = $keytable->{$k};
+ if (ref($keytable) ne 'HASH') {
+ print
+ "Clash with existing sequence in $filename on line $line: $seq\n";
+ print_sequences([$line, $original_line]);
+ print_sequences($keytable);
+ $errors++;
+ next COMPOSE_LINE;
+ }
+ } else {
+ my $new_keytable = {};
+ $keytable->{$k} = $new_keytable;
+ $keytable = $new_keytable;
+ }
+ }
+
+ if (exists $keytable->{$final_key}) {
+ print "Clash with existing sequence in $filename on line $line: $seq\n";
+ print_sequences([$line, $original_line]);
+ print_sequences($keytable->{$final_key});
+ $errors++;
+ } else {
+ $keytable->{$final_key} = [$line, $original_line];
+ }
+ } elsif ($cl =~ m{^(STATE_TYPE:|\@StartDeadKeyMap|\@EndDeadKeyMap)}) {
+ # ignore
+ } elsif ($cl =~ m{^include "(.*)"}) {
+ my $incpath = $1;
+ if (($pre_file == 1) && ($incpath !~ m{^X11_LOCALEDATADIR/})) {
+ print "Include path starts with $incpath instead of X11_LOCALEDATADIR\n",
+ " -- may not find include files when installed in alternate paths\n\n";
+ }
+ } else {
+ print 'Unrecognized pattern in ', $filename, ' on line #', $line, ":\n ",
+ $cl, "\n";
+ }
+ }
+ close $COMPOSE;
+
+ return $errors;
+}
+
+sub print_sequences {
+ my ($entry_ref) = @_;
+
+ if (ref($entry_ref) eq 'HASH') {
+ foreach my $h (values %{$entry_ref}) {
+ print_sequences($h);
+ }
+ } else {
+ my ($line, $seq) = @{$entry_ref};
+
+ print " line #", $line, ": ", $seq, "\n";
+ }
+}
diff --git a/nls/localerules.in b/nls/localerules.in
index 6dfc770..9fcf543 100644
--- a/nls/localerules.in
+++ b/nls/localerules.in
@@ -6,3 +6,8 @@ dist_x11thislocale_DATA = XI18N_OBJS
x11thislocale_DATA = XLC_LOCALE Compose
CLEANFILES = XLC_LOCALE Compose
+
+if HAVE_PERL
+TESTS_ENVIRONMENT = $(PERL)
+TESTS = $(top_srcdir)/nls/compose-check.pl
+endif HAVE_PERL
commit 19cc5e1fa17a285045662820a8b4de2a0f9a194d
Author: Alan Coopersmith <alan.coopersmith@sun.com>
Date: Fri Sep 18 17:10:04 2009 -0700
Use make rules instead of shell for loops to generate shadow man pages
Allows parallel make and simpler build logs/error reporting
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
diff --git a/man/Makefile.am b/man/Makefile.am
index 61d7357..328e386 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -199,8 +199,6 @@ libman_PRE = \
if MANPAGES
libman_DATA = $(libman_PRE:man=@LIB_MAN_SUFFIX@) \
$(all_shadows:=.@LIB_MAN_SUFFIX@)
-
-BUILT_SOURCES = shadows.DONE
endif
EXTRA_DIST = $(libman_PRE)
@@ -1083,431 +1081,570 @@ XmbTextPerCharExtents_shadows = \
XwcTextPerCharExtents \
Xutf8TextPerCharExtents
-shadows.DONE:
- -rm -f $(all_aliases:=.@LIB_MAN_SUFFIX@)
- (for i in $(AllPlanes_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/AllPlanes.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(BlackPixelOfScreen_shadows:=.@LIB_MAN_SUFFIX@) ; do \
- echo .so man$(LIB_MAN_DIR_SUFFIX)/BlackPixelOfScreen.$(LIB_MAN_SUFFIX) > $$i; \
- done)
- (for i in $(DisplayOfCCC_shadows:=.@LIB_MAN_SUFFIX@) ; do \
Reply to: