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:
+.\"
+.\" Please send any bug reports, improvements, comments, patches,
+.\" etc. to Steve Cheng .
+.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 @@
+
+
+
+
+
+
+ xlsfonts
+ __appmansuffix__
+
+
+
+ xlsfonts
+ server font list displayer for X
+
+
+
+
+
+ xlsfonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xlsfonts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DESCRIPTION
+
+
+ xlsfonts 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.
+
+
+ The "*" and "?" characters must be quoted to prevent them from being expanded by the shell.
+
+
+
+
+ OPTIONS
+
+
+
+
+
+
+
+ This option specifies the X server to contact.
+
+
+
+
+
+
+
+
+
+ This option specifies the Xprint printer to contact.
+
+
+
+
+
+
+
+
+
+ Same as .
+
+
+
+
+
+
+
+
+
+ Same as .
+
+
+
+
+
+
+
+
+
+ Lists some attributes of the font on one line in addition
+ to its name.
+
+
+
+
+
+
+
+
+
+ Lists font properties in addition to output.
+
+
+
+
+
+
+
+
+
+ Lists character metrics in addition to output.
+
+
+
+
+
+
+
+
+
+ This option indicates that long listings should also print
+ the minimum and maximum bounds of each font.
+
+
+
+
+
+
+
+
+
+ This option indicates that listings should use multiple columns.
+ This is the same as .
+
+
+
+
+
+
+
+
+
+ This option indicates that listings should use a single column.
+ This is the same as .
+
+
+
+
+
+
+
+
+
+ This option specifies the width in characters that should be
+ used in figuring out how many columns to print.
+ The default is 79.
+
+
+
+
+
+
+
+
+
+ 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 width.
+
+
+
+
+
+
+
+
+
+ This option indicates that the output should be left unsorted.
+
+
+
+
+
+
+
+
+
+ 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).
+
+
+
+
+
+
+
+
+
+ List printer builtin fonts.
+ This is the same as .
+
+
+ (printer mode only)
+
+
+
+
+
+
+
+
+
+ Do not list printer builtin fonts.
+ This is the same as .
+
+
+ (printer mode only)
+
+
+
+
+
+
+
+
+
+ List glyph fonts.
+ This is the same as .
+
+
+ (printer mode only)
+
+
+
+
+
+
+
+
+
+ Do not list glyph fonts.
+ This is the same as .
+
+
+ (printer mode only)
+
+
+
+
+
+
+
+
+
+ Enable listfont mode mode.
+
+
+ Supported modes are:
+
+
+ xp-listinternal-printer-fonts
+
+
+ If xp-listinternal-printer-fonts was set
+ (via option or
+ xlsfonts
+ will include all of the fonts defined as internal printer fonts.
+
+
+
+
+
+ xp-list-glyph-fonts
+
+
+ If xp-list-glyph-fonts was set (via option or
+ ) xlsfonts will
+ include all of the fonts available to the server which have
+ glyphs associated with them.
+
+
+
+
+
+
+ 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
+ xplsprinters__appmansuffix__.
+
+
+
+
+ (printer mode only)
+
+
+
+
+
+
+
+
+
+ Disable listfont mode mode.
+ See option for a list of valid
+ mode values.
+
+
+ (printer mode only)
+
+
+
+
+
+
+
+
+
+ This option specifies the font name pattern to match.
+
+
+
+
+
+
+
+ SEE ALSO
+
+
+ X__miscmansuffix__
+ Xprint__miscmansuffix__
+ Xserver__appmansuffix__
+ xset__appmansuffix__
+ xfd__appmansuffix__
+ xplsprinters__appmansuffix__
+ X Logical Font Description Conventions
+
+
+
+
+
+ ENVIRONMENT
+
+
+
+ DISPLAY
+
+
+ DISPLAY must be set to get the default host and display to use.
+
+
+
+
+
+ XPSERVERLIST
+
+
+ XPSERVERLIST must be set for the option
+ identifying the available Xprint servers.
+ See Xprint__miscmansuffix__
+ for more details.
+
+
+
+
+
+
+
+ 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.
+
+
+
+
+ AUTHOR
+
+
+
+ MarkLillibridgeMIT Project Athena
+ JimFultonMIT X Consortium
+ PhilKarltonSGI
+ RolandMainzUniversity Giessen
+
+
+
+
+
+
+
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 @@