summaryrefslogtreecommitdiff
path: root/specs
diff options
context:
space:
mode:
authorJames Cloos <cloos@jhcloos.com>2011-05-20 15:51:46 -0400
committerJames Cloos <cloos@jhcloos.com>2011-05-20 17:37:44 -0400
commitef0019c714c273cb9b4ad3eba52d0b905109826b (patch)
tree406e8deae2635e667754eb871f7699ff523c7a4d /specs
parent761b8aa0c9b3c58c478ac5ea1b3aaafadcfc1325 (diff)
downloadxorg-lib-libX11-ef0019c714c273cb9b4ad3eba52d0b905109826b.tar.gz
Expand latin ligatures out to their NFKC equivalents.
Ligatures should be done by the typesetting system. Manuscripts should not bother with them. Signed-off-by: James Cloos <cloos@jhcloos.com> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'specs')
-rw-r--r--specs/libX11/CH01.xml2
-rw-r--r--specs/libX11/CH03.xml2
-rw-r--r--specs/libX11/CH06.xml2
-rw-r--r--specs/libX11/CH07.xml2
-rw-r--r--specs/libX11/CH09.xml2
-rw-r--r--specs/libX11/CH13.xml16
-rw-r--r--specs/libX11/CH14.xml4
7 files changed, 15 insertions, 15 deletions
diff --git a/specs/libX11/CH01.xml b/specs/libX11/CH01.xml
index 7d03389b..7a2d115d 100644
--- a/specs/libX11/CH01.xml
+++ b/specs/libX11/CH01.xml
@@ -27,7 +27,7 @@ those provided by the toolkits for X) are built on top of the Xlib
library. For further information about these higher-level libraries,
see the appropriate toolkit documentation.
The <citetitle>X Window System Protocol</citetitle> provides the
-definitive word on the behavior of X.
+definitive word on the behavior of X.
Although additional information appears here, the protocol document is
the ruling document.
</para>
diff --git a/specs/libX11/CH03.xml b/specs/libX11/CH03.xml
index 700c7cb9..36768e2b 100644
--- a/specs/libX11/CH03.xml
+++ b/specs/libX11/CH03.xml
@@ -2295,7 +2295,7 @@ structure are:
<!-- .LP -->
<literallayout class="monospaced">
-/* Configure window value mask bits */
+/* Configure window value mask bits */
#define CWX (1&lt;&lt;0)
#define CWY (1&lt;&lt;1)
#define CWWidth (1&lt;&lt;2)
diff --git a/specs/libX11/CH06.xml b/specs/libX11/CH06.xml
index 832a4101..a3056713 100644
--- a/specs/libX11/CH06.xml
+++ b/specs/libX11/CH06.xml
@@ -273,7 +273,7 @@ The following macros define standard formats.
</para>
<literallayout class="monospaced">
-#define XcmsUndefinedFormat 0x00000000
+#define XcmsUndefinedFormat 0x00000000
#define XcmsCIEXYZFormat 0x00000001 /* CIE XYZ */
#define XcmsCIEuvYFormat 0x00000002 /* CIE u'v'Y */
#define XcmsCIExyYFormat 0x00000003 /* CIE xyY */
diff --git a/specs/libX11/CH07.xml b/specs/libX11/CH07.xml
index 201680db..bfa97851 100644
--- a/specs/libX11/CH07.xml
+++ b/specs/libX11/CH07.xml
@@ -14,7 +14,7 @@ Sharing of GCs is highly discouraged because the library may cache GC state.
</para>
<para>
Graphics operations can be performed to either windows or pixmaps, which collectively are
-called drawables. Each drawable exists on a single screen. A GC is created for a specific screen
+called drawables. Each drawable exists on a single screen. A GC is created for a specific screen
and drawable depth and can only be used with drawables of matching screen and depth.
</para>
<para>
diff --git a/specs/libX11/CH09.xml b/specs/libX11/CH09.xml
index 413762f2..51f980f0 100644
--- a/specs/libX11/CH09.xml
+++ b/specs/libX11/CH09.xml
@@ -5,7 +5,7 @@
<title>Window and Session Manager Functions</title>
<para>
-Although it is difficult to categorize functions as exclusively for an application,
+Although it is difficult to categorize functions as exclusively for an application,
a window manager, or a session manager, the functions in this chapter are most
often used by window managers and session managers. It is not expected that
these functions will be used by most application programs. Xlib provides
diff --git a/specs/libX11/CH13.xml b/specs/libX11/CH13.xml
index 9525750b..19627980 100644
--- a/specs/libX11/CH13.xml
+++ b/specs/libX11/CH13.xml
@@ -8,7 +8,7 @@
An internationalized application is one that is adaptable to the requirements of different native
languages, local customs, and character string encodings. The process of adapting the operation
to a particular native language, local custom, or string encoding is called localization. A goal of
-internationalization is to permit localization without program source modifications or recompilation.
+internationalization is to permit localization without program source modifications or recompilation.
</para>
<para>
As one of the localization mechanisms, Xlib provides an X Input Method (<acronym>XIM</acronym>)
@@ -16,13 +16,13 @@ functional interface for internationalized text input and an X Output Method
(<acronym>XOM</acronym>) functional interface for internationalized text output.
</para>
<para>
-Internationalization in X is based on the concept of a locale. A locale defines the localized
+Internationalization in X is based on the concept of a locale. A locale defines the localized
behavior of a program at run time. Locales affect Xlib in its:
</para>
<itemizedlist>
<listitem><para>Encoding and processing of input method text</para></listitem>
- <listitem><para>Encoding of resource files and values</para></listitem>
+ <listitem><para>Encoding of resource files and values</para></listitem>
<listitem><para>Encoding and imaging of text strings</para></listitem>
<listitem><para>Encoding and decoding for inter-client text communication</para></listitem>
</itemizedlist>
@@ -36,7 +36,7 @@ Different languages have different encodings, and there are even different
encodings for the same characters in the same language.
</para>
<para>
-This chapter defines support for localized text imaging and text input and describes the locale
+This chapter defines support for localized text imaging and text input and describes the locale
mechanism that controls all locale-dependent Xlib functions. Sets of functions are provided for
multibyte (char *) text as well as wide character (wchar_t) text in the form supported by the host
C language environment. The multibyte and wide character functions are equivalent except for
@@ -54,7 +54,7 @@ The remainder of this chapter discusses:
<itemizedlist>
<listitem><para>X locale management</para></listitem>
- <listitem><para>Locale and modifier dependencies</para></listitem>
+ <listitem><para>Locale and modifier dependencies</para></listitem>
<listitem><para>Variable argument lists</para></listitem>
<listitem><para>Output methods</para></listitem>
<listitem><para>Input methods</para></listitem>
@@ -9359,10 +9359,10 @@ typedef unsigned long XIMFeedback;
#define XIMVisibleToBackward (1L&lt;&lt;9)
#define XIMVisibleToCenter (1L&lt;&lt;10)
-*† The values for XIMPrimary, XIMSecondary, and XIMTertiary were incorrectly defined in
-the R5 specification. The X Consortium’s X11R5 implementation correctly
+*† The values for XIMPrimary, XIMSecondary, and XIMTertiary were incorrectly defined in
+the R5 specification. The X Consortium’s X11R5 implementation correctly
implemented the values for these highlights. The value of these highlights has
-been corrected in this specification to agree with the values in the
+been corrected in this specification to agree with the values in the
Consortium’s X11R5 and X11R6 implementations.
</literallayout>
diff --git a/specs/libX11/CH14.xml b/specs/libX11/CH14.xml
index 62836774..9c5ef070 100644
--- a/specs/libX11/CH14.xml
+++ b/specs/libX11/CH14.xml
@@ -12,8 +12,8 @@ see the Inter-Client Communication Conventions Manual.
</para>
<para>
Xlib provides a number of standard properties and programming interfaces that are <acronym>ICCCM</acronym>
-compliant. The predefined atoms for some of these properties are defined in the &lt;X11/Xatom.h&gt;
-header file, where to avoid name conflicts with user symbols their #define name has an XA_ prefix.
+compliant. The predefined atoms for some of these properties are defined in the &lt;X11/Xatom.h&gt;
+header file, where to avoid name conflicts with user symbols their #define name has an XA_ prefix.
For further information about atoms and properties, see section 4.3.
</para>
<para>