Attachment 1025 Details for Bug 1551 – [FIXED_X11R68x] Patch for 2004-10-07-trunk

[patch] [FIXED_X11R68x] Patch for 2004-10-07-trunk

patch.gudiff (text/plain), 43.97 KB, created by Roland Mainz on 2004-10-06 20:51:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-10-06 20:51:51 UTC

Size: 43.97 KB

patch

obsolete

>Index: xc/programs/xlsfonts/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xlsfonts/Imakefile,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 Imakefile
>--- xc/programs/xlsfonts/Imakefile	6 Oct 2004 19:29:59 -0000	1.3
>+++ xc/programs/xlsfonts/Imakefile	7 Oct 2004 03:47:29 -0000
>@@ -1,19 +1,26 @@
> XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:54:53 cpqbld Exp $
> 
> #if BuildXprintLib && BuildXprintClients
> # define XlsFontsUseXprint YES
> #endif /* BuildXprintLib && BuildXprintClients */
> 
> #if XlsFontsUseXprint
> PRINT_LIBS = -lXprintUtil $(XPLIB)
> PRINT_DEFS = -DBUILD_PRINTSUPPORT
> #endif /* XlsFontsUseXprint */
> 
> 
> DEPLIBS = $(DEPXONLYLIB)
> LOCAL_LIBRARIES = $(PRINT_LIBS) $(XLIB)
> DEFINES = $(PRINT_DEFS)
> SRCS = xlsfonts.c dsimple.c
> OBJS = xlsfonts.o dsimple.o
> 
> ComplexProgramTarget(xlsfonts)
>+
>+#ifdef HasDocBookTools
>+all:: xlsfonts.man xlsfonts.html
>+
>+ConvertDocBookToManPage(xlsfonts.sgml, xlsfonts.man)
>+ConvertDocBookToHTML(xlsfonts.sgml, xlsfonts.html)
>+#endif /* HasDocBookTools */
>Index: xc/programs/xlsfonts/xlsfonts.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xlsfonts/xlsfonts.c,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 xlsfonts.c
>--- xc/programs/xlsfonts/xlsfonts.c	6 Oct 2004 19:29:59 -0000	1.3
>+++ xc/programs/xlsfonts/xlsfonts.c	7 Oct 2004 03:47:29 -0000
>@@ -76,43 +76,43 @@
> static void get_list(char *pattern);
> static int compare(const void *arg1, const void *arg2);
> static void show_fonts(void);
> static void copy_number(char **pp1, char**pp2, int n1, int n2);
> static int IgnoreError(Display *disp, XErrorEvent *event);
> static void PrintProperty(XFontProp *prop);
> static void ComputeFontType(XFontStruct *fs);
> static void print_character_metrics(register XFontStruct *info);
> static void do_query_font (Display *dpy, char *name);
> 
> void usage(void)
> {
> fprintf (stderr, "usage: %s [-options] [-fn pattern]\n", program_name);
> fprintf (stderr, "where options include:\n");
> fprintf (stderr, " -l[l[l]] give long info about each font\n");
> fprintf (stderr, " -m give character min and max bounds\n");
> fprintf (stderr, " -C force columns\n");
> fprintf (stderr, " -1 force single column\n");
> fprintf (stderr, " -u keep output unsorted\n");
> #ifdef BUILD_PRINTSUPPORT
>- fprintf (stderr, " -b list printer builtin fonts (default)\n");
>+ fprintf (stderr, " -b list printer builtin fonts\n");
> fprintf (stderr, " -B do not list printer builtin fonts\n");
>- fprintf (stderr, " -g list glyph fonts (default)\n");
>+ fprintf (stderr, " -g list glyph fonts\n");
> fprintf (stderr, " -G do not list glyph fonts\n");
> fprintf (stderr, " -x mode enable listfont mode\n");
> fprintf (stderr, " -X mode disable listfont mode\n");
> #endif /* BUILD_PRINTSUPPORT */
> fprintf (stderr, " -o use OpenFont/QueryFont instead of ListFonts\n");
> fprintf (stderr, " -w width maximum width for multiple columns\n");
> fprintf (stderr, " -n columns number of columns if multi column\n");
> fprintf (stderr, " -display displayname X server to contact\n");
> fprintf (stderr, " -d displayname (alias for -display displayname)\n");
> #ifdef BUILD_PRINTSUPPORT
> fprintf (stderr, " -printer printername printer to use\n");
> fprintf (stderr, " -p printername (alias for -p printername)\n");
> #endif /* BUILD_PRINTSUPPORT */
> fprintf (stderr, "\n");
> Close_Display();
> exit(EXIT_FAILURE);
> }
> 
> int main(int argc, char **argv)
> {
>Index: xc/programs/xlsfonts/xlsfonts.man
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xlsfonts/xlsfonts.man,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 xlsfonts.man
>--- xc/programs/xlsfonts/xlsfonts.man	23 Apr 2004 19:54:58 -0000	1.2
>+++ xc/programs/xlsfonts/xlsfonts.man	7 Oct 2004 03:47:29 -0000
>@@ -1,105 +1,170 @@
>-.\" $Xorg: xlsfonts.man,v 1.4 2001/02/09 02:05:55 xorgcvs Exp $
>-.\" Copyright 1988, 1998 The Open Group
>-.\" 
>-.\" 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.
>-.\" 
>-.\" The above copyright notice and this permission notice shall be included
>-.\" in all copies or substantial portions of the Software.
>-.\" 
>-.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
>-.\" OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
>-.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
>-.\" IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR
>-.\" OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
>-.\" ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
>-.\" OTHER DEALINGS IN THE SOFTWARE.
>-.\" 
>-.\" Except as contained in this notice, the name of The Open Group shall
>-.\" not be used in advertising or otherwise to promote the sale, use or
>-.\" other dealings in this Software without prior written authorization
>-.\" from The Open Group.
>-.\"
>-.\" $XFree86: xc/programs/xlsfonts/xlsfonts.man,v 1.7 2001/01/27 18:21:18 dawes Exp $
>-.\"
>-.TH XLSFONTS 1 __xorgversion__
>+.\" This manpage has been automatically generated by docbook2man 
>+.\" from a DocBook document. This tool can be found at:
>+.\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
>+.\" Please send any bug reports, improvements, comments, patches, 
>+.\" etc. to Steve Cheng <steve@ggi-project.org>.
>+.TH "XLSFONTS" "__appmansuffix__" "07 October 2004" "" ""
> .SH NAME
> xlsfonts \- server font list displayer for X
> .SH SYNOPSIS
>-.B xlsfonts
>-[\-options ...] [\-fn pattern]
>-.SH DESCRIPTION
>-.I Xlsfonts
>-lists the fonts that match the given \fIpattern\fP.
>-The wildcard character "*" may be used to match any sequence of
>-characters (including none), and "?" to match any single character.
>+
>+\fBxlsfonts\fR [ \fB-display \fIhost:dpy\fB\fR] [ \fB-l\fR] [ \fB-ll\fR] [ \fB-lll\fR] [ \fB-m\fR] [ \fB-C\fR] [ \fB-1\fR] [ \fB-w \fIwidth\fB\fR] [ \fB-n \fIcolumns\fB\fR] [ \fB-u\fR] [ \fB-o\fR] [ \fB-fn \fIpattern\fB\fR] 
>+
>+
>+\fBxlsfonts\fR \fB-printer \fIprintername\fB\fR [ \fB-l\fR] [ \fB-ll\fR] [ \fB-lll\fR] [ \fB-m\fR] [ \fB-C\fR] [ \fB-1\fR] [ \fB-w \fIwidth\fB\fR] [ \fB-n \fIcolumns\fB\fR] [ \fB-u\fR] [ \fB-o\fR] [ \fB-b\fR] [ \fB-B\fR] [ \fB-g\fR] [ \fB-G\fR] [ \fB-x \fImode\fB\fR] [ \fB-X \fImode\fB\fR] [ \fB-fn \fIpattern\fB\fR] 
>+
>+.SH "DESCRIPTION"
>+.PP
>+\fBxlsfonts\fR lists the fonts that match the given pattern.
>+The wildcard character "*" may be used to match any sequence of characters
>+(including none), and "?" to match any single character.
> If no pattern is given, "*" is assumed.
> .PP
>-The "*" and "?" characters must be quoted to prevent them from
>-being expanded by the shell.
>+The "*" and "?" characters must be quoted to prevent them from being expanded by the shell.
> .SH "OPTIONS"
>-.PP
>-.TP 8
>-.B \-display \fIhost\fP:\fIdpy\fP
>+.TP
>+\fB-display \fIhost:dpy\fB \fR
> This option specifies the X server to contact.
>-.PP
>-.TP 8
>-.B \-l
>-Lists some attributes of the font on one line in addition to its name.
>-.TP 8
>-.B \-ll
>-Lists font properties in addition to \fB\-l\fP output.
>-.TP 8
>-.B \-lll
>-Lists character metrics in addition to \fB\-ll\fP output.
>-.TP 8
>-.B \-m
>-This option indicates that long listings should also print the minimum and
>-maximum bounds of each font.
>-.TP 8
>-.B \-C
>-This option indicates that listings should use multiple columns. This is the
>-same as \fB\-n 0\fP.
>-.TP 8
>-.B \-1
>-This option indicates that listings should use a single column. This is the
>-same as \fB\-n 1\fP.
>-.TP 8
>-.B \-w \fIwidth\fP
>-This option specifies the width in characters that should be used in 
>-figuring out how many columns to print. The default is 79.
>-.TP 8
>-.B \-n \fIcolumns\fP
>-This option specifies the number of columns to use in displaying the output.
>-By default, it will attempt to fit as many columns of font names into the 
>-number of character specified by \fB\-w \fIwidth\fR.
>-.TP 8
>-.B \-u
>+.TP
>+\fB-printer \fIprintername\fB \fR
>+This option specifies the Xprint printer to contact.
>+.TP
>+\fB-d \fIhost:dpy\fB \fR
>+Same as \fB-display \fIhost:dpy\fB\fR.
>+.TP
>+\fB-p \fIprintername\fB \fR
>+Same as \fB-printer \fIprintername\fB\fR.
>+.TP
>+\fB-l \fR
>+Lists some attributes of the font on one line in addition
>+to its name.
>+.TP
>+\fB-ll \fR
>+Lists font properties in addition to \fB-l\fR output.
>+.TP
>+\fB-lll \fR
>+Lists character metrics in addition to \fB-ll\fR output.
>+.TP
>+\fB-m \fR
>+This option indicates that long listings should also print
>+the minimum and maximum bounds of each font.
>+.TP
>+\fB-C \fR
>+This option indicates that listings should use multiple columns.
>+This is the same as \fB-n 0\fR.
>+.TP
>+\fB-1 \fR
>+This option indicates that listings should use a single column.
>+This is the same as \fB-n 1\fR.
>+.TP
>+\fB-w \fIwidth\fB \fR
>+This option specifies the width in characters that should be
>+used in figuring out how many columns to print.
>+The default is 79.
>+.TP
>+\fB-n \fIcolumns\fB \fR
>+This option specifies the number of columns to use in
>+displaying the output. By default, it will attempt to
>+fit as many columns of font names into the number of
>+character specified by \fB-w\fR width.
>+.TP
>+\fB-u \fR
> This option indicates that the output should be left unsorted.
>-.TP 8
>-.B \-o
>-This option indicates that \fIxlsfonts\fP should do an \fBOpenFont\fP (and
>-\fBQueryFont\fP, if appropriate) rather than a \fBListFonts\fP. This is
>-useful if \fBListFonts\fP or \fBListFontsWithInfo\fP fail to list a known
>-font (as is the case with some scaled font systems).
>-.TP 8
>-.B \-fn \fIpattern\fP
>+.TP
>+\fB-o \fR
>+This option indicates that xlsfonts should do an OpenFont
>+(and QueryFont, if appropriate) rather than a ListFonts.
>+This is useful if ListFonts or ListFontsWithInfo fail to
>+list a known font (as is the case with some scaled font
>+systems).
>+.TP
>+\fB-b \fR
>+List printer builtin fonts.
>+This is the same as \fB-x xp-list-internal-printer-fonts\fR.
>+
>+(printer mode only)
>+.TP
>+\fB-B \fR
>+Do not list printer builtin fonts.
>+This is the same as \fB-X xp-list-internal-printer-fonts\fR.
>+
>+(printer mode only)
>+.TP
>+\fB-g \fR
>+List glyph fonts.
>+This is the same as \fB-x xp-list-glyph-fonts\fR.
>+
>+(printer mode only)
>+.TP
>+\fB-G \fR
>+Do not list glyph fonts.
>+This is the same as \fB-X xp-list-glyph-fonts\fR.
>+
>+(printer mode only)
>+.TP
>+\fB-x \fImode\fB \fR
>+Enable listfont mode \fImode\fR.
>+
>+Supported modes are:
>+.RS
>+.TP
>+\fBxp-listinternal-printer-fonts\fR
>+If xp-listinternal-printer-fonts was set
>+(via option \fB-b\fR or
>+\fB-x xp-listinternal-printer-fonts\fR \fBxlsfonts\fR
>+will include all of the fonts defined as internal printer fonts.
>+.TP
>+\fBxp-list-glyph-fonts\fR
>+If xp-list-glyph-fonts was set (via option \fB-g\fR or
>+\fB-x xp-list-glyph-fonts\fR) \fBxlsfonts\fR will
>+include all of the fonts available to the server which have
>+glyphs associated with them.
>+.RE
>+
>+The default value is implicitly determined by the ddx driver to be the
>+all of the listfonts modes specified in the xp-listfonts-modes-supported
>+printer attribute.
>+
>+The value of xp-listfonts-modes-supported and
>+xp-listfonts-modes (the defaults) can be looked-up via
>+\fBxplsprinters\fR(__appmansuffix__).
>+
>+(printer mode only)
>+.TP
>+\fB-X \fImode\fB \fR
>+Disable listfont mode \fImode\fR.
>+See option \fB-x\fR for a list of valid
>+\fImode\fR values.
>+
>+(printer mode only)
>+.TP
>+\fB-fn \fIpattern\fB \fR
> This option specifies the font name pattern to match.
>-.PP
> .SH "SEE ALSO"
>-X(__miscmansuffix__), Xserver(1), xset(1), xfd(1),
>-.I "X Logical Font Description Conventions"
>-.SH ENVIRONMENT
>-.TP 8
>-.B DISPLAY
>-to get the default host and display to use.
>-.SH BUGS
>-Doing ``xlsfonts -l'' can tie up your server for a very long time.
>-This is really a bug with single-threaded non-preemptable servers, not with
>-this program.
>-.SH AUTHOR
>-Mark Lillibridge, MIT Project Athena; Jim Fulton, MIT X Consortium;
>-Phil Karlton, SGI
>+.PP
>+\fBX\fR(__miscmansuffix__), \fBXprint\fR(__miscmansuffix__), \fBXserver\fR(__appmansuffix__), \fBxset\fR(__appmansuffix__), \fBxfd\fR(__appmansuffix__), \fBxplsprinters\fR(__appmansuffix__), X Logical Font Description Conventions
>+.SH "ENVIRONMENT"
>+.TP
>+\fBDISPLAY \fR
>+\fBDISPLAY\fR must be set to get the default host and display to use.
>+.TP
>+\fBXPSERVERLIST \fR
>+\fBXPSERVERLIST\fR must be set for the \fB-printer\fR option
>+identifying the available Xprint servers.
>+See \fBXprint\fR(__miscmansuffix__)
>+for more details.
>+.SH "BUGS"
>+.PP
>+Doing ``xlsfonts -l'' can tie up your server for a very long time. 
>+This is really a bug with single-threaded
>+non-preemptable servers, not with this program.
>+.SH "AUTHOR"
>+.PP
>+
>+MarkLillibridgeMIT Project Athena
>+
>+JimFultonMIT X Consortium
>+
>+PhilKarltonSGI
>+
>+RolandMainzUniversity Giessen
>Index: xc/programs/xlsfonts/xlsfonts.sgml
>===================================================================
>RCS file: xc/programs/xlsfonts/xlsfonts.sgml
>diff -N xc/programs/xlsfonts/xlsfonts.sgml
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ xc/programs/xlsfonts/xlsfonts.sgml	7 Oct 2004 03:47:29 -0000
>@@ -0,0 +1,473 @@
>+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" '/usr/share/sgml/docbook_4.2/docbook.dtd'>
>+
>+
>+
>+<refentry>
>+ <refmeta>
>+ <refentrytitle>xlsfonts</refentrytitle>
>+ <manvolnum>__appmansuffix__</manvolnum>
>+ </refmeta>
>+
>+ <refnamediv>
>+ <refname>xlsfonts</refname>
>+ <refpurpose>server font list displayer for X</refpurpose>
>+ </refnamediv>
>+
>+ <refsynopsisdiv>
>+ 
>+ <cmdsynopsis>
>+ <command>xlsfonts</command>
>+
>+ <arg><option>-display <replaceable>host:dpy</replaceable></option></arg>
>+
>+ <arg><option>-l</option></arg>
>+
>+ <arg><option>-ll</option></arg>
>+
>+ <arg><option>-lll</option></arg>
>+
>+ <arg><option>-m</option></arg>
>+
>+ <arg><option>-C</option></arg>
>+
>+ <arg><option>-1</option></arg>
>+
>+ <arg><option>-w <replaceable>width</replaceable></option></arg>
>+
>+ <arg><option>-n <replaceable>columns</replaceable></option></arg>
>+
>+ <arg><option>-u</option></arg>
>+
>+ <arg><option>-o</option></arg>
>+
>+ <arg><option>-fn <replaceable>pattern</replaceable></option></arg> 
>+ </cmdsynopsis>
>+
>+ 
>+ <cmdsynopsis>
>+ <command>xlsfonts</command>
>+
>+ <arg choice="plain"><option>-printer <replaceable>printername</replaceable></option></arg>
>+
>+ <arg><option>-l</option></arg>
>+
>+ <arg><option>-ll</option></arg>
>+
>+ <arg><option>-lll</option></arg>
>+
>+ <arg><option>-m</option></arg>
>+
>+ <arg><option>-C</option></arg>
>+
>+ <arg><option>-1</option></arg>
>+
>+ <arg><option>-w <replaceable>width</replaceable></option></arg>
>+
>+ <arg><option>-n <replaceable>columns</replaceable></option></arg>
>+
>+ <arg><option>-u</option></arg>
>+
>+ <arg><option>-o</option></arg>
>+
>+ <arg><option>-b</option></arg>
>+
>+ <arg><option>-B</option></arg>
>+
>+ <arg><option>-g</option></arg>
>+
>+ <arg><option>-G</option></arg>
>+
>+ <arg><option>-x <replaceable>mode</replaceable></option></arg>
>+
>+ <arg><option>-X <replaceable>mode</replaceable></option></arg>
>+
>+ <arg><option>-fn <replaceable>pattern</replaceable></option></arg> 
>+ </cmdsynopsis>
>+ </refsynopsisdiv>
>+
>+ <refsect1>
>+ <title>DESCRIPTION</title>
>+
>+ <para>
>+ <command>xlsfonts</command> lists the fonts that match the given pattern.
>+ The wildcard character "*" may be used to match any sequence of characters
>+ (including none), and "?" to match any single character.
>+ If no pattern is given, "*" is assumed.
>+ </para>
>+ <para>
>+ The "*" and "?" characters must be quoted to prevent them from being expanded by the shell.
>+ </para>
>+ </refsect1>
>+
>+ <refsect1>
>+ <title>OPTIONS</title>
>+
>+ <variablelist>
>+ <varlistentry>
>+ <term><option>-display <replaceable>host:dpy</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option specifies the X server to contact.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-printer <replaceable>printername</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option specifies the Xprint printer to contact.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-d <replaceable>host:dpy</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Same as <option>-display <replaceable>host:dpy</replaceable></option>.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-p <replaceable>printername</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Same as <option>-printer <replaceable>printername</replaceable></option>.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-l</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Lists some attributes of the font on one line in addition
>+ to its name.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-ll</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Lists font properties in addition to <option>-l</option> output.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+ 
>+ <varlistentry>
>+ <term><option>-lll</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Lists character metrics in addition to <option>-ll</option> output.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-m</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option indicates that long listings should also print
>+ the minimum and maximum bounds of each font.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-C</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option indicates that listings should use multiple columns.
>+ This is the same as <option>-n 0</option>.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-1</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option indicates that listings should use a single column.
>+ This is the same as <option>-n 1</option>.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-w <replaceable>width</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option specifies the width in characters that should be
>+ used in figuring out how many columns to print.
>+ The default is 79.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-n <replaceable>columns</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option specifies the number of columns to use in
>+ displaying the output. By default, it will attempt to
>+ fit as many columns of font names into the number of
>+ character specified by <option>-w</option> width.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-u</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option indicates that the output should be left unsorted.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-o</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option indicates that xlsfonts should do an OpenFont
>+ (and QueryFont, if appropriate) rather than a ListFonts.
>+ This is useful if ListFonts or ListFontsWithInfo fail to
>+ list a known font (as is the case with some scaled font
>+ systems).
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-b</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ List printer builtin fonts.
>+ This is the same as <option>-x xp-list-internal-printer-fonts</option>.
>+ </para>
>+ <para>
>+ (printer mode only)
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-B</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Do not list printer builtin fonts.
>+ This is the same as <option>-X xp-list-internal-printer-fonts</option>.
>+ </para>
>+ <para>
>+ (printer mode only)
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-g</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ List glyph fonts.
>+ This is the same as <option>-x xp-list-glyph-fonts</option>.
>+ </para>
>+ <para>
>+ (printer mode only)
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-G</option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Do not list glyph fonts.
>+ This is the same as <option>-X xp-list-glyph-fonts</option>.
>+ </para>
>+ <para>
>+ (printer mode only)
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-x <replaceable>mode</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Enable listfont mode <replaceable>mode</replaceable>.
>+ </para>
>+ <para>
>+ Supported modes are:
>+ <variablelist>
>+ <varlistentry>
>+ <term>xp-listinternal-printer-fonts</term>
>+ <listitem>
>+ <para>
>+ If <literal>xp-listinternal-printer-fonts</literal> was set
>+ (via option <option>-b</option> or
>+ <option>-x xp-listinternal-printer-fonts</option> <command>xlsfonts</command>
>+ will include all of the fonts defined as internal printer fonts.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term>xp-list-glyph-fonts</term>
>+ <listitem>
>+ <para>
>+ If <literal>xp-list-glyph-fonts</literal> was set (via option <option>-g</option> or
>+ <option>-x xp-list-glyph-fonts</option>) <command>xlsfonts</command> will
>+ include all of the fonts available to the server which have
>+ glyphs associated with them.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+ </variablelist>
>+
>+ <para>
>+ The default value is implicitly determined by the ddx driver to be the
>+ all of the listfonts modes specified in the <literal>xp-listfonts-modes-supported</literal>
>+ printer attribute.
>+ </para>
>+ 
>+ <para>
>+ The value of <literal>xp-listfonts-modes-supported</literal> and
>+ <literal>xp-listfonts-modes</literal> (the defaults) can be looked-up via
>+ <citerefentry><refentrytitle>xplsprinters</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry>.
>+ </para>
>+ </para>
>+
>+ <para>
>+ (printer mode only)
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+
>+ <varlistentry>
>+ <term><option>-X <replaceable>mode</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ Disable listfont mode <replaceable>mode</replaceable>.
>+ See option <option>-x</option> for a list of valid
>+ <replaceable>mode</replaceable> values.
>+ </para>
>+ <para>
>+ (printer mode only)
>+ </para>
>+ </listitem>
>+ </varlistentry> 
>+
>+ <varlistentry>
>+ <term><option>-fn <replaceable>pattern</replaceable></option>
>+ </term>
>+ <listitem>
>+ <para>
>+ This option specifies the font name pattern to match.
>+ </para>
>+ </listitem>
>+ </varlistentry>
>+ </variablelist>
>+ </refsect1>
>+
>+ <refsect1>
>+ <title>SEE ALSO</title>
>+ <para>
>+ <simplelist type="inline">
>+ <member><citerefentry><refentrytitle>X</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>Xserver</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xset</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xfd</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xplsprinters</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member>X Logical Font Description Conventions</member>
>+ </simplelist>
>+ </para>
>+ </refsect1>
>+
>+ <refsect1>
>+ <title>ENVIRONMENT</title>
>+
>+ <variablelist>
>+ <varlistentry>
>+ <term><envar>DISPLAY</envar>
>+ </term>
>+ <listitem>
>+	 <para><envar>DISPLAY</envar> must be set to get the default host and display to use.
>+	 </para>
>+	</listitem>
>+ </varlistentry>
>+ 
>+ <varlistentry>
>+ <term><envar>XPSERVERLIST</envar>
>+ </term>
>+ <listitem>
>+	 <para><envar>XPSERVERLIST</envar> must be set for the <option>-printer</option> option
>+	 identifying the available Xprint servers.
>+ See <citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry>
>+	 for more details.
>+	 </para>
>+	</listitem>
>+ </varlistentry>
>+ </variablelist>
>+ </refsect1>
>+
>+ <refsect1>
>+ <title>BUGS</title>
>+
>+ <para>
>+ Doing ``xlsfonts -l'' can tie up your server for a very long time. 
>+ This is really a bug with single-threaded
>+ non-preemptable servers, not with this program.
>+ </para>
>+ </refsect1>
>+
>+ <refsect1>
>+ <title>AUTHOR</title>
>+
>+ <para>
>+ <simplelist>
>+ <member><othercredit><firstname>Mark</firstname> <surname>Lillibridge</surname> <affiliation><orgname>MIT Project Athena</orgname></affiliation></othercredit></member>
>+ <member><othercredit><firstname>Jim</firstname> <surname>Fulton</surname> <affiliation><orgname>MIT X Consortium</orgname></affiliation></othercredit></member>
>+ <member><othercredit><firstname>Phil</firstname> <surname>Karlton</surname> <affiliation><orgname>SGI</orgname></affiliation></othercredit></member>
>+ <member><othercredit><firstname>Roland</firstname> <surname>Mainz</surname> <affiliation><orgname>University Giessen</orgname></affiliation></othercredit></member>
>+ </simplelist>
>+ </para>
>+ </refsect1>
>+
>+</refentry>
>+
>+
>Index: xc/programs/xplsprinters/xplsprinters.html
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xplsprinters/xplsprinters.html,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 xplsprinters.html
>--- xc/programs/xplsprinters/xplsprinters.html	29 Jun 2004 17:10:13 -0000	1.4
>+++ xc/programs/xplsprinters/xplsprinters.html	7 Oct 2004 03:47:29 -0000
>@@ -10,21 +10,24 @@
> <pre class="screen"><tt class="computeroutput">printer: hplaserjet001@puck:33
> printer: hpcolor4550_004@puck:33
> printer: laser19@meridian:19
> printer: xp_ps_spooldir_tmp_Xprintjobs@meridian:19
> printer: xp_pdf_spooldir_tmp_Xprintjobs@meridian:19</tt></pre></div><div xmlns:ns2="" class="example"><a name="id2805059"></a>Example 2. Get information about the supported attributes of printer &quot;ps002&quot;:<pre class="screen">% <tt>xplsprinters -printer ps002 -l</tt></pre>would print:
> <pre class="screen"><tt class="computeroutput">
> printer: ps002@castor:18
> description=
> model-identifier=HPDJ1600C
> default-medium=iso-a4
> default-input-tray=
> medium-source-sizes-supported=iso-a4 false 6.35 203.65 6.35 290.65
> medium-source-sizes-supported=na-letter false 6.35 209.55 6.35 273.05
> default-printer-resolution=300
> resolution=300
> default_orientation=
> orientation=portrait
> orientation=landscape
> default_plex=
> plex=simplex
>-</tt></pre></div></div><div class="refsect1" lang="en"><a name="id2805097"></a><h2>SEE ALSO</h2>Xprint(7), X11(7), xprehashprinterlist(1x), xphelloworld(1x), xpxmhelloworld(1x), xpawhelloworld(1x), xpxthelloworld(1x), xpsimplehelloworld(1x), Xserver(1x), Xprt(1x), libXp(3x), libXprintUtils(3x), libXprintAppUtils(3x), XmPrintShell(3x), XawPrintShell(3x), Xprint FAQ (<a href="http://xprint.mozdev.org/docs/Xprint_FAQ.html" target="_top">http://xprint.mozdev.org/docs/Xprint_FAQ.html</a>), Xprint main site (<a href="http://xprint.mozdev.org/" target="_top">http://xprint.mozdev.org/</a>)</div></div></body></html>
>+</tt></pre></div></div><div class="refsect1" lang="en"><a name="id2805097"></a><h2>NOTES</h2>
>+ The list of builtin fonts supported by a printer can be obtained
>+ using the xlsfonts command.
>+ </div><div class="refsect1" lang="en"><a name="id2805108"></a><h2>SEE ALSO</h2>Xprint(7), X11(7), xprehashprinterlist(1x), xphelloworld(1x), xpxmhelloworld(1x), xpawhelloworld(1x), xpxthelloworld(1x), xpsimplehelloworld(1x), xlsfonts(1x), Xserver(1x), Xprt(1x), libXp(3x), libXprintUtils(3x), libXprintAppUtils(3x), XmPrintShell(3x), XawPrintShell(3x), Xprint FAQ (<a href="http://xprint.mozdev.org/docs/Xprint_FAQ.html" target="_top">http://xprint.mozdev.org/docs/Xprint_FAQ.html</a>), Xprint main site (<a href="http://xprint.mozdev.org/" target="_top">http://xprint.mozdev.org/</a>)</div></div></body></html>
>Index: xc/programs/xplsprinters/xplsprinters.man
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xplsprinters/xplsprinters.man,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 xplsprinters.man
>--- xc/programs/xplsprinters/xplsprinters.man	29 Jun 2004 17:10:13 -0000	1.4
>+++ xc/programs/xplsprinters/xplsprinters.man	7 Oct 2004 03:47:29 -0000
>@@ -1,26 +1,26 @@
> .\" This manpage has been automatically generated by docbook2man 
> .\" from a DocBook document. This tool can be found at:
> .\" <http://shell.ipoline.com/~elmert/comp/docbook2X/> 
> .\" Please send any bug reports, improvements, comments, patches, 
> .\" etc. to Steve Cheng <steve@ggi-project.org>.
>-.TH "XPLSPRINTERS" "__mansuffix__" "29 June 2004" "" ""
>+.TH "XPLSPRINTERS" "__appmansuffix__" "07 October 2004" "" ""
> .SH NAME
> xplsprinters \- shows a list of Xprint printers and it's attributes
> .SH SYNOPSIS
> 
> \fBxplsprinters\fR [ \fB-printer \fIprintername\fB\fR] [ \fB-d\fR] [ \fB-l\fR] [ \fB-dump\fR] [ \fB-h\fR] 
> 
> .SH "DESCRIPTION"
> .PP
> \fBxplsprinters\fR is a utility for Xprint, the
> printing system for the X Window system. It can deliver both a list
> of printers and attributes supported for a specific list of
> printers.
> .SH "OPTIONS"
> .TP
> \fB-printer \fIprintername\fB \fR
> printer to use
> .TP
> \fB-dump \fR
> dump all available printer attributes
> .TP
>@@ -64,23 +64,27 @@
> .fi
> .PP
> would print:
> 
> .nf
> printer: ps002@castor:18
> description=
> model-identifier=HPDJ1600C
> default-medium=iso-a4
> default-input-tray=
> medium-source-sizes-supported=iso-a4 false 6.35 203.65 6.35 290.65
> medium-source-sizes-supported=na-letter false 6.35 209.55 6.35 273.05
> default-printer-resolution=300
> resolution=300
> default_orientation=
> orientation=portrait
> orientation=landscape
> default_plex=
> plex=simplex
> .fi
>+.SH "NOTES"
>+.PP
>+The list of builtin fonts supported by a printer can be obtained
>+using the \fBxlsfonts\fR command.
> .SH "SEE ALSO"
> .PP
>-\fBXprint\fR(__miscmansuffix__), \fBX11\fR(__miscmansuffix__), \fBxprehashprinterlist\fR(__mansuffix__), \fBxphelloworld\fR(__mansuffix__), \fBxpxmhelloworld\fR(__mansuffix__), \fBxpawhelloworld\fR(__mansuffix__), \fBxpxthelloworld\fR(__mansuffix__), \fBxpsimplehelloworld\fR(__mansuffix__), \fBXserver\fR(__mansuffix__), \fBXprt\fR(__mansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html <URL:http://xprint.mozdev.org/docs/Xprint_FAQ.html>), Xprint main site (http://xprint.mozdev.org/ <URL:http://xprint.mozdev.org/>)
>+\fBXprint\fR(__miscmansuffix__), \fBX11\fR(__miscmansuffix__), \fBxprehashprinterlist\fR(__appmansuffix__), \fBxphelloworld\fR(__appmansuffix__), \fBxpxmhelloworld\fR(__appmansuffix__), \fBxpawhelloworld\fR(__appmansuffix__), \fBxpxthelloworld\fR(__appmansuffix__), \fBxpsimplehelloworld\fR(__appmansuffix__), \fBxlsfonts\fR(__appmansuffix__), \fBXserver\fR(__appmansuffix__), \fBXprt\fR(__appmansuffix__), \fBlibXp\fR(__libmansuffix__), \fBlibXprintUtils\fR(__libmansuffix__), \fBlibXprintAppUtils\fR(__libmansuffix__), \fBXmPrintShell\fR(__libmansuffix__), \fBXawPrintShell\fR(__libmansuffix__), Xprint FAQ (http://xprint.mozdev.org/docs/Xprint_FAQ.html <URL:http://xprint.mozdev.org/docs/Xprint_FAQ.html>), Xprint main site (http://xprint.mozdev.org/ <URL:http://xprint.mozdev.org/>)
>Index: xc/programs/xplsprinters/xplsprinters.sgml
>===================================================================
>RCS file: /cvs/xorg/xc/programs/xplsprinters/xplsprinters.sgml,v
>retrieving revision 1.4
>diff -u -2 -0 -r1.4 xplsprinters.sgml
>--- xc/programs/xplsprinters/xplsprinters.sgml	29 Jun 2004 17:10:13 -0000	1.4
>+++ xc/programs/xplsprinters/xplsprinters.sgml	7 Oct 2004 03:47:29 -0000
>@@ -1,38 +1,38 @@
> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.2//EN" '/usr/share/sgml/docbook_4.2/docbook.dtd'>
> 
> 
> 
> <refentry>
> <refmeta>
> <refentrytitle>xplsprinters</refentrytitle>
>- <manvolnum>__mansuffix__</manvolnum>
>+ <manvolnum>__appmansuffix__</manvolnum>
> </refmeta>
> 
> <refnamediv>
> <refname>xplsprinters</refname>
> <refpurpose>shows a list of Xprint printers and it's attributes</refpurpose>
> </refnamediv>
> 
> <refsynopsisdiv>
> <cmdsynopsis>
> <command>xplsprinters</command>
> 
> <arg><option>-printer <replaceable>printername</replaceable></option></arg>
> 
> <arg><option>-d</option></arg>
> 
> <arg><option>-l</option></arg>
> 
> <arg><option>-dump</option></arg>
> 
> <arg><option>-h</option></arg>
>@@ -134,54 +134,63 @@
> printer: ps002@castor:18
> description=
> model-identifier=HPDJ1600C
> default-medium=iso-a4
> default-input-tray=
> medium-source-sizes-supported=iso-a4 false 6.35 203.65 6.35 290.65
> medium-source-sizes-supported=na-letter false 6.35 209.55 6.35 273.05
> default-printer-resolution=300
> resolution=300
> default_orientation=
> orientation=portrait
> orientation=landscape
> default_plex=
> plex=simplex
> </computeroutput></screen>
> </para>
> </example>
> </refsect1>
> 
> <refsect1>
>+ <title>NOTES</title>
>+ <para>
>+ The list of builtin fonts supported by a printer can be obtained
>+ using the <command>xlsfonts</command> command.
>+ </para>
>+ </refsect1>
>+
>+ <refsect1>
> <title>SEE ALSO</title>
> <para>
> <simplelist type="inline">
> 
> 
> 
> 
> <member><citerefentry><refentrytitle>Xprint</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
> <member><citerefentry><refentrytitle>X11</refentrytitle><manvolnum>__miscmansuffix__</manvolnum></citerefentry></member>
> 
>- <member><citerefentry><refentrytitle>xprehashprinterlist</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>xphelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>xpxmhelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>xpawhelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>xpxthelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>xpsimplehelloworld</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>Xserver</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>- <member><citerefentry><refentrytitle>Xprt</refentrytitle><manvolnum>__mansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xprehashprinterlist</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xphelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xpxmhelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xpawhelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xpxthelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xpsimplehelloworld</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>xlsfonts</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>Xserver</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
>+ <member><citerefentry><refentrytitle>Xprt</refentrytitle><manvolnum>__appmansuffix__</manvolnum></citerefentry></member>
> 
> <member><citerefentry><refentrytitle>libXp</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>
> <member><citerefentry><refentrytitle>libXprintUtils</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>
> <member><citerefentry><refentrytitle>libXprintAppUtils</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>
> <member><citerefentry><refentrytitle>XmPrintShell</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>
> <member><citerefentry><refentrytitle>XawPrintShell</refentrytitle><manvolnum>__libmansuffix__</manvolnum></citerefentry></member>
> <member>Xprint FAQ (<ulink url="http://xprint.mozdev.org/docs/Xprint_FAQ.html">http://xprint.mozdev.org/docs/Xprint_FAQ.html</ulink>)</member>
> <member>Xprint main site (<ulink url="http://xprint.mozdev.org/">http://xprint.mozdev.org/</ulink>)</member>
> </simplelist>
> </para>
> </refsect1>
> </refentry>
> 
>

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1551: 1025

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.