x11proto-core: Changes to 'debian-unstable'
COPYING | 3
ChangeLog | 268 ++
Sunkeysym.h | 2
XF86keysym.h | 2
Xarch.h | 1
configure.ac | 3
debian/changelog | 10
specs/.gitignore | 1
specs/Makefile.am | 11
specs/SIAddresses/.gitignore | 4
specs/SIAddresses/IPv6.txt | 11
specs/SIAddresses/Makefile.am | 6
specs/SIAddresses/README | 4
specs/SIAddresses/hostname.txt | 11
specs/SIAddresses/localuser.txt | 20
specs/encoding.xml | 416 +--
specs/glossary.xml | 496 ++--
specs/keysyms.xml | 9
specs/sect1-9.xml | 4913 ++++++++++++++++++++--------------------
19 files changed, 3369 insertions(+), 2822 deletions(-)
New commits:
commit c30f3a7f94fc70edd0d57b743d29eb51604ee17e
Author: Robert Hooker <robert.hooker@canonical.com>
Date: Fri Jan 7 11:15:03 2011 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 3740835..4106759 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,271 @@
+commit d25f90fe260f546cdea0ec2ebc84df446eef5f47
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue Dec 7 19:05:26 2010 -0800
+
+ xproto 7.0.20
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 78806c9fc4be8da93581dcbdafbd668cac9f2d8b
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 17:57:24 2010 -0800
+
+ spec: Convert .DS/.DE nroff sections to <literallayout> tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f1309dd259f29357b362c7c40913f33d3c144f49
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 17:37:05 2010 -0800
+
+ spec: Convert some tables that didn't get converted from troff properly
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19e314d95219d64aea079eb9d2b378533b6efdcd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 16:28:48 2010 -0800
+
+ Replace ASCII -> arrows with Unicode ▶
+
+ Matches formatting used in current extension specs like randr
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fa2daaceb0fe5324589b9fca9d156b41697d3a52
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 16:06:37 2010 -0800
+
+ spec: Make request names in text hyperlinks to request definition sections
+
+ Same basic process as previous commit for event names
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 998f64c6c986feee7a745a5169152025b229c6d8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 15:31:21 2010 -0800
+
+ spec: Make event names in text hyperlinks to event definition sections
+
+ Started by taking list of event names and generating a list of perl
+ commands such as:
+ s{^\<emphasis role='bold'\>KeyPress\</emphasis\>}{<link linkend="events:KeyPress"><emphasis role='bold'>KeyPress</emphasis></link>}g;
+
+ and running that with perl -i -p /tmp/e.pl *.xml
+
+ Many of those changes were then manually reverted to avoid having
+ the same link appear multiple times in a paragraph or to avoid having
+ the definition sections link to themselves.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c4be93c2188c9d8b1b186dde4d80ef91b31f4123
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 14:31:08 2010 -0800
+
+ spec: Convert Events chapter into sections
+
+ Started with a similar replace-regexp as the Requests chapter, but
+ with a lot more manual editing due to the sections with multiple
+ events grouped into a set.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eb772110ff1a4f6fc6d574bd23679b0408621ef3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 13:22:04 2010 -0800
+
+ spec: Convert Requests chapter to have a section per request
+
+ Bulk of change performed with emacs replace-regexp:
+ <para id="requests:[^"]+">
+ <emphasis role='bold'>\([^<]+\)</emphasis>
+ <indexterm significance="preferred"><primary>[^<]+</primary></indexterm>
+ </para>
+ with:
+ </section>
+ <section id="requests:\1">
+ <title>\1</title>
+ <indexterm significance="preferred"><primary>\1</primary></indexterm>
+
+ Plus manual editing of the first & last section, and manual
+ conversion of GrabButton & GrabServer due to extra indexterm lines.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 14a0efb08c5e5ca12c8afce213d457e07900b5e6
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 11:45:48 2010 -0800
+
+ spec: Fix a bunch of the .RB -> <emphasis> mappings
+
+ Cleans up the opening { of enum lists that the closing was handled
+ by commit 68bf1a7a0c89
+
+ perl -i -p -e 's{^<emphasis([^>]*)>(\W+?\s+)}{$2<emphasis$1>}g' *.xml
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit c11f17ab7654ff32bcf486db24e36a3620408871
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 01:38:10 2010 -0800
+
+ spec: add more indexterms linking into the body of the document
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19ce91d22578e0a12c4afb4171ae03a497c1fff3
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sat Dec 4 00:21:36 2010 -0800
+
+ spec: move another indexterm in glossary to workaround fop crashing bug
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2406b705e546a97b39b3238bd95f125e0f004993
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Dec 3 22:09:05 2010 -0800
+
+ spec: Change titles of other specs from emphasis to citetitle tags
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 10b0200992ee81c0749a69eeba1a05562d724b3a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Dec 3 22:00:44 2010 -0800
+
+ spec: Fix section title markup in Connection Setup chapter
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 573cf6480727dafa68bd14e5bc725f0b5839f34e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Dec 3 21:49:39 2010 -0800
+
+ spec: Fix section title markup in Protocol Formats chapter
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 79afc5fb996e820eaf437f1dff42df3a7f70810a
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Dec 3 21:42:00 2010 -0800
+
+ spec: convert predefined atom list from table to simplelist
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 68bf1a7a0c89cdc1c48ed967793d083519f2fb96
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Dec 3 16:02:45 2010 -0800
+
+ spec: Fix a bunch of the .BR -> <emphasis> mappings
+
+ perl -i -p -e 's{ (\W*?)\s*</emphasis>}{</emphasis>$1}g' *.xml
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eef13837a6296cbe8d4cd9bda74352769f6a1a66
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Dec 2 15:33:34 2010 -0500
+
+ specs: add ServerInterpreted addresses directory
+
+ Relocated from xorg-docs/specs/SIAddresses
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit fb8a596aec87133500b6ee33b7843d82b09ecdf7
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Nov 29 00:23:38 2010 -0800
+
+ spec: Add glossterm cross reference links to glossary
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ee6ddb4b0e6852df8c07680bd6b1dddaa5c24616
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 28 23:56:12 2010 -0800
+
+ spec: Stopping marking glossary terms as functions when they're not
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 710b9979c9db2d0be0dcc787fa1a9229d2b30636
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 28 23:41:36 2010 -0800
+
+ spec: Finish converting some unconverted index entries in glossary
+
+ Change made by:
+ perl -i -p -e 's{\<\!-- \.IN "([^"]+)" "([^"]+)" "\@DEF\@" --\>}{ <indexterm significance="preferred"><primary>$1</primary><secondary>$2</secondary></indexterm>}' glossary.xml
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit ae571ef20dce0281cd7961663decd9e45838368e
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 28 23:33:54 2010 -0800
+
+ spec: Add id's to glossary entries for use in cross-reference links
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 6bc03d2e9f390638295966714b96ec517ea0b3af
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 28 23:26:53 2010 -0800
+
+ spec: Add cross-reference links in doc ("see ...")
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 2fd776b24ed85865186d40d95e2e9f11831a8e33
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 21 11:46:30 2010 -0800
+
+ Sun's copyrights belong to Oracle now
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit fe7b269fd329201fdbffa12ce7724287c10a3abf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun Nov 21 09:48:52 2010 -0800
+
+ Bug 31132: Xarch.h needs to include <sys/types.h> on Solaris 10
+
+ Workaround older Solaris releases using types from <sys/types.h> in
+ <sys/byteorder.h> and not including it directly.
+ (That was fixed in OpenSolaris/Solaris 11 as part of:
+ http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4483139 )
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Acked-by: Pat Kane <pekane52@gmail.com>
+
+commit 5d3428de974d15357b0ad407f4c5222cfaa8f9f3
+Author: Bastien Nocera <hadess@hadess.net>
+Date: Mon Nov 8 15:24:55 2010 +1000
+
+ Add XF86XK_TouchpadOn/Off
+
+ Those keysyms will be used to report events from the hardware. Hardware
+ like the HP laptops emit 2 separate keycodes when the touchpad is enabled
+ or disabled. So we can catch those in user-space and display a popup.
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=31300
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit d441b9b0230b57159fa8522b80f18a0b87f5aac5
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue Nov 9 15:19:09 2010 -0500
+
+ config: HTML file generation: use the installed copy of xorg.css
+
+ Currenlty the xorg.css file is copied in each location
+ where a DocBook/XML file resides. This produces about
+ 70 copies in the $(docdir) install tree.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit cda6ce66caa01997b9dd32eb8689d6e746558369
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Nov 3 00:04:22 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index ad16741..4a3c874 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-x11proto-core (7.0.19-2) UNRELEASED; urgency=low
+x11proto-core (7.0.20-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* Merge changes from the experimental branch (7.0.17-1 upload).
- -- Julien Cristau <jcristau@debian.org> Sat, 06 Nov 2010 17:54:22 +0100
+ [ Robert Hooker ]
+ * New upstream release. Changes:
+ - 5d3428d... Add XF86XK_TouchpadOn/Off
+ - Various spec updates.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Fri, 07 Jan 2011 11:14:03 -0500
x11proto-core (7.0.19-1) unstable; urgency=low
commit d25f90fe260f546cdea0ec2ebc84df446eef5f47
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Dec 7 19:05:26 2010 -0800
xproto 7.0.20
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index 3b6c4e3..832a6a6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([Xproto], [7.0.19],
+AC_INIT([Xproto], [7.0.20],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 78806c9fc4be8da93581dcbdafbd668cac9f2d8b
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Dec 4 17:57:24 2010 -0800
spec: Convert .DS/.DE nroff sections to <literallayout> tags
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/sect1-9.xml b/specs/sect1-9.xml
index fb6ce6d..91e3cac 100644
--- a/specs/sect1-9.xml
+++ b/specs/sect1-9.xml
@@ -3913,14 +3913,14 @@ is specified or the specified type matches the actual type of the property,
then the return type is the actual type of the property,
the format is the actual format of the property (never zero),
and the bytes-after and value are as follows, given:
-<!-- .DS -->
-N = actual length of the stored property in bytes
-\ \ \ \ (even if the format is 16 or 32)
-I = 4 * long-offset
-T = N - I
-L = MINIMUM(T, 4 * long-length)
-A = N - (I + L)
-<!-- .DE -->
+<literallayout class="monospaced">
+ N = actual length of the stored property in bytes
+ (even if the format is 16 or 32)
+ I = 4 * long-offset
+ T = N - I
+ L = MINIMUM(T, 4 * long-length)
+ A = N - (I + L)
+</literallayout>
</para>
<para>
The returned value starts at byte index I in the property (indexing from 0),
@@ -6161,26 +6161,26 @@ If either min-byte1 or max-byte1 are nonzero,
then both min-char-or-byte2 and max-char-or-byte2 will be less than 256,
and the 2-byte character index values corresponding to char-infos element N
(counting from 0) are:
-<!-- .DS -->
-byte1 = N/D + min-byte1
-byte2 = N\\\\D + min-char-or-byte2
-<!-- .DE -->
+<literallayout class="monospaced">
+ byte1 = N/D + min-byte1
+ byte2 = N\\D + min-char-or-byte2
+</literallayout>
</para>
<para>
where:
-<!-- .DS -->
-D = max-char-or-byte2 - min-char-or-byte2 + 1
-/ = integer division
-\\\\ = integer modulus
-<!-- .DE -->
+<literallayout class="monospaced">
+ D = max-char-or-byte2 - min-char-or-byte2 + 1
+ / = integer division
+ \\ = integer modulus
+</literallayout>
</para>
<para>
If char-infos has length zero,
then min-bounds and max-bounds will be identical,
and the effective char-infos is one filled with this char-info, of length:
-<!-- .DS -->
-L = D * (max-byte1 - min-byte1 + 1)
-<!-- .DE -->
+<literallayout class="monospaced">
+ L = D * (max-byte1 - min-byte1 + 1)
+</literallayout>
</para>
<para>
That is,
@@ -6207,19 +6207,19 @@ nonexistent characters).
The bounding box of the font (that is, the
smallest rectangle enclosing the shape obtained by superimposing all
characters at the same origin [x,y]) has its upper-left coordinate at:
-<!-- .DS -->
-[x + min-bounds.left-side-bearing, y - max-bounds.ascent]
-<!-- .DE -->
+<literallayout class="monospaced">
+ [x + min-bounds.left-side-bearing, y - max-bounds.ascent]
+</literallayout>
with a width of:
-<!-- .DS -->
-max-bounds.right-side-bearing - min-bounds.left-side-bearing
-<!-- .DE -->
+<literallayout class="monospaced">
+ max-bounds.right-side-bearing - min-bounds.left-side-bearing
+</literallayout>
</para>
<para>
and a height of:
-<!-- .DS -->
-max-bounds.ascent + max-bounds.descent
-<!-- .DE -->
+<literallayout class="monospaced">
+ max-bounds.ascent + max-bounds.descent
+</literallayout>
</para>
<para>
The font-ascent is the logical extent of the font above the baseline
@@ -6244,27 +6244,27 @@ For a character origin at [x,y],
the bounding box of a character (that is,
the smallest rectangle enclosing the character's shape), described in
terms of CHARINFO components, is a rectangle with its upper-left corner at:
-<!-- .DS -->
-[x + left-side-bearing, y - ascent]
-<!-- .DE -->
+<literallayout class="monospaced">
+ [x + left-side-bearing, y - ascent]
+</literallayout>
</para>
<para>
with a width of:
-<!-- .DS -->
-right-side-bearing - left-side-bearing
-<!-- .DE -->
+<literallayout class="monospaced">
+ right-side-bearing - left-side-bearing
+</literallayout>
</para>
<para>
and a height of:
-<!-- .DS -->
-ascent + descent
-<!-- .DE -->
+<literallayout class="monospaced">
+ ascent + descent
+</literallayout>
</para>
<para>
and the origin for the next character is defined to be:
-<!-- .DS -->
-[x + character-width, y]
-<!-- .DE -->
+<literallayout class="monospaced">
+ [x + character-width, y]
+</literallayout>
</para>
<para>
Note that the baseline is logically viewed as being just below
@@ -6933,7 +6933,7 @@ so the result is:
</para>
<literallayout class="monospaced">
-((src FUNC dst) AND plane-mask) OR (dst AND (NOT plane-mask))
+ ((src FUNC dst) AND plane-mask) OR (dst AND (NOT plane-mask))
</literallayout>
<para>
@@ -7070,8 +7070,8 @@ width w is a rectangle with vertices at the following real coordinates:
</para>
<literallayout class="monospaced">
-[x1-(w*sn/2), y1+(w*cs/2)], [x1+(w*sn/2), y1-(w*cs/2)],
-[x2-(w*sn/2), y2+(w*cs/2)], [x2+(w*sn/2), y2-(w*cs/2)]
+ [x1-(w*sn/2), y1+(w*cs/2)], [x1+(w*sn/2), y1-(w*cs/2)],
+ [x2-(w*sn/2), y2+(w*cs/2)], [x2+(w*sn/2), y2-(w*cs/2)]
</literallayout>
<para>
@@ -8598,9 +8598,9 @@ This request draws the outlines of the specified rectangles, as if a five-point
were specified for each rectangle:
</para>
<para>
-<!-- .DS -->
-[x,y] [x+width,y] [x+width,y+height] [x,y+height] [x,y]
-<!-- .DE -->
+<literallayout class="monospaced">
+ [x,y] [x+width,y] [x+width,y+height] [x,y+height] [x,y]
+</literallayout>
</para>
<para>
The x and y coordinates of each rectangle are relative to the drawable's origin
@@ -8730,9 +8730,9 @@ the ellipse (for a circle, the angles and coordinate systems are identical).
The relationship between these angles and angles expressed in the normal
coordinate system of the screen (as measured with a protractor) is as
follows:
-<!-- .DS -->
-skewed-angle = atan(tan(normal-angle) * w/h) + adjust
-<!-- .DE -->
+<literallayout class="monospaced">
+ skewed-angle = atan(tan(normal-angle) * w/h) + adjust
+</literallayout>
</para>
<para>
The skewed-angle and normal-angle are expressed in radians (rather
@@ -8952,9 +8952,9 @@ Errors:
This request fills the specified rectangles, as if a four-point
<link linkend="requests:FillPoly"><emphasis role='bold'>FillPoly</emphasis></link>
were specified for each rectangle:
-<!-- .DS -->
-[x,y] [x+width,y] [x+width,y+height] [x,y+height]
-<!-- .DE -->
+<literallayout class="monospaced">
+ [x,y] [x+width,y] [x+width,y+height] [x,y+height]
+</literallayout>
</para>
<para>
The x and y coordinates of each rectangle are relative to the drawable's origin
@@ -9574,21 +9574,21 @@ and specify the baseline starting position (the initial character origin).
The effect is first to fill a destination rectangle with the background
pixel defined in gc and then to paint the text with the foreground pixel.
The upper-left corner of the filled rectangle is at:
-<!-- .DS -->
-[x, y - font-ascent]
-<!-- .DE -->
+<literallayout class="monospaced">
+ [x, y - font-ascent]
+</literallayout>
</para>
<para>
the width is:
-<!-- .DS -->
-overall-width
-<!-- .DE -->
+<literallayout class="monospaced">
+ overall-width
+</literallayout>
</para>
<para>
and the height is:
-<!-- .DS -->
-font-ascent + font-descent
-<!-- .DE -->
+<literallayout class="monospaced">
+ font-ascent + font-descent
+</literallayout>
</para>
<para>
The overall-width, font-ascent, and font-descent are as
@@ -11374,9 +11374,9 @@ The first-keycode must be greater than or equal to min-keycode as returned
in the connection setup (or a
<emphasis role='bold'>Value</emphasis>
error results) and:
-<!-- .DS -->
-first-keycode + (keysyms-length / keysyms-per-keycode) - 1
-<!-- .DE -->
+<literallayout class="monospaced">
+ first-keycode + (keysyms-length / keysyms-per-keycode) - 1
+</literallayout>
</para>
<para>
must be less than or equal to max-keycode as returned in the connection
@@ -11385,9 +11385,9 @@ setup (or a
error results).
KEYSYM number N (counting from zero) for keycode K has an index
(counting from zero) of:
-<!-- .DS -->
-(K - first-keycode) * keysyms-per-keycode + N
-<!-- .DE -->
+<literallayout class="monospaced">
+ (K - first-keycode) * keysyms-per-keycode + N
+</literallayout>
</para>
<para>
in keysyms.
@@ -11468,9 +11468,9 @@ The first-keycode must be greater than or equal to
min-keycode as returned in the connection setup (or a
<emphasis role='bold'>Value</emphasis>
error results), and:
-<!-- .DS -->
-first-keycode + count - 1
-<!-- .DE -->
+<literallayout class="monospaced">
+ first-keycode + count - 1
+</literallayout>
</para>
<para>
must be less than or equal to max-keycode as returned in the connection setup
@@ -11478,16 +11478,16 @@ must be less than or equal to max-keycode as returned in the connection setup
<emphasis role='bold'>Value</emphasis>
error results).
The number of elements in the keysyms list is:
-<!-- .DS -->
-count * keysyms-per-keycode
-<!-- .DE -->
+<literallayout class="monospaced">
+ count * keysyms-per-keycode
+</literallayout>
</para>
<para>
and KEYSYM number N (counting from zero) for keycode K has an index
(counting from zero) of:
-<!-- .DS -->
-(K - first-keycode) * keysyms-per-keycode + N
-<!-- .DE -->
+<literallayout class="monospaced">
+ (K - first-keycode) * keysyms-per-keycode + N
+</literallayout>
</para>
<para>
in keysyms.
@@ -11773,15 +11773,15 @@ Percent can range from -100 to 100 inclusive (or a
<emphasis role='bold'>Value</emphasis>
error results).
The volume at which the bell is rung when percent is nonnegative is:
-<!-- .DS -->
-base - [(base * percent) / 100] + percent
-<!-- .DE -->
+<literallayout class="monospaced">
+ base - [(base * percent) / 100] + percent
+</literallayout>
</para>
<para>
When percent is negative, it is:
-<!-- .DS -->
-base + [(base * percent) / 100]
-<!-- .DE -->
+<literallayout class="monospaced">
+ base + [(base * percent) / 100]
+</literallayout>
<!-- .sp -->
</para>
</section>
commit f1309dd259f29357b362c7c40913f33d3c144f49
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Sat Dec 4 17:37:05 2010 -0800
spec: Convert some tables that didn't get converted from troff properly
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/specs/sect1-9.xml b/specs/sect1-9.xml
index 29d795a..fb6ce6d 100644
--- a/specs/sect1-9.xml
+++ b/specs/sect1-9.xml
@@ -5988,70 +5988,145 @@ The font itself will be freed when no other resource references it.
<title>QueryFont</title>
<indexterm significance="preferred"><primary>QueryFont</primary></indexterm>
<informaltable frame='none'>
- <tgroup cols='1' align='left'>
+ <tgroup cols='3' align='left' rowsep='0'>
<colspec colname='c1' colsep='0'/>
+ <colspec colname='c2' colsep='0'/>
+ <colspec colname='c3' colsep='0'/>
+ <spanspec spanname='all' namest='c1' nameend='c3'/>
<tbody>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<!-- .in +.2i -->
<emphasis remap='I'>font</emphasis>: FONTABLE
<!-- .in -.2i -->
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
▶
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<!-- .in +.2i -->
font-info: FONTINFO
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
char-infos: LISTofCHARINFO
<!-- .in -.2i -->
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry valign='top' morerows='18'>
<!-- .in +.2i -->
where:
-<!-- .IP -->
-<!-- .TS -->
-l lw(3i).
-T{
+ </entry>
+ </row>
+ <row>
+ <entry valign='top' morerows='9'>
FONTINFO:
-T} T{
+ </entry>
+ <entry>
[draw-direction:
{ <emphasis role='bold'>LeftToRight</emphasis>,
-<emphasis role='bold'>RightToLeft</emphasis>}
-T}
- \ min-char-or-byte2, max-char-or-byte2: CARD16
- \ min-byte1, max-byte1: CARD8
- \ all-chars-exist: BOOL
- \ default-char: CARD16
- \ min-bounds: CHARINFO
- \ max-bounds: CHARINFO
- \ font-ascent: INT16
- \ font-descent: INT16
- \ properties: LISTofFONTPROP]
-FONTPROP: [name: ATOM
- \ value: <32-bit-value>]
-CHARINFO: [left-side-bearing: INT16
- \ right-side-bearing: INT16
- \ character-width: INT16
- \ ascent: INT16
- \ descent: INT16
- \ attributes: CARD16]
-<!-- .TE -->
-<!-- .in -.2i -->
+<emphasis role='bold'>RightToLeft</emphasis> }
</entry>
</row>
- <row rowsep='0'>
+ <row>
+ <entry>
+min-char-or-byte2, max-char-or-byte2: CARD16
+ </entry>
+ </row>
+ <row>
+ <entry>
+min-byte1, max-byte1: CARD8
+ </entry>
+ </row>
+ <row>
+ <entry>
+all-chars-exist: BOOL
+ </entry>
+ </row>
+ <row>
+ <entry>
+default-char: CARD16
+ </entry>
+ </row>
+ <row>
+ <entry>
+min-bounds: CHARINFO
+ </entry>
+ </row>
+ <row>
+ <entry>
+max-bounds: CHARINFO
+ </entry>
+ </row>
+ <row>
+ <entry>
+font-ascent: INT16
+ </entry>
+ </row>
+ <row>
+ <entry>
+font-descent: INT16
+ </entry>
+ </row>
+ <row>
+ <entry>
+properties: LISTofFONTPROP]
+ </entry>
+ </row>
+ <row>
+ <entry valign='top' morerows='1'>
+FONTPROP:
+ </entry>
+ <entry>
+[name: ATOM
+ </entry>
+ </row>
+ <row>
+ <entry>
+value: <32-bit-value>]
+ </entry>
+ </row>
+ <row>
+ <entry valign='top' morerows='5'>
+CHARINFO:
+ </entry>
+ <entry>
+[left-side-bearing: INT16
+ </entry>
+ </row>
+ <row>
+ <entry>
+right-side-bearing: INT16
+ </entry>
+ </row>
+ <row>
+ <entry>
+character-width: INT16
+ </entry>
+ </row>
+ <row>
+ <entry>
+ascent: INT16
+ </entry>
+ </row>
+ <row>
+ <entry>
+descent: INT16
+ </entry>
+ </row>
+ <row>
<entry>
+attributes: CARD16]
+ </entry>
+ </row>
+ <row>
+ <entry spanname='all'>
<!-- .in +.2i -->
Errors:
<emphasis role='bold'>Font</emphasis>
@@ -8664,16 +8739,26 @@ The skewed-angle and normal-angle are expressed in radians (rather
than in degrees scaled by 64) in the range [0,2*PI).
The atan returns a value in the range [-PI/2,PI/2].
The adjust is:
-</para>
-<para>
-<!-- .TS -->
-l l.
-0 for normal-angle in the range [0,PI/2)
-PI for normal-angle in the range [PI/2,(3*PI)/2)
-2*PI for normal-angle in the range [(3*PI)/2,2*PI)
-<!-- .TE -->
-</para>
-<para>
+<informaltable frame="none">
+ <tgroup cols='2' align='left' rowsep="0">
+ <colspec colname='c1' colwidth='1*' colsep="0"/>
+ <colspec colname='c2' colwidth='2*' colsep="0"/>
+ <tbody>
+ <row>
+ <entry>0</entry>
+ <entry>for normal-angle in the range [0,PI/2)</entry>
+ </row>
+ <row>
+ <entry>PI</entry>
+ <entry>for normal-angle in the range [PI/2,(3*PI)/2)</entry>
+ </row>
+ <row>
+ <entry>2*PI</entry>
+ <entry>for normal-angle in the range [(3*PI)/2,2*PI)</entry>
+ </row>
+ </tbody>
+ </tgroup>
+</informaltable>
</para>
<para>
The arcs are drawn in the order listed.
@@ -9243,54 +9328,64 @@ It is intended specifically for rudimentary hardcopy support.
<title>PolyText8</title>
<indexterm significance="preferred"><primary>PolyText8</primary></indexterm>
<informaltable frame='none'>
- <tgroup cols='1' align='left'>
+ <tgroup cols='3' align='left' rowsep='0'>
<colspec colname='c1' colsep='0'/>
+ <colspec colname='c2' colsep='0'/>
+ <colspec colname='c3' colsep='0'/>
+ <spanspec spanname='all' namest='c1' nameend='c3'/>
<tbody>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<!-- .in +.2i -->
<emphasis remap='I'>drawable</emphasis>: DRAWABLE
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<emphasis remap='I'>gc</emphasis>: GCONTEXT
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<emphasis remap='I'>x</emphasis>, <emphasis remap='I'>y</emphasis>: INT16
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<emphasis remap='I'>items</emphasis>: LISTofTEXTITEM8
<!-- .in -.2i -->
</entry>
</row>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry valign='top' morerows='3'>
<!-- .in +.2i -->
where:
-<!-- .TS -->
-r l.
-TEXTITEM8: TEXTELT8 or FONT
</entry>
</row>
- <row rowsep='0'>
+ <row>
+ <entry>
+TEXTITEM8:
+ </entry>
<entry>
-TEXTELT8: [delta: INT8
+TEXTELT8 or FONT
</entry>
</row>
- <row rowsep='0'>
+ <row>
+ <entry valign='top' morerows='1'>
+TEXTELT8:
+ </entry>
<entry>
- \ string: STRING8]
-<!-- .TE -->
-<!-- .in -.2i -->
+[delta: INT8
</entry>
</row>
- <row rowsep='0'>
+ <row>
<entry>
+string: STRING8]
+<!-- .in -.2i -->
+ </entry>
+ </row>
+ <row>
+ <entry spanname='all'>
<!-- .in +.2i -->
Errors:
<emphasis role='bold'>Drawable</emphasis>,
@@ -9346,54 +9441,64 @@ tile-stipple-x-origin, tile-stipple-y-origin
<title>PolyText16</title>
<indexterm significance="preferred"><primary>PolyText16</primary></indexterm>
<informaltable frame='none'>
- <tgroup cols='1' align='left'>
+ <tgroup cols='3' align='left' rowsep='0'>
<colspec colname='c1' colsep='0'/>
+ <colspec colname='c2' colsep='0'/>
+ <colspec colname='c3' colsep='0'/>
+ <spanspec spanname='all' namest='c1' nameend='c3'/>
<tbody>
- <row rowsep='0'>
- <entry>
+ <row>
+ <entry spanname='all'>
<!-- .in +.2i -->
<emphasis remap='I'>drawable</emphasis>: DRAWABLE
Reply to: