x11proto-core: Changes to 'debian-unstable'
ChangeLog | 191 ++
Xfuncproto.h.in | 6
Xfuncs.h | 2
Xos.h | 2
configure.ac | 2
debian/changelog | 8
debian/control | 1
debian/rules | 11
debian/x11proto-core-dev.install | 5
docbook.am | 112 -
keysymdef.h | 22
specs/encoding.xml | 72 -
specs/keysyms.xml | 2040 ++++++++++++++--------------
specs/sect1-9.xml | 2763 ++++++++++++++++++++-------------------
specs/x11protocol.xml | 22
15 files changed, 2828 insertions(+), 2431 deletions(-)
New commits:
commit 674c863ca601e8d6a6b57758aff497826d359210
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 14 19:14:26 2012 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4e4c401..caadd03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-x11proto-core (7.0.23-1) UNRELEASED; urgency=low
+x11proto-core (7.0.23-1) unstable; urgency=low
* New upstream release.
* Build pdf docs.
* Set docdir in configure.
- -- Julien Cristau <jcristau@debian.org> Sat, 14 Apr 2012 19:05:32 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Apr 2012 19:14:24 +0200
x11proto-core (7.0.22-1) unstable; urgency=low
commit d72cbe46582ded0c3ee5e638326be6bf8f1f4576
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 14 19:13:59 2012 +0200
Fixup docs filtering for new docdir
diff --git a/debian/rules b/debian/rules
index b4712f9..f8432b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,8 +14,9 @@ override_dh_auto_install:
# Forget no-one:
override_dh_install:
- find debian/tmp/usr/share/doc/xproto -name '*.xml' -delete
- find debian/tmp/usr/share/doc/xproto/ -name '*.db' -delete
+ find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.xml' -delete
+ find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.db' -delete
+ find debian/tmp/usr/share/doc/$(PACKAGE) -name '*.ps' -delete
dh_install --fail-missing
%:
commit a150630714bba07da7f8d00387818a0e13204b09
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Apr 14 19:05:51 2012 +0200
Bump changelogs
diff --git a/ChangeLog b/ChangeLog
index 7a93bb8..92c5502 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,194 @@
+commit 20202784b9700d973d5301f0cb3243eba99fc349
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Thu Mar 15 23:11:19 2012 -0700
+
+ xproto 7.0.23
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ab1fba1a0967ac2289909c3f1a643f876a5dd393
+Author: Marko Myllynen <myllynen@redhat.com>
+Date: Mon Feb 20 17:01:21 2012 +0200
+
+ x11proto: add permille, ezh, and EZH to keysymdef.h
+
+ This patch adds the following mnemonic symbols:
+
+ XK_permille for U+2030 PER MILLE SIGN
+ XK_EZH for U+01B7 LATIN CAPITAL LETTER EZH
+ XK_ezh for U+0292 LATIN SMALL LETTER EZH
+
+ These are the last mnemonic symbols missing from the Finnish keyboard
+ layout. The characters are part of the Finnish standard, ezh is used
+ in Sami and permille sign is used commonly in Finland, probably in
+ other countries as well.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=19687
+
+ Signed-off-by: Marko Myllynen <myllynen@redhat.com>
+ Reviewed-by: Matt Dew <marcoz@osource.org>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 67dd3bfe1ea20473944aec414d9f4b5eba196d8b
+Author: Frédéric Boiteux <fboiteux@calistel.com>
+Date: Wed Nov 30 07:46:54 2011 -0500
+
+ Definition of dead greek symbol
+
+ Define a new dead greek symbol for use in Dvorak-like Bepo keyboard layout.
+
+ FreeDesktop Bug 21475 <https://bugs.freedesktop.org/show_bug.cgi?id=21475>
+
+ Signed-off-by: Frédéric Boiteux <fboiteux@calistel.com>
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit 4769a96385e0eb47550773abb00631af89977320
+Author: Matt Dew <marcoz@osource.org>
+Date: Sun Jan 15 17:17:24 2012 -0700
+
+ informaltable cleanup
+
+ On certain tables, add top and bottom borders to table
+ header and a bottom border to the table. This matches
+ what those tables in the old pdfs looked like.
+
+ the <?dbfo keep-together='always'> prevents tables from
+ splitting across pages. Useful for tiny tables.
+
+ Converting the colwidth to a floating point,
+ IE, 1* -> 1.0* cleans up these build errors:
+ WARNING: table-layout="fixed" and column-width unspecified
+ => falling back to proportional-column-width(1)
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit 7f26709e4bda1154287c27d57cb22465fa815380
+Author: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+Date: Mon Nov 14 17:22:30 2011 -0600
+
+ Cygwin/X: Include <strings.h> early to avoid compile errors
+
+ http://lists.x.org/archives/xorg-devel/2011-November/027117.html
+
+ Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit 3d7be5c61b991a3b33526546acda2ab663cdc1d5
+Author: Matt Dew <marcoz@osource.org>
+Date: Mon Oct 3 18:26:22 2011 -0600
+
+ 1 - fix the capitolization of the ID attriutes to match either the
+ <title> or <funcdef> string it goes with.
+ 2 - fix any <linkend>'s that were affected by 1.
+ 3 - any <function> in the docs that has an actual funcdef,
+ will become an olink.
+
+ Signed-off-by: Matt Dew <marcoz@osource.org>
+
+commit f5d77f49dbd99d54324a6f1807b872d800abddf7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 21 15:52:39 2011 -0400
+
+ x11proto spec: fix copyright markup
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 8cf26b29001b1fe87cce6b56433ffe7874c7e234
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 14 14:49:03 2011 -0400
+
+ spec: remove duplicate Copyright line
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit aefda8ec34ef64aef43015e6e31ea908da38c4c7
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Mon Sep 12 11:06:29 2011 -0400
+
+ docs: use the &fullrelvers; entity to set X11 release information
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit a4fca029b5ace31e56941970151c226e221e1dcf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Sun Sep 11 19:49:54 2011 -0400
+
+ docs: remove <productnumber> which is not used by default
+
+ This element is not rendered by default on the title. A template
+ customization is required to display it.
+ X Window System does not have a product number.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit acd12d6096bad0d0e45b34f52ae92cc32f8ba7bf
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Sep 8 20:00:00 2011 -0400
+
+ docbook.am: embed css styles inside the HTML HEAD element
+
+ Rather than referring to the external xorg.css stylesheet, embed the content
+ of the file in the html output produced. This is accomplished by using
+ version 1.10 of xorg-xhtml.xsl.
+
+ This makes the whole html docs tree much more relocatable.
+ In addition, it eliminates xorg.css as a runtime file which makes
+ xorg-sgml-doctools a build time only package.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit bd46f6d09c849335574ac84a0aa2de7c28daa552
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Sep 7 10:31:04 2011 -0400
+
+ docbook.am: global maintenance update - entities, images and olinking
+
+ Adding support in libX11 for html chunking caused a reorg of docbook.am
+ as well as the xorg-sgml-doctools masterdb for olinking.
+ The parameter img.src.path is added for pdf images.
+ A searchpath to the root builddir is added for local entities, if present.
+
+ The docbook.am makefile hides all the details and is identical for
+ all 22 modules having DocBook documentation. It is included by a thin
+ Makefile.am which requires no docbook knowledge.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit c270f8bed465daff386967c5586eb3c8490b86e0
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Aug 26 13:55:29 2011 -0700
+
+ Fix Xfuncproto.h to work when #included in a C89-mode compilation
+
+ Variable argument macros are not supported in C89, only C99 or a
+ compiler-specific extension like gcc's. Even just defining the
+ macro causes builds with C89 compilers to fail, as they can't
+ figure out how to handle #define _X_NONNULL(...), so only define
+ the fallback for C99 compilers.
+
+ Since this means C89 compilers will see _X_NONNULL unexpanded in
+ sources, add a comment to remind users that this should only be
+ used with #ifdef _X_NONNULL guards in public/exported API headers
+ we install for other software to compile against, so that we don't
+ break their builds.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Julien Cristau <jcristau@debian.org>
+
+commit 06ebd5b88bee8c54222bde3178dc773776036802
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Jun 29 09:24:51 2011 -0400
+
+ Add some keysyms to support Breton’s n-graphs.
+
+ These keysyms are necessary for XIM to support single-keystroke
+ multiple-character keys on Breton C’HWERTY keyboards.
+
+ Addresses: https://bugs.freedesktop.org/show_bug.cgi?id=34453
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+ Reviewed-by: Daniel Stone <daniel@fooishbar.org>
+
commit 42c16165df536f74d1177eae2b94f96b3ebbdfb2
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Jun 23 09:28:57 2011 +1000
diff --git a/debian/changelog b/debian/changelog
index 49cb1d1..4e4c401 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,10 @@
-x11proto-core (7.0.22-2) UNRELEASED; urgency=low
+x11proto-core (7.0.23-1) UNRELEASED; urgency=low
+ * New upstream release.
* Build pdf docs.
* Set docdir in configure.
- -- Julien Cristau <jcristau@debian.org> Sat, 14 Apr 2012 18:57:42 +0200
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Apr 2012 19:05:32 +0200
x11proto-core (7.0.22-1) unstable; urgency=low
commit bcb52c94601fa8a4b937a3b9139d63dcfc764837
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 6 19:32:32 2010 +0100
Set docdir in configure.
diff --git a/debian/changelog b/debian/changelog
index 1663556..49cb1d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
x11proto-core (7.0.22-2) UNRELEASED; urgency=low
* Build pdf docs.
+ * Set docdir in configure.
-- Julien Cristau <jcristau@debian.org> Sat, 14 Apr 2012 18:57:42 +0200
diff --git a/debian/rules b/debian/rules
index 1e4eedc..b4712f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,12 @@
#!/usr/bin/make -f
+PACKAGE = x11proto-core-dev
+
# Build html and txt only:
override_dh_auto_configure:
- dh_auto_configure -- --with-xmlto --with-fop
+ dh_auto_configure -- \
+ --docdir=\$${prefix}/share/doc/$(PACKAGE) \
+ --with-xmlto --with-fop
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
diff --git a/debian/x11proto-core-dev.install b/debian/x11proto-core-dev.install
index 5a48776..70e845c 100644
--- a/debian/x11proto-core-dev.install
+++ b/debian/x11proto-core-dev.install
@@ -1,5 +1,5 @@
usr/include/X11/*
usr/lib/pkgconfig/xproto.pc /usr/share/pkgconfig
-usr/share/doc/xproto/*.html usr/share/doc/x11proto-core-dev/
-usr/share/doc/xproto/*.txt usr/share/doc/x11proto-core-dev/
-usr/share/doc/xproto/*.pdf usr/share/doc/x11proto-core-dev/
+usr/share/doc/x11proto-core-dev/*.html
+usr/share/doc/x11proto-core-dev/*.txt
+usr/share/doc/x11proto-core-dev/*.pdf
commit 2e1f9e1d5afe208b0cf5470cdcfee16d13484aca
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Nov 6 19:31:00 2010 +0100
Build pdf docs.
diff --git a/debian/changelog b/debian/changelog
index 8606129..1663556 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.22-2) UNRELEASED; urgency=low
+
+ * Build pdf docs.
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 14 Apr 2012 18:57:42 +0200
+
x11proto-core (7.0.22-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index a9ba311..90ecff9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
xorg-sgml-doctools (>= 1:1.8),
w3m,
xsltproc,
+ fop,
Standards-Version: 3.9.2
Vcs-Git: git://git.debian.org/git/pkg-xorg/proto/x11proto-core
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/proto/x11proto-core.git
diff --git a/debian/rules b/debian/rules
index 7ef4c94..1e4eedc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
# Build html and txt only:
override_dh_auto_configure:
- dh_auto_configure -- --with-xmlto --without-fop
+ dh_auto_configure -- --with-xmlto --with-fop
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
diff --git a/debian/x11proto-core-dev.install b/debian/x11proto-core-dev.install
index 85d5972..5a48776 100644
--- a/debian/x11proto-core-dev.install
+++ b/debian/x11proto-core-dev.install
@@ -2,3 +2,4 @@ usr/include/X11/*
usr/lib/pkgconfig/xproto.pc /usr/share/pkgconfig
usr/share/doc/xproto/*.html usr/share/doc/x11proto-core-dev/
usr/share/doc/xproto/*.txt usr/share/doc/x11proto-core-dev/
+usr/share/doc/xproto/*.pdf usr/share/doc/x11proto-core-dev/
commit 20202784b9700d973d5301f0cb3243eba99fc349
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Mar 15 23:11:19 2012 -0700
xproto 7.0.23
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index dad03e3..4bd61fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.22],
+AC_INIT([Xproto], [7.0.23],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit ab1fba1a0967ac2289909c3f1a643f876a5dd393
Author: Marko Myllynen <myllynen@redhat.com>
Date: Mon Feb 20 17:01:21 2012 +0200
x11proto: add permille, ezh, and EZH to keysymdef.h
This patch adds the following mnemonic symbols:
XK_permille for U+2030 PER MILLE SIGN
XK_EZH for U+01B7 LATIN CAPITAL LETTER EZH
XK_ezh for U+0292 LATIN SMALL LETTER EZH
These are the last mnemonic symbols missing from the Finnish keyboard
layout. The characters are part of the Finnish standard, ezh is used
in Sami and permille sign is used commonly in Finland, probably in
other countries as well.
https://bugs.freedesktop.org/show_bug.cgi?id=19687
Signed-off-by: Marko Myllynen <myllynen@redhat.com>
Reviewed-by: Matt Dew <marcoz@osource.org>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/keysymdef.h b/keysymdef.h
index 8d3ada2..ae73977 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -102,13 +102,13 @@ SOFTWARE.
* does not represent any existing Unicode character.
*
* When adding new keysyms to this file, do not forget to also update the
- * following:
+ * following as needed:
*
* - the mappings in src/KeyBind.c in the repo
- * git://anongit.freedesktop.org/xorg/lib/libX11
+ * git://anongit.freedesktop.org/xorg/lib/libX11.git
*
- * - the protocol specification in specs/XProtocol/X11.keysyms
- * in the repo git://anongit.freedesktop.org/xorg/doc/xorg-docs
+ * - the protocol specification in specs/keysyms.xml
+ * in the repo git://anongit.freedesktop.org/xorg/proto/x11proto.git
*
*/
@@ -1469,6 +1469,7 @@ SOFTWARE.
#define XK_leftdoublequotemark 0x0ad2 /* U+201C LEFT DOUBLE QUOTATION MARK */
#define XK_rightdoublequotemark 0x0ad3 /* U+201D RIGHT DOUBLE QUOTATION MARK */
#define XK_prescription 0x0ad4 /* U+211E PRESCRIPTION TAKE */
+#define XK_permille 0x0ad5 /* U+2030 PER MILLE SIGN */
#define XK_minutes 0x0ad6 /* U+2032 PRIME */
#define XK_seconds 0x0ad7 /* U+2033 DOUBLE PRIME */
#define XK_latincross 0x0ad9 /* U+271D LATIN CROSS */
@@ -1972,6 +1973,8 @@ SOFTWARE.
#define XK_obarred 0x1000275 /* U+0275 LATIN SMALL LETTER BARRED O */
#define XK_SCHWA 0x100018f /* U+018F LATIN CAPITAL LETTER SCHWA */
#define XK_schwa 0x1000259 /* U+0259 LATIN SMALL LETTER SCHWA */
+#define XK_EZH 0x10001b7 /* U+01B7 LATIN CAPITAL LETTER EZH */
+#define XK_ezh 0x1000292 /* U+0292 LATIN SMALL LETTER EZH */
/* those are not really Caucasus */
/* For Inupiak */
#define XK_Lbelowdot 0x1001e36 /* U+1E36 LATIN CAPITAL LETTER L WITH DOT BELOW */
diff --git a/specs/keysyms.xml b/specs/keysyms.xml
index 9c88ce7..e2fa0d0 100644
--- a/specs/keysyms.xml
+++ b/specs/keysyms.xml
@@ -4375,6 +4375,12 @@ already been deprecated by the introduction of the Unicode KEYSYMs.
<entry>Publish</entry>
</row>
<row>
+ <entry>#x0AD5</entry>
+ <entry>U+2030</entry>
+ <entry>PER MILLE SIGN</entry>
+ <entry>Publish</entry>
+ </row>
+ <row>
<entry>#x0AD6</entry>
<entry>U+2032</entry>
<entry>MINUTES</entry>
commit 67dd3bfe1ea20473944aec414d9f4b5eba196d8b
Author: Frédéric Boiteux <fboiteux@calistel.com>
Date: Wed Nov 30 07:46:54 2011 -0500
Definition of dead greek symbol
Define a new dead greek symbol for use in Dvorak-like Bepo keyboard layout.
FreeDesktop Bug 21475 <https://bugs.freedesktop.org/show_bug.cgi?id=21475>
Signed-off-by: Frédéric Boiteux <fboiteux@calistel.com>
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/keysymdef.h b/keysymdef.h
index f96bc09..8d3ada2 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -428,6 +428,8 @@ SOFTWARE.
#define XK_dead_small_schwa 0xfe8a
#define XK_dead_capital_schwa 0xfe8b
+#define XK_dead_greek 0xfe8c
+
#define XK_First_Virtual_Screen 0xfed0
#define XK_Prev_Virtual_Screen 0xfed1
#define XK_Next_Virtual_Screen 0xfed2
commit 4769a96385e0eb47550773abb00631af89977320
Author: Matt Dew <marcoz@osource.org>
Date: Sun Jan 15 17:17:24 2012 -0700
informaltable cleanup
On certain tables, add top and bottom borders to table
header and a bottom border to the table. This matches
what those tables in the old pdfs looked like.
the <?dbfo keep-together='always'> prevents tables from
splitting across pages. Useful for tiny tables.
Converting the colwidth to a floating point,
IE, 1* -> 1.0* cleans up these build errors:
WARNING: table-layout="fixed" and column-width unspecified
=> falling back to proportional-column-width(1)
Signed-off-by: Matt Dew <marcoz@osource.org>
diff --git a/specs/encoding.xml b/specs/encoding.xml
index 582a8d2..0c6ef02 100644
--- a/specs/encoding.xml
+++ b/specs/encoding.xml
@@ -303,100 +303,100 @@ the set.
</variablelist>
<informaltable frame='none'>
- <tgroup cols='1' align='left'>
- <colspec colname='c1' colsep="0"/>
+ <tgroup cols='1' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
<tbody>
- <row rowsep='0'>
+ <row>
<entry>
BITMASK: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
WINDOW: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
PIXMAP: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
CURSOR: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
FONT: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
GCONTEXT: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
COLORMAP: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
DRAWABLE: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
FONTABLE: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
ATOM: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
VISUALID: CARD32
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
BYTE: 8-bit value
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
INT8: 8-bit signed integer
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
INT16: 16-bit signed integer
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
INT32: 32-bit signed integer
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
CARD8: 8-bit unsigned integer
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
CARD16: 16-bit unsigned integer
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
CARD32: 32-bit unsigned integer
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
TIMESTAMP: CARD32
</entry>
diff --git a/specs/keysyms.xml b/specs/keysyms.xml
index a28814e..9c88ce7 100644
--- a/specs/keysyms.xml
+++ b/specs/keysyms.xml
@@ -50,15 +50,16 @@ They are used to indicate the absence of symbols (see
</para>
<informaltable frame="topbot">
- <tgroup cols='6' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
- <colspec colname='c3' colsep="0"/>
- <colspec colname='c4' colsep="0"/>
- <colspec colname='c5' colsep="0"/>
- <colspec colname='c6' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='6' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='1.0*'/>
+ <colspec colname='c3' colwidth='1.0*'/>
+ <colspec colname='c4' colwidth='1.0*'/>
+ <colspec colname='c5' colwidth='1.0*'/>
+ <colspec colname='c6' colwidth='1.0*'/>
<thead>
- <row rowsep="1">
+ <row rowsep='1'>
<entry>Byte 1</entry>
<entry>Byte 2</entry>
<entry>Byte 3</entry>
@@ -68,7 +69,7 @@ They are used to indicate the absence of symbols (see
</row>
</thead>
<tbody>
- <row rowsep="0">
+ <row>
<entry>0</entry>
<entry>0</entry>
<entry>0</entry>
@@ -76,7 +77,7 @@ They are used to indicate the absence of symbols (see
<entry>#x00000000</entry>
<entry><keysym>NoSymbol</keysym></entry>
</row>
- <row rowsep="0">
+ <row>
<entry>0</entry>
<entry>255</entry>
<entry>255</entry>
@@ -134,25 +135,26 @@ sets within which byte 4 identifies the individual function key.
</para>
<informaltable frame="topbot">
- <tgroup cols='2' align='left'>
- <colspec colname='c1' colsep="0"/>
- <colspec colname='c2' colsep="0"/>
+ <?dbfo keep-together="always" ?>
+ <tgroup cols='2' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='1.0*'/>
<thead>
- <row rowsep="1">
+ <row rowsep='1'>
<entry>Byte 3</entry>
<entry>Byte 4</entry>
</row>
</thead>
<tbody>
- <row rowsep="0">
+ <row>
<entry>255</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>254</entry>
<entry>Keyboard (XKB) Extension</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>253</entry>
<entry>3270</entry>
</row>
@@ -238,10 +240,10 @@ distinguishable semantics associated with them.
</para>
<informaltable frame="topbot">
- <tgroup cols='3' align='left'>
- <colspec colname='c1' colwidth='1*' colsep="0"/>
- <colspec colname='c2' colwidth='3*' colsep="0"/>
- <colspec colname='c3' colwidth='1*' colsep="0"/>
+ <tgroup cols='3' align='left' colsep='0' rowsep='0'>
+ <colspec colname='c1' colwidth='1.0*'/>
+ <colspec colname='c2' colwidth='3.0*'/>
+ <colspec colname='c3' colwidth='1.0*'/>
<thead>
<row rowsep="1">
<entry>KEYSYM value</entry>
@@ -250,742 +252,742 @@ distinguishable semantics associated with them.
</row>
</thead>
<tbody>
- <row rowsep="0">
+ <row>
<entry>#xFF08</entry>
<entry>BACKSPACE, BACK SPACE, BACK CHAR</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF09</entry>
<entry>TAB</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF0A</entry>
<entry>LINEFEED, LF</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF0B</entry>
<entry>CLEAR</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF0D</entry>
<entry>RETURN, ENTER</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF13</entry>
<entry>PAUSE, HOLD</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF14</entry>
<entry>SCROLL LOCK</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF15</entry>
<entry>SYS REQ, SYSTEM REQUEST</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF1B</entry>
<entry>ESCAPE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF20</entry>
<entry>MULTI-KEY CHARACTER PREFACE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF21</entry>
<entry>KANJI, KANJI CONVERT</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF22</entry>
<entry>MUHENKAN</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF23</entry>
<entry>HENKAN MODE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF24</entry>
<entry>ROMAJI</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF25</entry>
<entry>HIRAGANA</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF26</entry>
<entry>KATAKANA</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF27</entry>
<entry>HIRAGANA/KATAKANA TOGGLE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF28</entry>
<entry>ZENKAKU</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF29</entry>
<entry>HANKAKU</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF2A</entry>
<entry>ZENKAKU/HANKAKU TOGGLE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF2B</entry>
<entry>TOUROKU</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF2C</entry>
<entry>MASSYO</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF2D</entry>
<entry>KANA LOCK</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF2E</entry>
<entry>KANA SHIFT</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF2F</entry>
<entry>EISU SHIFT</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF30</entry>
<entry>EISU TOGGLE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF31</entry>
<entry>HANGUL START/STOP (TOGGLE)</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF32</entry>
<entry>HANGUL START</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF33</entry>
<entry>HANGUL END, ENGLISH START</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF34</entry>
<entry>START HANGUL/HANJA CONVERSION</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF35</entry>
<entry>HANGUL JAMO MODE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF36</entry>
<entry>HANGUL ROMAJA MODE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF37</entry>
<entry>HANGUL CODE INPUT</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF38</entry>
<entry>HANGUL JEONJA MODE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF39</entry>
<entry>HANGUL BANJA MODE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF3A</entry>
<entry>HANGUL PREHANJA CONVERSION</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF3B</entry>
<entry>HANGUL POSTHANJA CONVERSION</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF3C</entry>
<entry>HANGUL SINGLE CANDIDATE</entry>
<entry>Keyboard</entry>
</row>
- <row rowsep="0">
+ <row>
<entry>#xFF3D</entry>
<entry>HANGUL MULTIPLE CANDIDATE</entry>
<entry>Keyboard</entry>
</row>
Reply to: