libx11: Changes to 'upstream-unstable'
configure.ac | 26
cpprules.in | 6
include/X11/Xlib.h | 17
include/X11/Xlocale.h | 22
man/Compose.man | 16
man/XCreateGC.man | 94
man/XErrorEvent.man | 2
man/xkb/XkbGetKeyBehaviors.man | 6
man/xkb/XkbGetMap.man | 2
man/xkb/XkbLookupKeySym.man | 2
man/xkb/XkbSetIgnoreLockMods.man | 1
man/xkb/XkbSetServerInternalMods.man | 1
man/xkb/XkbTranslateKeyCode.man | 2
modules/im/ximcp/imCallbk.c | 10
modules/im/ximcp/imDefIc.c | 7
modules/im/ximcp/imDefIm.c | 6
modules/im/ximcp/imDefLkup.c | 13
modules/im/ximcp/imInt.c | 9
modules/im/ximcp/imLcIm.c | 102
modules/im/ximcp/imLcPrs.c | 5
modules/im/ximcp/imRmAttr.c | 24
modules/im/ximcp/imThaiIc.c | 18
modules/lc/Makefile.am | 2
modules/lc/def/lcDefConv.c | 41
modules/lc/gen/lcGenConv.c | 53
modules/lc/xlocale/Makefile.am | 35
modules/lc/xlocale/lcEuc.c | 1537 -------
modules/lc/xlocale/lcJis.c | 944 ----
modules/lc/xlocale/lcSjis.c | 1612 -------
modules/om/generic/omGeneric.c | 45
nls/C/XLC_LOCALE.pre | 2
nls/Makefile.am | 6
nls/armscii-8/XLC_LOCALE.pre | 2
nls/compose.dir.pre | 23
nls/cs_CZ.UTF-8/Compose.pre | 12
nls/en_US.UTF-8/Compose.pre | 113
nls/fi_FI.UTF-8/Compose.pre | 710 +--
nls/georgian-academy/XLC_LOCALE.pre | 2
nls/georgian-ps/XLC_LOCALE.pre | 2
nls/ibm-cp1133/XLC_LOCALE.pre | 2
nls/iscii-dev/XLC_LOCALE.pre | 2
nls/isiri-3342/XLC_LOCALE.pre | 2
nls/iso8859-1/XLC_LOCALE.pre | 2
nls/iso8859-10/XLC_LOCALE.pre | 2
nls/iso8859-11/XLC_LOCALE.pre | 2
nls/iso8859-13/XLC_LOCALE.pre | 2
nls/iso8859-14/XLC_LOCALE.pre | 2
nls/iso8859-15/XLC_LOCALE.pre | 2
nls/iso8859-2/XLC_LOCALE.pre | 2
nls/iso8859-3/XLC_LOCALE.pre | 2
nls/iso8859-4/XLC_LOCALE.pre | 2
nls/iso8859-5/XLC_LOCALE.pre | 2
nls/iso8859-6/XLC_LOCALE.pre | 2
nls/iso8859-7/XLC_LOCALE.pre | 2
nls/iso8859-8/XLC_LOCALE.pre | 2
nls/iso8859-9/XLC_LOCALE.pre | 2
nls/iso8859-9e/XLC_LOCALE.pre | 2
nls/ja.JIS/XLC_LOCALE.pre | 2
nls/ja.SJIS/XLC_LOCALE.pre | 2
nls/ja/XLC_LOCALE.pre | 2
nls/km_KH.UTF-8/Compose.pre | 2
nls/ko/XLC_LOCALE.pre | 2
nls/koi8-c/XLC_LOCALE.pre | 2
nls/koi8-r/XLC_LOCALE.pre | 2
nls/koi8-u/XLC_LOCALE.pre | 2
nls/locale.alias.pre | 4
nls/microsoft-cp1251/XLC_LOCALE.pre | 2
nls/microsoft-cp1255/XLC_LOCALE.pre | 2
nls/microsoft-cp1256/XLC_LOCALE.pre | 2
nls/mulelao-1/XLC_LOCALE.pre | 2
nls/nokhchi-1/XLC_LOCALE.pre | 2
nls/pt_BR.UTF-8/Compose.pre | 4307 --------------------
nls/sr_CS.UTF-8/Compose.pre | 32
nls/tatar-cyr/XLC_LOCALE.pre | 2
nls/th_TH/XLC_LOCALE.pre | 2
nls/tscii-0/XLC_LOCALE.pre | 2
nls/vi_VN.tcvn/XLC_LOCALE.pre | 2
nls/vi_VN.viscii/XLC_LOCALE.pre | 2
nls/zh_CN/XI18N_OBJS | 1
nls/zh_CN/XLC_LOCALE.pre | 2
nls/zh_TW.big5/XLC_LOCALE.pre | 2
nls/zh_TW/XLC_LOCALE.pre | 2
specs/XKB/acknowledgement.xml | 9
specs/XKB/ch01.xml | 111
specs/XKB/ch02.xml | 1046 ++--
specs/XKB/ch03.xml | 126
specs/XKB/ch04.xml | 890 +---
specs/XKB/ch05.xml | 1191 +++--
specs/XKB/ch06.xml | 464 +-
specs/XKB/ch07.xml | 533 +-
specs/XKB/ch08.xml | 2920 ++++++-------
specs/XKB/ch09.xml | 1430 +++---
specs/XKB/ch10.xml | 7425 +++++++++++++++++------------------
specs/XKB/ch11.xml | 586 +-
specs/XKB/ch12.xml | 1358 +++---
specs/XKB/ch13.xml | 6770 ++++++++++++++++---------------
specs/XKB/ch14.xml | 2205 +++++-----
specs/XKB/ch15.xml | 4120 +++++++++----------
specs/XKB/ch16.xml | 6441 +++++++++++++++---------------
specs/XKB/ch17.xml | 2350 +++++------
specs/XKB/ch18.xml | 1551 +++----
specs/XKB/ch19.xml | 351 -
specs/XKB/ch20.xml | 1212 ++---
specs/XKB/ch21.xml | 3076 +++++++-------
specs/XKB/ch22.xml | 323 -
specs/XKB/glossary.xml | 331 -
specs/XKB/xkblib.xml | 1
specs/i18n/framework/framework.xml | 2
specs/libX11/AppC.xml | 6
specs/libX11/AppD.xml | 5
specs/libX11/CH01.xml | 2
specs/libX11/CH03.xml | 46
specs/libX11/CH04.xml | 11
specs/libX11/CH05.xml | 17
specs/libX11/CH06.xml | 34
specs/libX11/CH07.xml | 38
specs/libX11/CH08.xml | 77
specs/libX11/CH09.xml | 3
specs/libX11/CH12.xml | 23
specs/libX11/CH13.xml | 18
specs/libX11/CH14.xml | 4
specs/libX11/CH16.xml | 47
src/FetchName.c | 4
src/Font.c | 22
src/FontInfo.c | 4
src/FontNames.c | 4
src/GetFPath.c | 4
src/GetHints.c | 18
src/GetNrmHint.c | 2
src/GetRGBCMap.c | 8
src/GetStCmap.c | 2
src/GetWMCMapW.c | 2
src/GetWMProto.c | 2
src/Iconify.c | 26
src/ImUtil.c | 4
src/InitExt.c | 2
src/KeyBind.c | 81
src/ListExt.c | 4
src/Macros.c | 14
src/Makefile.am | 2
src/ModMap.c | 5
src/OpenDis.c | 34
src/PutImage.c | 11
src/RdBitF.c | 2
src/ReconfWM.c | 37
src/ScrResStr.c | 3
src/SetLocale.c | 51
src/StBytes.c | 2
src/Withdraw.c | 22
src/XErrorDB | 12
src/XlibInt.c | 45
src/Xrm.c | 4
src/Xxcbint.h | 2
src/xcb_io.c | 11
src/xcms/cmsColNm.c | 2
src/xkb/XKB.c | 14
src/xkb/XKBAlloc.c | 3
src/xkb/XKBBind.c | 102
src/xkb/XKBExtDev.c | 6
src/xkb/XKBGAlloc.c | 6
src/xkb/XKBGeom.c | 13
src/xkb/XKBMAlloc.c | 94
src/xkb/XKBNames.c | 13
src/xkb/XKBRdBuf.c | 4
src/xlibi18n/ICWrap.c | 10
src/xlibi18n/Makefile.am | 3
src/xlibi18n/XDefaultOMIF.c | 36
src/xlibi18n/XlcPubI.h | 7
src/xlibi18n/Xlcint.h | 15
src/xlibi18n/lcFile.c | 19
src/xlibi18n/lcGeneric.c | 10
src/xlibi18n/lcInit.c | 29
src/xlibi18n/lcPrTxt.c | 3
src/xlibi18n/lcPublic.c | 20
src/xlibi18n/lcStd.c | 10
src/xlibi18n/lcUTF8.c | 4
src/xlibi18n/lcWrap.c | 3
177 files changed, 24822 insertions(+), 33157 deletions(-)
New commits:
commit 5a499ca7b064bf7e6a4fcc169f22862dce0c60c5
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Mar 9 15:28:29 2015 -0700
libX11 1.6.3
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 047917d..92b791c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libX11], [1.6.2],
+AC_INIT([libX11], [1.6.3],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libX11])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([src/config.h include/X11/XlibConf.h])
commit c8e19b393defd53f046ddc2da3a16881221b3c34
Author: Joonas Javanainen <joonas.javanainen@gmail.com>
Date: Thu Feb 5 17:31:04 2015 +0200
Fix XErrorEvent struct field order in man page
In the man page the field "resourceid" was in a different place than
in the actual struct layout in Xlib.h
Signed-off-by: Joonas Javanainen <joonas.javanainen@gmail.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/XErrorEvent.man b/man/XErrorEvent.man
index 66c07d0..136de6e 100644
--- a/man/XErrorEvent.man
+++ b/man/XErrorEvent.man
@@ -90,11 +90,11 @@ structure contains:
typedef struct {
int type;
Display *display; /\&* Display the event was read from */
+ XID resourceid; /\&* resource id */
unsigned long serial; /\&* serial number of failed request */
unsigned char error_code; /\&* error code of failed request */
unsigned char request_code; /\&* Major op-code of failed request */
unsigned char minor_code; /\&* Minor op-code of failed request */
- XID resourceid; /\&* resource id */
} XErrorEvent;
.De
.LP
commit ddf3b09bb262d01b56fbaade421ac85b0e60a69f
Author: Ran Benita <ran234@gmail.com>
Date: Tue Feb 3 13:23:50 2015 -0500
compose: fix the description of modifiers in compose sequences
The Compose format has a feature which allows specifying certain
modifiers must (or must not) be present with a given keysym in the
sequence.
The grammar in imLcPrs.c and the Compose man page both do not match what
the code actually does (see the handling of the variables
`modifier_mask` and `modifier` in parseline() in imLcPrs.c, which are
eventually matched as `ev->state & modifier_mask == modifier`).
Also explicitly list the accepted modifier names, since they are
not standard (e.g. "Ctrl" instead of "Control").
Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/man/Compose.man b/man/Compose.man
index 13ba705..6a8a966 100644
--- a/man/Compose.man
+++ b/man/Compose.man
@@ -88,16 +88,18 @@ comment at the end of the line:
.PP
Each event consists of a specified input keysym, and optional modifier states:
.RS
-[\fIMODIFIER_LIST\fP] \fB<\fP\fIkeysym\fP\fB>\fP
+[([\fB!\fP] ([\fB~\fP] \fIMODIFIER\fP)...) | \fBNone\fP] \fB<\fP\fIkeysym\fP\fB>\fP
.RE
.PP
-Each modifier consists of a specified modifier and a state:
-.RS
-(\fB!\fP \fIMODIFIER\fP ) | \fBNone\fP
-.RE
-Modifiers may be preceded by a
+If the modifier list is preceded by
+.RB \*q "!" \*q
+it must match exactly.
+MODIFIER may be one of Ctrl, Lock, Caps, Shift, Alt or Meta.
+Each modifier may be preceded by a
.RB \*q "~" \*q
-character to indicate that the modifier must not be present.
+character to indicate that the modifier must not be present. If
+.RB \*q "None" \*q
+is specified, no modifier may be present.
.PP
The result specifies a string, keysym, or both, that the X client receives
as input when the sequence of events is input:
diff --git a/modules/im/ximcp/imLcPrs.c b/modules/im/ximcp/imLcPrs.c
index e9d5f7b..9bb45ff 100644
--- a/modules/im/ximcp/imLcPrs.c
+++ b/modules/im/ximcp/imLcPrs.c
@@ -68,8 +68,9 @@ static void parsestringfile(FILE *fp, Xim im, int depth);
* COMMENT ::= "#" {<any character except null or newline>}
* LHS ::= EVENT { EVENT }
* EVENT ::= [MODIFIER_LIST] "<" keysym ">"
- * MODIFIER_LIST ::= ("!" {MODIFIER} ) | "None"
- * MODIFIER ::= ["~"] modifier_name
+ * MODIFIER_LIST ::= (["!"] {MODIFIER} ) | "None"
+ * MODIFIER ::= ["~"] MODIFIER_NAME
+ * MODIFIER_NAME ::= ("Ctrl"|"Lock"|"Caps"|"Shift"|"Alt"|"Meta")
* RHS ::= ( STRING | keysym | STRING keysym )
* STRING ::= '"' { CHAR } '"'
* CHAR ::= GRAPHIC_CHAR | ESCAPED_CHAR
commit 129f13f385c50e3d8b53ea7441b17386b0f36aeb
Author: Ran Benita <ran234@gmail.com>
Date: Tue Feb 3 13:23:49 2015 -0500
xkb: fix misleading comment about consumed modifiers
In the spec and the man page the `mods_rtrn` argument is described as
"backfilled with unconsumed modifiers" but actually it is backfilled
with the *consumed* modifiers. This is also mentioned a few lines below
in each case.
Signed-off-by: Ran Benita <ran234@gmail.com>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/man/xkb/XkbLookupKeySym.man b/man/xkb/XkbLookupKeySym.man
index fe9cb13..8a8f0c1 100644
--- a/man/xkb/XkbLookupKeySym.man
+++ b/man/xkb/XkbLookupKeySym.man
@@ -44,7 +44,7 @@ key for which symbols are to be found
state for which symbol should be found
.TP
.I \- mods_rtrn
-backfilled with unconsumed modifiers
+backfilled with consumed modifiers
.TP
.I \- sym_rtrn
backfilled with symbol associated with key + state
diff --git a/man/xkb/XkbTranslateKeyCode.man b/man/xkb/XkbTranslateKeyCode.man
index 7f1afdd..e234412 100644
--- a/man/xkb/XkbTranslateKeyCode.man
+++ b/man/xkb/XkbTranslateKeyCode.man
@@ -44,7 +44,7 @@ keycode to translate
modifiers to apply when translating key
.TP
.I \- mods_rtrn
-backfilled with unconsumed modifiers
+backfilled with consumed modifiers
.TP
.I \- keysym_rtrn
keysym resulting from translation
diff --git a/specs/XKB/ch12.xml b/specs/XKB/ch12.xml
index fcfa8f9..0e73698 100644
--- a/specs/XKB/ch12.xml
+++ b/specs/XKB/ch12.xml
@@ -447,7 +447,7 @@ to find the symbol associated with a key for a particular state.
</term>
<listitem>
<para>
- backfilled with unconsumed modifiers
+ backfilled with consumed modifiers
</para>
</listitem>
</varlistentry>
@@ -840,7 +840,7 @@ To translate a keycode to a key symbol and modifiers, use
</term>
<listitem>
<para>
- backfilled with unconsumed modifiers
+ backfilled with consumed modifiers
</para>
</listitem>
</varlistentry>
commit 446f5f7f41317a85a0cd0efa5e6a1b37bc99fba2
Author: Ingo Schwarze <schwarze@usta.de>
Date: Tue Dec 9 10:44:13 2014 +0100
Fix pasto in XkbGetKeyBehaviors(3) manual
Reviewed-by: Thomas Klausner <wiz@NetBSD.org>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/xkb/XkbGetKeyBehaviors.man b/man/xkb/XkbGetKeyBehaviors.man
index 3d2ae10..02b638b 100644
--- a/man/xkb/XkbGetKeyBehaviors.man
+++ b/man/xkb/XkbGetKeyBehaviors.man
@@ -19,13 +19,13 @@
.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
.\" DEALINGS IN THE SOFTWARE.
.\"
-.TH XkbChangeTypesOfKey __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
+.TH XkbGetKeyBehaviors __libmansuffix__ __xorgversion__ "XKB FUNCTIONS"
.SH NAME
-XkbChangeTypesOfKey \- Obtain the behaviors (the behaviors array) for a subset of the keys in
+XkbGetKeyBehaviors \- 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
+.B Status XkbGetKeyBehaviors
.BI "(\^Display *" "dpy" "\^,"
.BI "unsigned int " "first" "\^,"
.BI "unsigned int " "num" "\^,"
commit f3831dde6972e4da9e018c6a5f4013d8756a5e78
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Sun Nov 23 21:35:36 2014 +0100
nls: Sorting compose sequences rigorously in mirroring pairs, as is custom.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index d7fbf69..972e111 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -204,19 +204,19 @@ XCOMM "₵" U20b5 CEDI SIGN
<Multi_key> <r> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN
<Multi_key> <equal> <r> : "₹" U20b9 # INDIAN RUPEE SIGN
-<Multi_key> <bar> <C> : "¢" cent # CENT SIGN
-<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
<Multi_key> <C> <bar> : "¢" cent # CENT SIGN
+<Multi_key> <bar> <C> : "¢" cent # CENT SIGN
<Multi_key> <c> <bar> : "¢" cent # CENT SIGN
+<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
<Multi_key> <c> <slash> : "¢" cent # CENT SIGN
<Multi_key> <slash> <c> : "¢" cent # CENT SIGN
<Multi_key> <L> <minus> : "£" sterling # POUND SIGN
-<Multi_key> <l> <minus> : "£" sterling # POUND SIGN
<Multi_key> <minus> <L> : "£" sterling # POUND SIGN
+<Multi_key> <l> <minus> : "£" sterling # POUND SIGN
<Multi_key> <minus> <l> : "£" sterling # POUND SIGN
<Multi_key> <Y> <equal> : "¥" yen # YEN SIGN
-<Multi_key> <y> <equal> : "¥" yen # YEN SIGN
<Multi_key> <equal> <Y> : "¥" yen # YEN SIGN
+<Multi_key> <y> <equal> : "¥" yen # YEN SIGN
<Multi_key> <equal> <y> : "¥" yen # YEN SIGN
<Multi_key> <Y> <minus> : "¥" yen # YEN SIGN
<Multi_key> <minus> <Y> : "¥" yen # YEN SIGN
commit a51681b60c84109fe19f5d449e13080522499324
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Thu Sep 19 16:42:01 2013 +0200
nls: Remove a duplicate locale name, and sort some others more strictly.
Also improve the grammar of the initial comment.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/compose.dir.pre b/nls/compose.dir.pre
index 455070f..e52a5c5 100644
--- a/nls/compose.dir.pre
+++ b/nls/compose.dir.pre
@@ -1,7 +1,7 @@
XCOMM
-XCOMM This file contains compose table file name.
-XCOMM The first word is the compose table file name and
-XCOMM the second word is full locale name.
+XCOMM This file contains compose table file names.
+XCOMM The first word is the compose table file name
+XCOMM and the second word is the full locale name.
XCOMM
XCOMM
iso8859-1/Compose: C
@@ -289,13 +289,12 @@ en_US.UTF-8/Compose: ar_SY.UTF-8
en_US.UTF-8/Compose: ar_TN.UTF-8
en_US.UTF-8/Compose: ar_YE.UTF-8
en_US.UTF-8/Compose: as_IN.UTF-8
-en_US.UTF-8/Compose: bo_IN.UTF-8
-en_US.UTF-8/Compose: bs_BA.UTF-8
en_US.UTF-8/Compose: az_AZ.UTF-8
en_US.UTF-8/Compose: be_BY.UTF-8
en_US.UTF-8/Compose: bg_BG.UTF-8
-en_US.UTF-8/Compose: bn_IN.UTF-8
en_US.UTF-8/Compose: bn_BD.UTF-8
+en_US.UTF-8/Compose: bn_IN.UTF-8
+en_US.UTF-8/Compose: bo_IN.UTF-8
en_US.UTF-8/Compose: br_FR.UTF-8
en_US.UTF-8/Compose: bs_BA.UTF-8
en_US.UTF-8/Compose: ca_AD.UTF-8
@@ -317,10 +316,10 @@ en_US.UTF-8/Compose: en_AU.UTF-8
en_US.UTF-8/Compose: en_BE.UTF-8
en_US.UTF-8/Compose: en_BW.UTF-8
en_US.UTF-8/Compose: en_BZ.UTF-8
-en_US.UTF-8/Compose: en_DK.UTF-8
en_US.UTF-8/Compose: en_CA.UTF-8
-en_US.UTF-8/Compose: en_GB.UTF-8
+en_US.UTF-8/Compose: en_DK.UTF-8
en_US.UTF-8/Compose: en_EN.UTF-8
+en_US.UTF-8/Compose: en_GB.UTF-8
en_US.UTF-8/Compose: en_HK.UTF-8
en_US.UTF-8/Compose: en_IE.UTF-8
en_US.UTF-8/Compose: en_IN.UTF-8
@@ -458,16 +457,16 @@ en_US.UTF-8/Compose: tr_TR.UTF-8
en_US.UTF-8/Compose: ts_ZA.UTF-8
en_US.UTF-8/Compose: tt_RU.UTF-8
en_US.UTF-8/Compose: uk_UA.UTF-8
-en_US.UTF-8/Compose: ur_PK.UTF-8
en_US.UTF-8/Compose: ur_IN.UTF-8
+en_US.UTF-8/Compose: ur_PK.UTF-8
en_US.UTF-8/Compose: uz_UZ.UTF-8
en_US.UTF-8/Compose: ve_ZA.UTF-8
en_US.UTF-8/Compose: vi_VN.UTF-8
en_US.UTF-8/Compose: wa_BE.UTF-8
-en_US.UTF-8/Compose: yi_US.UTF-8
en_US.UTF-8/Compose: xh_ZA.UTF-8
+en_US.UTF-8/Compose: yi_US.UTF-8
zh_CN.UTF-8/Compose: zh_CN.UTF-8
zh_HK.UTF-8/Compose: zh_HK.UTF-8
+en_US.UTF-8/Compose: zh_SG.UTF-8
zh_TW.UTF-8/Compose: zh_TW.UTF-8
en_US.UTF-8/Compose: zu_ZA.UTF-8
-en_US.UTF-8/Compose: zh_SG.UTF-8
commit 426b7f850f5376db96a4b12420ee141603fcc3cd
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Fri Sep 20 12:37:29 2013 +0200
nls: Add a comment to the block of accented Hebrew letters.
And align them in a nicer manner.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index dea3b07..d7fbf69 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5074,13 +5074,18 @@ XCOMM Part 3
<Multi_key> <parenleft> <U30F0> <parenright> : "㋼" U32FC # CIRCLED KATAKANA WI
<Multi_key> <parenleft> <U30F1> <parenright> : "㋽" U32FD # CIRCLED KATAKANA WE
<Multi_key> <parenleft> <kana_WO> <parenright> : "㋾" U32FE # CIRCLED KATAKANA WO
+
+XCOMM
+XCOMM Hebrew letters with accents
+XCOMM
+
<Multi_key> <U05B4> <hebrew_yod> : "יִ" UFB1D # HEBREW LETTER YOD WITH HIRIQ
-<Multi_key> <U05B7> <U05F2> : "ײַ" UFB1F # HEBREW LIGATURE YIDDISH YOD YOD PATAH
+<Multi_key> <U05B7> <U05F2> : "ײַ" UFB1F # HEBREW LIGATURE YIDDISH YOD YOD PATAH
<Multi_key> <U05C1> <hebrew_shin> : "שׁ" UFB2A # HEBREW LETTER SHIN WITH SHIN DOT
<Multi_key> <U05C2> <hebrew_shin> : "שׂ" UFB2B # HEBREW LETTER SHIN WITH SIN DOT
-<Multi_key> <U05C1> <UFB49> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
+<Multi_key> <U05C1> <UFB49> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
<Multi_key> <U05C1> <U05BC> <hebrew_shin> : "שּׁ" UFB2C # HEBREW LETTER SHIN WITH DAGESH AND SHIN DOT
-<Multi_key> <U05C2> <UFB49> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
+<Multi_key> <U05C2> <UFB49> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
<Multi_key> <U05C2> <U05BC> <hebrew_shin> : "שּׂ" UFB2D # HEBREW LETTER SHIN WITH DAGESH AND SIN DOT
<Multi_key> <U05B7> <hebrew_aleph> : "אַ" UFB2E # HEBREW LETTER ALEF WITH PATAH
<Multi_key> <U05B8> <hebrew_aleph> : "אָ" UFB2F # HEBREW LETTER ALEF WITH QAMATS
commit 7474c6f1ee78dd097b1d0b4c7e3e4ea41317e335
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Fri Sep 20 12:05:09 2013 +0200
nls: Add one lowercase compose variant for ®, to mirror those for ©.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 0155633..dea3b07 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -103,6 +103,7 @@ XCOMM Spaces
<Multi_key> <o> <R> : "®" registered # REGISTERED SIGN
<Multi_key> <O> <r> : "®" registered # REGISTERED SIGN
<Multi_key> <O> <R> : "®" registered # REGISTERED SIGN
+<Multi_key> <R> <o> : "®" registered # REGISTERED SIGN
<Multi_key> <R> <O> : "®" registered # REGISTERED SIGN
<Multi_key> <period> <greater> : "›" U203a # SINGLE RIGHT-POINTING ANGLE QUOTATION MARK
commit 18dcd13514fa538afefa78c93523d9dbd4688e74
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Sat Sep 7 20:10:43 2013 +0200
nls: Adding the visual composing characters to two comment lines.
The lines around them also contain the characters in the comments.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 54aa03e..0155633 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -5870,8 +5870,8 @@ XCOMM Characters from "Mathematical Operators"
<Multi_key> <greater> <less> : "⋄" U22c4 # > < DIAMOND OPERATOR
<Multi_key> <U2227> <U2228> : "⋄" U22c4 # ∧ ∨ DIAMOND OPERATOR
<Multi_key> <U2228> <U2227> : "⋄" U22c4 # ∨ ∧ DIAMOND OPERATOR
-<Multi_key> <colon> <period> : "∴" therefore # THEREFORE
-<Multi_key> <period> <colon> : "∵" because # BECAUSE
+<Multi_key> <colon> <period> : "∴" therefore # : . THEREFORE
+<Multi_key> <period> <colon> : "∵" because # . : BECAUSE
XCOMM Characters from "Miscellaneous Technical"
commit 18d8307575af748913d5da17e3de45da2a22ede4
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Sat Sep 7 20:09:32 2013 +0200
nls: Grouping a lone superscript minus together with its mates.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 015e3bf..54aa03e 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -4428,7 +4428,8 @@ XCOMM Part 3
<Multi_key> <asciicircum> <plus> : "⁺" U207A # SUPERSCRIPT PLUS SIGN
<dead_circumflex> <KP_Add> : "⁺" U207A # SUPERSCRIPT PLUS SIGN
<Multi_key> <asciicircum> <KP_Add> : "⁺" U207A # SUPERSCRIPT PLUS SIGN
-<dead_circumflex> <U2212> : "⁻" U207B # SUPERSCRIPT MINUS
+<dead_circumflex> <minus> : "⁻" U207B # SUPERSCRIPT MINUS
+<dead_circumflex> <U2212> : "⁻" U207B # SUPERSCRIPT MINUS
<Multi_key> <asciicircum> <U2212> : "⁻" U207B # SUPERSCRIPT MINUS
<dead_circumflex> <equal> : "⁼" U207C # SUPERSCRIPT EQUALS SIGN
<Multi_key> <asciicircum> <equal> : "⁼" U207C # SUPERSCRIPT EQUALS SIGN
@@ -5219,7 +5220,6 @@ XCOMM
<dead_cedilla> <U0114> : "Ḝ" U1E1C # LATIN CAPITAL LETTER E WITH CEDILLA AND BREVE
<dead_cedilla> <U0115> : "ḝ" U1E1D # LATIN SMALL LETTER E WITH CEDILLA AND BREVE
<dead_cedilla> <nobreakspace> : "̧" U0327 # COMBINING CEDILLA
-<dead_circumflex> <minus> : "⁻" U207B # SUPERSCRIPT MINUS
<dead_circumflex> <Aacute> : "Ấ" Acircumflexacute # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND ACUTE
<dead_circumflex> <Agrave> : "Ầ" Acircumflexgrave # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND GRAVE
<dead_circumflex> <Ahook> : "Ẩ" Acircumflexhook # LATIN CAPITAL LETTER A WITH CIRCUMFLEX AND HOOK ABOVE
commit 33301cc45e6a2b8aa841ed6325547af970f8c4db
Author: Benno Schulenberg <bensberg@justemail.net>
Date: Sat Sep 7 19:53:38 2013 +0200
nls: Grouping the compose sequences for Dstroke/dstroke together.
Signed-off-by: Benno Schulenberg <bensberg@justemail.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index f3ede3d..015e3bf 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -119,8 +119,6 @@ XCOMM Spaces
<Multi_key> <plus> <minus> : "±" plusminus # PLUS-MINUS SIGN
<Multi_key> <minus> <plus> : "±" plusminus # PLUS-MINUS SIGN
<Multi_key> <question> <question> : "¿" questiondown # INVERTED QUESTION MARK
-<Multi_key> <minus> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <minus> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <s> <s> : "ß" ssharp # LATIN SMALL LETTER SHARP S
<Multi_key> <S> <S> : "ẞ" U1e9e # LATIN CAPITAL LETTER SHARP S
@@ -881,12 +879,14 @@ XCOMM Part 3
<Multi_key> <less> <d> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<Multi_key> <d> <less> : "ď" U010F # LATIN SMALL LETTER D WITH CARON
<dead_stroke> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
+<Multi_key> <minus> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
+<Multi_key> <D> <minus> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <slash> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
<Multi_key> <KP_Divide> <D> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
-<Multi_key> <D> <minus> : "Đ" Dstroke # LATIN CAPITAL LETTER D WITH STROKE
<dead_stroke> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
-<Multi_key> <slash> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
+<Multi_key> <minus> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <d> <minus> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
+<Multi_key> <slash> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
<Multi_key> <KP_Divide> <d> : "đ" dstroke # LATIN SMALL LETTER D WITH STROKE
<dead_macron> <E> : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON
<Multi_key> <macron> <E> : "Ē" U0112 # LATIN CAPITAL LETTER E WITH MACRON
commit 78fe1becb6c18fa33c0d5f04005b45d856f8952a
Author: Gioele Barabucci <gioele@svario.it>
Date: Sun Sep 21 23:05:55 2014 +0200
Add compose sequence for U+20B9 INDIAN RUPEE SIGN
The compose sequence for the new Indian Rupee sign is modelled after
the sequence for the Euro sign.
Signed-off-by: Gioele Barabucci <gioele@svario.it>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 4a96570..f3ede3d 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -200,7 +200,10 @@ XCOMM "₲" U20b2 GUARANI SIGN
XCOMM "₳" U20b3 AUSTRAL SIGN
XCOMM "₴" U20b4 HRYVNIA SIGN
XCOMM "₵" U20b5 CEDI SIGN
-
+<Multi_key> <R> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN
+<Multi_key> <equal> <R> : "₹" U20b9 # INDIAN RUPEE SIGN
+<Multi_key> <r> <equal> : "₹" U20b9 # INDIAN RUPEE SIGN
+<Multi_key> <equal> <r> : "₹" U20b9 # INDIAN RUPEE SIGN
<Multi_key> <bar> <C> : "¢" cent # CENT SIGN
<Multi_key> <bar> <c> : "¢" cent # CENT SIGN
commit 6101b967b641355dd863fd1ce52c6a7d58bcbe68
Author: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
Date: Thu Jul 31 22:23:28 2014 -0300
Add double-arrow compose sequence
Signed-off-by: Gabriel Souza Franco <gabrielfrancosouza@gmail.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/nls/en_US.UTF-8/Compose.pre b/nls/en_US.UTF-8/Compose.pre
index 23829b4..4a96570 100644
--- a/nls/en_US.UTF-8/Compose.pre
+++ b/nls/en_US.UTF-8/Compose.pre
@@ -4535,6 +4535,7 @@ XCOMM Part 3
<Multi_key> <KP_Divide> <U2194> : "↮" U21AE # LEFT RIGHT ARROW WITH STROKE
<Multi_key> <less> <minus> : "←" U2190 # LEFTWARDS ARROW
<Multi_key> <minus> <greater> : "→" U2192 # RIGHTWARDS ARROW
+<Multi_key> <equal> <greater> : "⇒" U21D2 # RIGHTWARDS DOUBLE ARROW
<Multi_key> <U2203> <U0338> : "∄" U2204 # THERE DOES NOT EXIST
<Multi_key> <braceleft> <braceright> : "∅" U2205 # EMPTY SET
<Multi_key> <U2208> <U0338> : "∉" U2209 # NOT AN ELEMENT OF
commit 368a6401c6a3275d3497fec38a3dcbc38cd9df60
Author: James Cloos <cloos@jhcloos.com>
Date: Fri Aug 1 18:30:42 2014 -0400
Add cs_CZ.UTF-8 locale to configure.ac
Commit cf4d5989383a should have included this.
Reported-by: Colin Harrison <colin.harrison@virgin.net>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/configure.ac b/configure.ac
index 1612061..047917d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -431,17 +431,18 @@ AX_DEFINE_DIR(XLOCALEDIR, X11_LOCALEDIR, [Location of libX11 locale data])
AC_SUBST(X11_LOCALEDIR)
locales="\
- am_ET.UTF-8 armscii-8 C el_GR.UTF-8 en_US.UTF-8 fi_FI.UTF-8 \
- georgian-academy georgian-ps ibm-cp1133 iscii-dev isiri-3342 \
- iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 iso8859-15 \
- iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 iso8859-7 \
- iso8859-8 iso8859-9 iso8859-9e ja ja.JIS ja_JP.UTF-8\
- ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r koi8-u \
- ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 microsoft-cp1256 \
- mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 sr_CS.UTF-8 \
- tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn vi_VN.viscii \
- zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 zh_HK.big5 \
- zh_HK.big5hkscs zh_HK.UTF-8 zh_TW zh_TW.big5 zh_TW.UTF-8"
+ am_ET.UTF-8 armscii-8 C cs_CZ.UTF-8 el_GR.UTF-8 en_US.UTF-8 \
+ fi_FI.UTF-8 georgian-academy georgian-ps ibm-cp1133 iscii-dev \
+ isiri-3342 iso8859-1 iso8859-10 iso8859-11 iso8859-13 iso8859-14 \
+ iso8859-15 iso8859-2 iso8859-3 iso8859-4 iso8859-5 iso8859-6 \
+ iso8859-7 iso8859-8 iso8859-9 iso8859-9e ja ja.JIS \
+ ja_JP.UTF-8 ja.SJIS km_KH.UTF-8 ko koi8-c koi8-r \
+ koi8-u ko_KR.UTF-8 microsoft-cp1251 microsoft-cp1255 \
+ microsoft-cp1256 mulelao-1 nokhchi-1 pt_BR.UTF-8 ru_RU.UTF-8 \
+ sr_CS.UTF-8 tatar-cyr th_TH th_TH.UTF-8 tscii-0 vi_VN.tcvn \
+ vi_VN.viscii zh_CN zh_CN.gb18030 zh_CN.gbk zh_CN.UTF-8 \
+ zh_HK.big5 zh_HK.big5hkscs zh_HK.UTF-8 zh_TW zh_TW.big5 \
+ zh_TW.UTF-8"
AC_SUBST(locales)
XKEYSYMDB="${X11_DATADIR}/XKeysymDB"
commit cf4d5989383acc4ed1b7eebadde9f380f2129766
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Jul 29 15:02:56 2014 -0400
Add nls for cs_CZ.UTF-8
Based on the iso8859-2 compose, and a bug report by Vladimír Marek,
override the en_US.UTF-8 use of <dead_caron> <u> to enter »ǔ« instead
to enter »ů«, and likewise for the majuscule, for the Czech locale.
This evidently is the norm for Czech keyboards.
Fixes bz#81875.
The XI18N_OBJS and XLC_LOCALE.pre files are empty, as they are for
several other locales. That may require an update.
Reported-by: Vladimír Marek <vlmarek@volny.cz>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/nls/cs_CZ.UTF-8/Compose.pre b/nls/cs_CZ.UTF-8/Compose.pre
new file mode 100644
index 0000000..022753e
--- /dev/null
+++ b/nls/cs_CZ.UTF-8/Compose.pre
@@ -0,0 +1,12 @@
+XCOMM UTF-8 (Unicode) compose sequences
+XCOMM
+XCOMM Modified for Czech, following iso8859-2/Compose
+XCOMM by James Cloos <cloos@jhcloos.com>
+XCOMM based on bug report by Vladimír Marek <vlmarek@volny.cz>
+
+XCOMM Use the sequences from en_US.UTF-8 as the basis:
+include "X11_LOCALEDATADIR/en_US.UTF-8/Compose"
+
+XCOMM Overriding U with caron:
+<dead_caron> <u> : "ů" U016F # LATIN SMALL LETTER U WITH RING ABOVE
+<dead_caron> <U> : "Ů" U016E # LATIN CAPITAL LETTER U WITH RING ABOVE
diff --git a/nls/cs_CZ.UTF-8/XI18N_OBJS b/nls/cs_CZ.UTF-8/XI18N_OBJS
new file mode 100644
index 0000000..e69de29
diff --git a/nls/cs_CZ.UTF-8/XLC_LOCALE.pre b/nls/cs_CZ.UTF-8/XLC_LOCALE.pre
new file mode 100644
index 0000000..e69de29
commit d9f569572bd14db31921471e7b877523b5cf1e4c
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 26 12:17:47 2014 -0700
Fix source paths for out-of-tree lintlib builds
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index d46b493..ceb8366 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -398,7 +398,7 @@ lintlibdir = $(libdir)
lintlib_DATA = $(LINTLIB)
-lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
+lintlib_src = $(libX11_la_SOURCES) $(srcdir)/xcms/*.c $(srcdir)/xkb/*.c
CLEANFILES += $(lintlib_DATA)
commit 0885cad1e4a9ed57266582be320be55259c881bf
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sun Jul 20 09:21:20 2014 -0700
specs/XKB: Markup fractions as <{super,sub}script> instead of <emphasis>
Matches the way they were styled in original doc, before conversion
to DocBook.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/XKB/ch13.xml b/specs/XKB/ch13.xml
index 654f9df..b07a900 100644
--- a/specs/XKB/ch13.xml
+++ b/specs/XKB/ch13.xml
@@ -747,8 +747,8 @@ Xkb Geometry Data Structures (Overlays)</H5>
<para><programlisting>
typedef struct _XkbGeometry { /* top-level keyboard geometry structure */
Atom name; /* keyboard name */
- unsigned short width_mm; /* keyboard width in <emphasis>mm</emphasis> / <emphasis>10</emphasis> */
- unsigned short height_mm; /* keyboard height in <emphasis>mm</emphasis> / <emphasis>10</emphasis> */
+ unsigned short width_mm; /* keyboard width in <superscript>mm</superscript>/<subscript>10</subscript> */
+ unsigned short height_mm; /* keyboard height in <superscript>mm</superscript>/<subscript>10</subscript> */
char * label_font; /* font for key labels */
XkbColorPtr label_color; /* color for key labels
- pointer into colors array */
@@ -835,8 +835,8 @@ typedef struct _XkbOutline {
<para><programlisting>
typedef struct _XkbBounds {
- short x1, y1; /* upper left corner of the bounds, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- short x2, y2; /* lower right corner of the bounds, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ short x1, y1; /* upper left corner of the bounds, in <superscript>mm</superscript>/<subscript>10</subscript> */
+ short x2, y2; /* lower right corner of the bounds, in <superscript>mm</superscript>/<subscript>10</subscript> */
} <structname>XkbBoundsRec</structname>, *XkbBoundsPtr;
</programlisting></para>
@@ -869,7 +869,7 @@ in the outlines array, as is the default approximating outline.
<para><programlisting>
typedef struct _XkbKey { /* key in a row */
XkbKeyNameRec name; /* key name */
- short gap; /* gap in <emphasis>mm</emphasis>/<emphasis>10</emphasis> from previous key in row */
+ short gap; /* gap in <superscript>mm</superscript>/<subscript>10</subscript> from previous key in row */
unsigned char shape_ndx; /* index of shape for key */
unsigned char color_ndx; /* index of color for key body */
} <structname>XkbKeyRec</structname>, *XkbKeyPtr;
@@ -895,9 +895,7 @@ typedef struct _XkbRow { /* row in a section */
and
<structfield>left</structfield>
are in
-<emphasis>mm</emphasis>
-/
-<emphasis>10</emphasis>.
+<superscript>mm</superscript>/<subscript>10</subscript>.
</para>
<para><programlisting>
@@ -945,8 +943,8 @@ typedef struct _XkbSection {
unsigned char priority; /* drawing priority, 0⇒highest, 255⇒lowest */
short top; /* top coordinate of section origin */
short left; /* left coordinate of row origin */
- unsigned short width; /* section width, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- unsigned short height; /* section height, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ unsigned short width; /* section width, in <superscript>mm</superscript>/<subscript>10</subscript> */
+ unsigned short height; /* section height, in <superscript>mm</superscript>/<subscript>10</subscript> */
short angle; /* angle of section rotation,
counterclockwise */
unsigned short num_rows; /* number of rows in the rows array */
@@ -968,14 +966,10 @@ typedef struct _XkbSection {
and
<structfield>left</structfield>
are the origin of the section, relative to the origin of the keyboard, in
-<emphasis>mm</emphasis>
-/
-<emphasis>10</emphasis>.
+<superscript>mm</superscript>/<subscript>10</subscript>.
<structfield>angle</structfield>
is in
-<emphasis>1</emphasis>
-/
-<emphasis>10</emphasis>
+<superscript>1</superscript>/<subscript>10</subscript>
degrees.
</para>
@@ -1038,10 +1032,10 @@ typedef struct _XkbShapeDoodad {
or <symbol>XkbSolidDoodad</symbol> */
unsigned char priority; /* drawing priority,
0⇒highest, 255⇒lowest */
- short top; /* top coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- short left; /* left coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ short top; /* top coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
+ short left; /* left coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
short angle; /* angle of rotation, clockwise,
- in <emphasis>1</emphasis>/<emphasis>10</emphasis> degrees */
+ in <superscript>1</superscript>/<subscript>10</subscript> degrees */
unsigned short color_ndx; /* doodad color */
unsigned short shape_ndx; /* doodad shape */
} <structname>XkbShapeDoodadRec</structname>, *XkbShapeDoodadPtr;
@@ -1053,12 +1047,12 @@ typedef struct _XkbTextDoodad {
unsigned char type; /* <symbol>XkbTextDoodad</symbol> */
unsigned char priority; /* drawing priority,
0⇒highest, 255⇒lowest */
- short top; /* top coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- short left; /* left coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ short top; /* top coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
+ short left; /* left coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
short angle; /* angle of rotation, clockwise,
- in <emphasis>1</emphasis>/<emphasis>10</emphasis> degrees */
- short width; /* width in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- short height; /* height in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ in <superscript>1</superscript>/<subscript>10</subscript> degrees */
+ short width; /* width in <superscript>mm</superscript>/<subscript>10</subscript> */
+ short height; /* height in <superscript>mm</superscript>/<subscript>10</subscript> */
unsigned short color_ndx; /* doodad color */
char * text; /* doodad text */
char * font; /* arbitrary font name for doodad text */
@@ -1070,10 +1064,10 @@ typedef struct _XkbIndicatorDoodad {
Atom name; /* doodad name */
unsigned char type; /* <symbol>XkbIndicatorDoodad</symbol> */
unsigned char priority; /* drawing priority, 0⇒highest, 255⇒lowest */
- short top; /* top coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- short left; /* left coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ short top; /* top coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
+ short left; /* left coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
short angle; /* angle of rotation, clockwise,
- in <emphasis>1</emphasis>/<emphasis>10</emphasis> degrees */
+ in <superscript>1</superscript>/<subscript>10</subscript> degrees */
unsigned short shape_ndx; /* doodad shape */
unsigned short on_color_ndx; /* color for doodad if indicator is on */
unsigned short off_color_ndx;/* color for doodad if indicator is off */
@@ -1085,10 +1079,10 @@ typedef struct _XkbLogoDoodad {
Atom name; /* doodad name */
unsigned char type; /* <symbol>XkbLogoDoodad</symbol> */
unsigned char priority; /* drawing priority, 0⇒highest, 255⇒lowest */
- short top; /* top coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
- short left; /* left coordinate, in <emphasis>mm</emphasis>/<emphasis>10</emphasis> */
+ short top; /* top coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
+ short left; /* left coordinate, in <superscript>mm</superscript>/<subscript>10</subscript> */
short angle; /* angle of rotation, clockwise,
- in <emphasis>1</emphasis>/<emphasis>10</emphasis> degrees */
+ in <superscript>1</superscript>/<subscript>10</subscript> degrees */
unsigned short color_ndx; /* doodad color */
unsigned short shape_ndx; /* doodad shape */
char * logo_name; /* text for logo */
commit d0a9e9d56bb003315787201ee525b4d00fd54e06
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Jul 19 23:55:47 2014 -0700
specs/XKB: acknowledge my contributions
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/XKB/acknowledgement.xml b/specs/XKB/acknowledgement.xml
index b24c7a6..43be094 100644
--- a/specs/XKB/acknowledgement.xml
+++ b/specs/XKB/acknowledgement.xml
@@ -39,8 +39,10 @@ X Consortium Inc.
This document is made available to you in modern formats such as HTML and PDF
thanks to the efforts of Matt Dew, who converted the original troff sources to
DocBook/XML and edited them into shape; Fernando Carrijo, who converted the
-images to SVG format; and Gaetan Nadon, who set up the formatting machinery in
-the libX11 builds and performed further editing of the DocBook markup.
+images to SVG format; Gaetan Nadon, who set up the formatting machinery in
+the libX11 builds and performed further editing of the DocBook markup; and
+Alan Coopersmith, who converted the DocBook tags to semantic markup and
+cleaned up other formatting issues.
</para>
Reply to: