X Strike Force SVN commit: rev 292 - in branches/4.3.0/sid/debian: . patches
Author: ishikawa
Date: 2003-07-06 05:48:17 -0500 (Sun, 06 Jul 2003)
New Revision: 292
Added:
branches/4.3.0/sid/debian/patches/065_Xft1_manpage_conflict.diff
Modified:
branches/4.3.0/sid/debian/MANIFEST.alpha
branches/4.3.0/sid/debian/MANIFEST.arm
branches/4.3.0/sid/debian/MANIFEST.hppa
branches/4.3.0/sid/debian/MANIFEST.hurd-i386
branches/4.3.0/sid/debian/MANIFEST.i386
branches/4.3.0/sid/debian/MANIFEST.ia64
branches/4.3.0/sid/debian/MANIFEST.mips
branches/4.3.0/sid/debian/MANIFEST.mipsel
branches/4.3.0/sid/debian/MANIFEST.powerpc
branches/4.3.0/sid/debian/MANIFEST.s390
branches/4.3.0/sid/debian/MANIFEST.sparc
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/xlibs-dev.install
branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386
branches/4.3.0/sid/debian/xlibs-dev.install.s390
Log:
Fix Xft1 manpage name conflict problem
patch #065: new
- man page Xft.man under xc/lib/Xft1 is simply renamed to
Xft1.man
MANIFEST.*: update
- include adapt patch #065 change
xlibs-dev.install{,.s390,hurd-i386}: update
- nstall usr/X11R6/man/man3/Xft1.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.alpha
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.alpha 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.alpha 2003-07-06 10:48:17 UTC (rev 292)
@@ -6895,7 +6895,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.arm
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.arm 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.arm 2003-07-06 10:48:17 UTC (rev 292)
@@ -6882,7 +6882,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.hppa
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hppa 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.hppa 2003-07-06 10:48:17 UTC (rev 292)
@@ -6776,7 +6776,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.hurd-i386
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.hurd-i386 2003-07-06 10:48:17 UTC (rev 292)
@@ -6733,7 +6733,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.i386
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.i386 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.i386 2003-07-06 10:48:17 UTC (rev 292)
@@ -6920,7 +6920,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.ia64
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.ia64 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.ia64 2003-07-06 10:48:17 UTC (rev 292)
@@ -6917,7 +6917,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.mips
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mips 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.mips 2003-07-06 10:48:17 UTC (rev 292)
@@ -6777,7 +6777,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.mipsel
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.mipsel 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.mipsel 2003-07-06 10:48:17 UTC (rev 292)
@@ -6777,7 +6777,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.powerpc
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.powerpc 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.powerpc 2003-07-06 10:48:17 UTC (rev 292)
@@ -6892,7 +6892,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.s390
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.s390 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.s390 2003-07-06 10:48:17 UTC (rev 292)
@@ -6676,7 +6676,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/MANIFEST.sparc
==============================================================================
--- branches/4.3.0/sid/debian/MANIFEST.sparc 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/MANIFEST.sparc 2003-07-06 10:48:17 UTC (rev 292)
@@ -6906,7 +6906,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
-usr/X11R6/man/man3/Xft.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/changelog
==============================================================================
--- branches/4.3.0/sid/debian/changelog 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/changelog 2003-07-06 10:48:17 UTC (rev 292)
@@ -60,6 +60,11 @@
- patch #048 updated with new patch from XFree86 Bugzilla, via Martin
Loschwitz
+ * Xft.man name conflict problem fix [ISHIKAWA Mutsumi]
+ - patch #065: new
+ - man page name under xc/lib/{Xft,Xft1}/Xft.man name space confliction fix,
+ simply rename xc/lib/Xft1/Xft.man to xc/lib/Xft1/Xft1.man
+
* patch #909: rework support for static libraries with PIC info; by default,
only libraries without a shared version build static-PIC versions, and
then only on systems where PIC info is not included in static ("normal")
Added: branches/4.3.0/sid/debian/patches/065_Xft1_manpage_conflict.diff
==============================================================================
--- branches/4.3.0/sid/debian/patches/065_Xft1_manpage_conflict.diff 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/patches/065_Xft1_manpage_conflict.diff 2003-07-06 10:48:17 UTC (rev 292)
@@ -0,0 +1,388 @@
+xc/lib/Xft and xc/lib/Xft1 both have the Xft.man, so if both of them
+will be installed, Xft.man fromxc/lib/Xft will overwrite Xft.man from
+xc/lib/Xft1
+
+This patch renames from xc/lib/Xft1/Xft.man to xc/lib/Xft1/Xft1.man.
+
+ ISHIKAWA Mutsumi <ishikawa@debian.org>
+
+diff -urN xc.orig/lib/Xft1/Imakefile xc/lib/Xft1/Imakefile
+--- xc.orig/lib/Xft1/Imakefile 2003-07-05 00:48:50.000000000 +0900
++++ xc/lib/Xft1/Imakefile 2003-07-05 00:48:53.000000000 +0900
+@@ -146,5 +146,5 @@
+ InstallNonExecFileRelated(XftConfig-OBSOLETE,$(CONFDIR),XftConfig)
+
+ MANSUFFIX = $(LIBMANSUFFIX)
+-InstallManPage(Xft,$(LIBMANDIR))
++InstallManPage(Xft1,$(LIBMANDIR))
+ DependTarget()
+diff -urN xc.orig/lib/Xft1/Xft.man xc/lib/Xft1/Xft.man
+--- xc.orig/lib/Xft1/Xft.man 2002-02-15 10:26:15.000000000 +0900
++++ xc/lib/Xft1/Xft.man 1970-01-01 09:00:00.000000000 +0900
+@@ -1,181 +0,0 @@
+-.\"
+-.\" $XFree86: xc/lib/Xft1/Xft.man,v 1.1.1.1 2002/02/15 01:26:15 keithp Exp $
+-.\"
+-.\" Copyright � 2000 Keith Packard, member of The XFree86 Project, Inc.
+-.\"
+-.\" Permission to use, copy, modify, distribute, and sell this software and its
+-.\" documentation for any purpose is hereby granted without fee, provided that
+-.\" the above copyright notice appear in all copies and that both that
+-.\" copyright notice and this permission notice appear in supporting
+-.\" documentation, and that the name of Keith Packard not be used in
+-.\" advertising or publicity pertaining to distribution of the software without
+-.\" specific, written prior permission. Keith Packard makes no
+-.\" representations about the suitability of this software for any purpose. It
+-.\" is provided "as is" without express or implied warranty.
+-.\"
+-.\" KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+-.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+-.\" EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+-.\" CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+-.\" DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+-.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+-.\" PERFORMANCE OF THIS SOFTWARE.
+-.\"
+-.de TQ
+-.br
+-.ns
+-.TP \\$1
+-..
+-.TH XFT 3 "Version 1.0" "XFree86"
+-
+-.SH NAME
+- XFT \- X FreeType interface library
+-
+-.SH DESCRIPTION
+-.B Xft
+-is a simple library designed to interface the FreeType rasterizer with the X
+-Rendering Extension. This manual page barely scratches the surface of this
+-library.
+-
+-.SH DATATYPES
+-
+-.B XftPattern
+-holds a set of names with associated value lists; each name refers to a
+-property of a font. XftPatterns are used as inputs to the matching code as
+-well as holding information about specific fonts.
+-
+-.B XftFont
+-contains general font metrics and a pointer to either the core XFontStruct
+-data or a structure holding FreeType and X Render Extension data.
+-
+-.B XftFontStruct
+-contains information about FreeType fonts used with the X Render Extension.
+-
+-.B XftFontSet
+-contains a list of XftPatterns. Internally Xft uses this data structure to
+-hold sets of fonts. Externally, Xft returns the results of listing fonts in
+-this format.
+-
+-.B XftObjectSet
+-holds a set of names and is used to specify which fields from fonts are
+-placed in the the list of returned patterns when listing fonts.
+-
+-.B XftDraw
+-is an opaque object which holds information used to render to an X drawable
+-using either core protocol or the X Rendering extension.
+-
+-.SH FUNCTIONS
+-.nf
+-XftFont *
+-XftFontOpen (Display *dpy, int screen, ...);
+-.fi
+-.B XftFontOpen
+-takes a list of pattern elements of the form (field, type, value) terminated
+-with a 0, matches that pattern against the available fonts and opens the
+-matching font.
+-.PP
+-Example:
+-.br
+- font = XftFontOpen (dpy, scr,
+- XFT_FAMILY, XftTypeString, "charter",
+- XFT_SIZE, XftTypeDouble, 12.0);
+-.PP
+-This opens the charter font at 12 points. The point size is automatically
+-converted to the correct pixel size based on the resolution of the monitor.
+-.PP
+-.nf
+-void
+-XftTextExtents8 (Display *dpy,
+- XftFont *font,
+- unsigned char *string,
+- int len,
+- XGlyphInfo *extents);
+-.fi
+-.B XftTextExtents8
+-computes the pixel extents of "string" when drawn with "font".
+-.PP
+-.nf
+-XftDraw *
+-XftDrawCreate (Display *dpy,
+- Drawable drawable,
+- Visual *visual,
+- Colormap colormap);
+-.fi
+-.B XtDrawCreate
+-creates a structure that can be used to render text and rectangles
+-to the screen.
+-.PP
+-.nf
+-void
+-XftDrawString8 (XftDraw *d,
+- XRenderColor *color,
+- XftFont *font,
+- int x,
+- int y,
+- unsigned char *string,
+- int len);
+-.fi
+-.B XftDrawString8
+-draws "string" using "font" in "color" at "x, y".
+-.PP
+-.nf
+-void
+-XftDrawRect (XftDraw *d,
+- XRenderColor *color,
+- int x,
+- int y,
+- unsigned int width,
+- unsigned int height);
+-.fi
+-.B XftDrawRect
+-fills a solid rectangle in the specified color.
+-.SH XftConfig
+-The
+-.B XftConfig
+-file contains configuration information for the Xft library consisting of
+-directories to look at for font information as well as instructions on
+-editing program specified font patterns before attempting to match the
+-available fonts.
+-.PP
+-.nf
+-config : "dir" STRING
+- | "include" STRING
+- | "includeif" STRING
+- | "match" tests "edit" edits
+- ;
+-test : qual FIELD-NAME COMPARE CONSTANT
+- ;
+-qual : "any"
+- | "all"
+- ;
+-edit : FIELD-NAME ASSIGN expr SEMI
+- ;
+-.fi
+-.PP
+-STRINGs are double-quote delimited. FIELD-NAMEs are identifiers,
+-ASSIGN is one of "=", "+=" or "=+". expr can contain the usual
+-arithmetic operators and can include FIELD-NAMEs.
+-.PP
+-"dir" adds a directory to the list of places Xft will look for fonts.
+-There is no particular order implied by the list; Xft treats all fonts about
+-the same.
+-.PP
+-"include" and "includeif" cause Xft to load more configuration parameters
+-from the indicated file. "includeif" doesn't elicit a complaint if the file
+-doesn't exist. If the file name begins with a '~' character, it refers to a
+-path relative to the home directory of the user.
+-.PP
+-If the tests in a "match" statement all match a user-specified pattern, the
+-pattern will be edited with the specified instructions.
+-.PP
+-Where ASSIGN is "=", the matching value in the pattern will be replaced by
+-the given expression. "+="/"=+" will prepend/append a new value to the list
+-of values for the indicated field.
+-
+-.SH RESTRICTIONS
+-.B Xft
+-will probably change radically in the future; weak attempts will be made to
+-retain some level of source-file compatibility.
+-
+-.SH AUTHOR
+-Keith Packard, member of the XFree86 Project, Inc.
+diff -urN xc.orig/lib/Xft1/Xft1.man xc/lib/Xft1/Xft1.man
+--- xc.orig/lib/Xft1/Xft1.man 1970-01-01 09:00:00.000000000 +0900
++++ xc/lib/Xft1/Xft1.man 2002-02-15 10:26:15.000000000 +0900
+@@ -0,0 +1,181 @@
++.\"
++.\" $XFree86: xc/lib/Xft1/Xft.man,v 1.1.1.1 2002/02/15 01:26:15 keithp Exp $
++.\"
++.\" Copyright � 2000 Keith Packard, member of The XFree86 Project, Inc.
++.\"
++.\" Permission to use, copy, modify, distribute, and sell this software and its
++.\" documentation for any purpose is hereby granted without fee, provided that
++.\" the above copyright notice appear in all copies and that both that
++.\" copyright notice and this permission notice appear in supporting
++.\" documentation, and that the name of Keith Packard not be used in
++.\" advertising or publicity pertaining to distribution of the software without
++.\" specific, written prior permission. Keith Packard makes no
++.\" representations about the suitability of this software for any purpose. It
++.\" is provided "as is" without express or implied warranty.
++.\"
++.\" KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
++.\" INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
++.\" EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
++.\" CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
++.\" DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
++.\" TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++.\" PERFORMANCE OF THIS SOFTWARE.
++.\"
++.de TQ
++.br
++.ns
++.TP \\$1
++..
++.TH XFT 3 "Version 1.0" "XFree86"
++
++.SH NAME
++ XFT \- X FreeType interface library
++
++.SH DESCRIPTION
++.B Xft
++is a simple library designed to interface the FreeType rasterizer with the X
++Rendering Extension. This manual page barely scratches the surface of this
++library.
++
++.SH DATATYPES
++
++.B XftPattern
++holds a set of names with associated value lists; each name refers to a
++property of a font. XftPatterns are used as inputs to the matching code as
++well as holding information about specific fonts.
++
++.B XftFont
++contains general font metrics and a pointer to either the core XFontStruct
++data or a structure holding FreeType and X Render Extension data.
++
++.B XftFontStruct
++contains information about FreeType fonts used with the X Render Extension.
++
++.B XftFontSet
++contains a list of XftPatterns. Internally Xft uses this data structure to
++hold sets of fonts. Externally, Xft returns the results of listing fonts in
++this format.
++
++.B XftObjectSet
++holds a set of names and is used to specify which fields from fonts are
++placed in the the list of returned patterns when listing fonts.
++
++.B XftDraw
++is an opaque object which holds information used to render to an X drawable
++using either core protocol or the X Rendering extension.
++
++.SH FUNCTIONS
++.nf
++XftFont *
++XftFontOpen (Display *dpy, int screen, ...);
++.fi
++.B XftFontOpen
++takes a list of pattern elements of the form (field, type, value) terminated
++with a 0, matches that pattern against the available fonts and opens the
++matching font.
++.PP
++Example:
++.br
++ font = XftFontOpen (dpy, scr,
++ XFT_FAMILY, XftTypeString, "charter",
++ XFT_SIZE, XftTypeDouble, 12.0);
++.PP
++This opens the charter font at 12 points. The point size is automatically
++converted to the correct pixel size based on the resolution of the monitor.
++.PP
++.nf
++void
++XftTextExtents8 (Display *dpy,
++ XftFont *font,
++ unsigned char *string,
++ int len,
++ XGlyphInfo *extents);
++.fi
++.B XftTextExtents8
++computes the pixel extents of "string" when drawn with "font".
++.PP
++.nf
++XftDraw *
++XftDrawCreate (Display *dpy,
++ Drawable drawable,
++ Visual *visual,
++ Colormap colormap);
++.fi
++.B XtDrawCreate
++creates a structure that can be used to render text and rectangles
++to the screen.
++.PP
++.nf
++void
++XftDrawString8 (XftDraw *d,
++ XRenderColor *color,
++ XftFont *font,
++ int x,
++ int y,
++ unsigned char *string,
++ int len);
++.fi
++.B XftDrawString8
++draws "string" using "font" in "color" at "x, y".
++.PP
++.nf
++void
++XftDrawRect (XftDraw *d,
++ XRenderColor *color,
++ int x,
++ int y,
++ unsigned int width,
++ unsigned int height);
++.fi
++.B XftDrawRect
++fills a solid rectangle in the specified color.
++.SH XftConfig
++The
++.B XftConfig
++file contains configuration information for the Xft library consisting of
++directories to look at for font information as well as instructions on
++editing program specified font patterns before attempting to match the
++available fonts.
++.PP
++.nf
++config : "dir" STRING
++ | "include" STRING
++ | "includeif" STRING
++ | "match" tests "edit" edits
++ ;
++test : qual FIELD-NAME COMPARE CONSTANT
++ ;
++qual : "any"
++ | "all"
++ ;
++edit : FIELD-NAME ASSIGN expr SEMI
++ ;
++.fi
++.PP
++STRINGs are double-quote delimited. FIELD-NAMEs are identifiers,
++ASSIGN is one of "=", "+=" or "=+". expr can contain the usual
++arithmetic operators and can include FIELD-NAMEs.
++.PP
++"dir" adds a directory to the list of places Xft will look for fonts.
++There is no particular order implied by the list; Xft treats all fonts about
++the same.
++.PP
++"include" and "includeif" cause Xft to load more configuration parameters
++from the indicated file. "includeif" doesn't elicit a complaint if the file
++doesn't exist. If the file name begins with a '~' character, it refers to a
++path relative to the home directory of the user.
++.PP
++If the tests in a "match" statement all match a user-specified pattern, the
++pattern will be edited with the specified instructions.
++.PP
++Where ASSIGN is "=", the matching value in the pattern will be replaced by
++the given expression. "+="/"=+" will prepend/append a new value to the list
++of values for the indicated field.
++
++.SH RESTRICTIONS
++.B Xft
++will probably change radically in the future; weak attempts will be made to
++retain some level of source-file compatibility.
++
++.SH AUTHOR
++Keith Packard, member of the XFree86 Project, Inc.
Modified: branches/4.3.0/sid/debian/xlibs-dev.install
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.install 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/xlibs-dev.install 2003-07-06 10:48:17 UTC (rev 292)
@@ -866,6 +866,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/xlibs-dev.install.hurd-i386 2003-07-06 10:48:17 UTC (rev 292)
@@ -865,6 +865,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Modified: branches/4.3.0/sid/debian/xlibs-dev.install.s390
==============================================================================
--- branches/4.3.0/sid/debian/xlibs-dev.install.s390 2003-07-04 02:45:17 UTC (rev 291)
+++ branches/4.3.0/sid/debian/xlibs-dev.install.s390 2003-07-06 10:48:17 UTC (rev 292)
@@ -841,6 +841,7 @@
usr/X11R6/man/man3/XeviGetVisualInfo.3x
usr/X11R6/man/man3/XeviQueryExtension.3x
usr/X11R6/man/man3/XeviQueryVersion.3x
+usr/X11R6/man/man3/Xft1.3x
usr/X11R6/man/man3/XmbDrawImageString.3x
usr/X11R6/man/man3/XmbDrawString.3x
usr/X11R6/man/man3/XmbDrawText.3x
Reply to: