From f9a4fa3bb3176ff8c843ff7c8164327d5c4fb393 Mon Sep 17 00:00:00 2001 From: Deron Johnson Date: Fri, 18 Feb 2005 17:37:21 +0000 Subject: More 682 merge --- xlsfonts.c | 24 ------------------------ xlsfonts.man | 12 ++---------- xlsfonts.sgml | 18 ------------------ 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/xlsfonts.c b/xlsfonts.c index 4e2be2b..9718c93 100644 --- a/xlsfonts.c +++ b/xlsfonts.c @@ -93,7 +93,6 @@ void usage(void) fprintf (stderr, " -1 force single column\n"); fprintf (stderr, " -u keep output unsorted\n"); #ifdef BUILD_PRINTSUPPORT - fprintf (stderr, " -r resolution set print resolution\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\n"); @@ -174,29 +173,6 @@ int main(int argc, char **argv) sort_output = False; break; #ifdef BUILD_PRINTSUPPORT - case 'r': - { - const char *resname; - XpuResolutionList rlist; - int num_rlist; - XpuResolutionRec *res; - - if (--argc <= 0) usage (); - argv++; - resname = argv[0]; - - if (!printer_output) - Fatal_Error("Option '%c' only supported for printers.", argv[0][i]); - rlist = XpuGetResolutionList(dpy, pcontext, &num_rlist); - if (!rlist) - Fatal_Error("Could not get list of supported resolutions (Server configuration error ?)."); - res = XpuFindResolutionByName(rlist, num_rlist, resname); - if (!res) - Fatal_Error("Could not find resolution '%s'.", resname); - XpuSetDocResolution(dpy, pcontext, res); - XpuFreeResolutionList(rlist); - } - goto next; case 'b': mode = "xp-list-internal-printer-fonts"; if (!printer_output) diff --git a/xlsfonts.man b/xlsfonts.man index b92484a..325ce06 100644 --- a/xlsfonts.man +++ b/xlsfonts.man @@ -1,5 +1,5 @@ .\" -*- coding: us-ascii -*- -.TH xlsfonts __appmansuffix__ "25 October 2004" +.TH xlsfonts __appmansuffix__ "8 October 2004" .SH NAME xlsfonts \- server font list displayer for X .SH SYNOPSIS @@ -15,7 +15,7 @@ xlsfonts \- server font list displayer for X \fBxlsfonts\fR \kx .if (\nxu > (\n(.lu / 2)) .nr x (\n(.lu / 5) 'in \n(.iu+\nxu -\fB\-printer \fBprintername\fR\fR [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-r \fBresolution\fR\fR] [\fB\-b\fR] [\fB\-B\fR] [\fB\-g\fR] [\fB\-G\fR] [\fB\-x \fBmode\fR\fR] [\fB\-X \fBmode\fR\fR] [\fB\-fn \fBpattern\fR\fR] +\fB\-printer \fBprintername\fR\fR [\fB\-l\fR] [\fB\-ll\fR] [\fB\-lll\fR] [\fB\-m\fR] [\fB\-C\fR] [\fB\-1\fR] [\fB\-w \fBwidth\fR\fR] [\fB\-n \fBcolumns\fR\fR] [\fB\-u\fR] [\fB\-o\fR] [\fB\-b\fR] [\fB\-B\fR] [\fB\-g\fR] [\fB\-G\fR] [\fB\-x \fBmode\fR\fR] [\fB\-X \fBmode\fR\fR] [\fB\-fn \fBpattern\fR\fR] 'in \n(.iu-\nxu .ad b .SH DESCRIPTION @@ -82,14 +82,6 @@ This is useful if ListFonts or ListFontsWithInfo fail to list a known font (as is the case with some scaled font systems). .TP -\fB\-r \fIresolutionname\fB\fR -Set print resolution name (usually values like \fB300dpi\fR -or \fB300x600\fR, see output of xplsprinters). -This may alter the output of xlsfonts if there are printer -fonts which get enabled/disabled on per-resolution basis by the DDX. - -(printer mode only) -.TP \fB\-b\fR List printer builtin fonts. This is the same as \fB\-x xp\-list\-internal\-printer\-fonts\fR. diff --git a/xlsfonts.sgml b/xlsfonts.sgml index ff313ca..fa46518 100644 --- a/xlsfonts.sgml +++ b/xlsfonts.sgml @@ -79,8 +79,6 @@ manual volume numbers. - - @@ -268,22 +266,6 @@ manual volume numbers. - - - - - - Set print resolution name (usually values like 300dpi - or 300x600, see output of xplsprinters). - This may alter the output of xlsfonts if there are printer - fonts which get enabled/disabled on per-resolution basis by the DDX. - - - (printer mode only) - - - - -- cgit v1.2.3