Synchronised line endinge with release branch

4 files changed, 409 insertions, 409 deletions

diff --git a/bdftopcf/Makefile.am b/bdftopcf/Makefile.am
index 181f3ac99..e70293fe5 100644
--- a/bdftopcf/Makefile.am
+++ b/bdftopcf/Makefile.am
@@ -1,61 +1,61 @@
-# 

-#  Copyright 2005  Red Hat, 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 Red Hat not be used in

-#  advertising or publicity pertaining to distribution of the software

-#  without specific, written prior permission.  Red Hat makes no

-#  representations about the suitability of this software for any

-#  purpose.  It is provided "as is" without express or implied warranty.

-# 

-#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

-#  NO EVENT SHALL RED HAT 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.

-

-bin_PROGRAMS = bdftopcf

-

-AM_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@

-bdftopcf_LDADD  = @BDFTOPCF_LIBS@

-

-bdftopcf_SOURCES = bdftopcf.c

-

-appman_PRE = bdftopcf.man

-

-appmandir = $(APP_MAN_DIR)

-

-appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)

-

-EXTRA_DIST = $(appman_PRE) 

-MAINTAINERCLEANFILES = ChangeLog INSTALL

-CLEANFILES = $(appman_DATA)

-

-SUFFIXES = .$(APP_MAN_SUFFIX) .man

-

-# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure

-.man.$(APP_MAN_SUFFIX):

-	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@

-

-.PHONY: ChangeLog INSTALL

-

-INSTALL:

-	$(INSTALL_CMD)

-

-ChangeLog:

-	$(CHANGELOG_CMD)

-

-dist-hook: ChangeLog INSTALL

-

-if LINT

-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

-                $(AM_CPPFLAGS) $(CPPFLAGS) $(bdftopcf_CFLAGS)

-

-lint:

-	$(LINT) $(ALL_LINT_FLAGS) $(bdftopcf_SOURCES)

-endif LINT

+# 
+#  Copyright 2005  Red Hat, 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 Red Hat not be used in
+#  advertising or publicity pertaining to distribution of the software
+#  without specific, written prior permission.  Red Hat makes no
+#  representations about the suitability of this software for any
+#  purpose.  It is provided "as is" without express or implied warranty.
+# 
+#  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+#  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+#  NO EVENT SHALL RED HAT 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.
+
+bin_PROGRAMS = bdftopcf
+
+AM_CFLAGS = $(CWARNFLAGS) @BDFTOPCF_CFLAGS@
+bdftopcf_LDADD  = @BDFTOPCF_LIBS@
+
+bdftopcf_SOURCES = bdftopcf.c
+
+appman_PRE = bdftopcf.man
+
+appmandir = $(APP_MAN_DIR)
+
+appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
+
+EXTRA_DIST = $(appman_PRE) 
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+CLEANFILES = $(appman_DATA)
+
+SUFFIXES = .$(APP_MAN_SUFFIX) .man
+
+# String replacements in MAN_SUBSTS now come from xorg-macros.m4 via configure
+.man.$(APP_MAN_SUFFIX):
+	$(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
+
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+	$(INSTALL_CMD)
+
+ChangeLog:
+	$(CHANGELOG_CMD)
+
+dist-hook: ChangeLog INSTALL
+
+if LINT
+ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+                $(AM_CPPFLAGS) $(CPPFLAGS) $(bdftopcf_CFLAGS)
+
+lint:
+	$(LINT) $(ALL_LINT_FLAGS) $(bdftopcf_SOURCES)
+endif LINT
diff --git a/bdftopcf/bdftopcf.c b/bdftopcf/bdftopcf.c
index b39f2d949..10e5b1279 100644
--- a/bdftopcf/bdftopcf.c
+++ b/bdftopcf/bdftopcf.c
@@ -1,192 +1,192 @@
-/*

-

-Copyright 1991, 1993, 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.

-

-*/

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include <X11/fonts/fontmisc.h>

-#include <X11/fonts/fontstruct.h>

-#include <X11/fonts/fntfilio.h>

-#include <X11/fonts/fntfil.h>

-#include <X11/fonts/bdfint.h>

-#include <X11/fonts/pcf.h>

-#include <stdio.h>

-#include <X11/Xos.h>

-

-int

-main (int argc, char *argv[])

-{

-    FontRec font;

-    FontFilePtr	input, output;

-    char    *input_name = NULL, *output_name = NULL;

-    char    *program_name;

-    int	    bit, byte, glyph, scan;

-

-    bzero(&font, sizeof(FontRec));

-

-    FontDefaultFormat (&bit, &byte, &glyph, &scan);

-    program_name = argv[0];

-    argc--, argv++;

-    while (argc-- > 0) {

-	if (argv[0][0] == '-') {

-	    switch (argv[0][1]) {

-	    case 'p':

-		switch (argv[0][2]) {

-		case '1':

-		case '2':

-		case '4':

-		case '8':

-		    if (argv[0][3] != '\0')

-			goto usage;

-		    glyph = argv[0][2] - '0';

-		    break;

-		default:

-		    goto usage;

-		}

-		break;

-

-	    case 'u':

-		switch (argv[0][2]) {

-		case '1':

-		case '2':

-		case '4':

-		    if (argv[0][3] != '\0')

-			goto usage;

-		    scan = argv[0][2] - '0';

-		    break;

-		default:

-		    goto usage;

-		}

-		break;

-

-	    case 'm':

-		if (argv[0][2] != '\0')

-		    goto usage;

-		bit = MSBFirst;

-		break;

-

-	    case 'l':

-		if (argv[0][2] != '\0')

-		    goto usage;

-		bit = LSBFirst;

-		break;

-

-	    case 'M':

-		if (argv[0][2] != '\0')

-		    goto usage;

-		byte = MSBFirst;

-		break;

-

-	    case 'L':

-		if (argv[0][2] != '\0')

-		    goto usage;

-		byte = LSBFirst;

-		break;

-

-	    case 't':	/* attempt to make terminal fonts if possible */

-		if (argv[0][2] != '\0')

-		    goto usage;

-		break;

-

-	    case 'i':	/* inhibit ink metric computation */

-		if (argv[0][2] != '\0')

-		    goto usage;

-		break;

-	    case 'o':

-		if (argv[0][2])

-		    output_name = argv[0] + 2;

-		else

-		{

-		    if (!argv[1])

-			goto usage;

-		    argv++;

-		    argc--;

-		    output_name = argv[0];

-		}

-		break;

-	    default:

-		goto usage;

-	    }

-	} else {

-	    if (input_name)

-	    {

-	usage:

-		fprintf(stderr,

-	"usage: %s [-p#] [-u#] [-m] [-l] [-M] [-L] [-t] [-i] [-o pcf file] [bdf file]\n",

-			program_name);

-		fprintf(stderr,

-			"       where # for -p is 1, 2, 4, or 8\n");

-		fprintf(stderr,

-			"       and   # for -s is 1, 2, or 4\n");

-		exit(1);

-	    }

-	    input_name = argv[0];

-	}

-	argv++;

-    }

-    if (input_name)

-    {

-    	input = FontFileOpen (input_name);

-    	if (!input)

-    	{

-	    fprintf (stderr, "%s: can't open bdf source file %s\n",

-		     program_name, input_name);

-	    exit (1);

-    	}

-    }

-    else

-	input = FontFileOpenFd (0);

-    if (bdfReadFont (&font, input, bit, byte, glyph, scan) != Successful)

-    {

-	fprintf (stderr, "%s: bdf input, %s, corrupt\n",

-		 program_name, input_name ? input_name : "<stdin>");

-	exit (1);

-    }

-    if (output_name)

-    {

-	output = FontFileOpenWrite (output_name);

-    	if (!output)

-    	{

-	    fprintf (stderr, "%s: can't open pcf sink file %s\n",

-		     program_name, output_name);

-	    exit (1);

-    	}

-    } 

-    else

-	output = FontFileOpenWriteFd (1);

-    if (pcfWriteFont (&font, output) != Successful)

-    {

-	fprintf (stderr, "%s: can't write pcf file %s\n",

-		 program_name, output_name ? output_name : "<stdout>");

-	if (output_name)

-	    unlink (output_name);

-	exit (1);

-    }

-    else

-	FontFileClose (output);

-    return (0);

-}

+/*
+
+Copyright 1991, 1993, 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.
+
+*/
+
+#include <X11/X.h>
+#include <X11/Xproto.h>
+#include <X11/fonts/fontmisc.h>
+#include <X11/fonts/fontstruct.h>
+#include <X11/fonts/fntfilio.h>
+#include <X11/fonts/fntfil.h>
+#include <X11/fonts/bdfint.h>
+#include <X11/fonts/pcf.h>
+#include <stdio.h>
+#include <X11/Xos.h>
+
+int
+main (int argc, char *argv[])
+{
+    FontRec font;
+    FontFilePtr	input, output;
+    char    *input_name = NULL, *output_name = NULL;
+    char    *program_name;
+    int	    bit, byte, glyph, scan;
+
+    bzero(&font, sizeof(FontRec));
+
+    FontDefaultFormat (&bit, &byte, &glyph, &scan);
+    program_name = argv[0];
+    argc--, argv++;
+    while (argc-- > 0) {
+	if (argv[0][0] == '-') {
+	    switch (argv[0][1]) {
+	    case 'p':
+		switch (argv[0][2]) {
+		case '1':
+		case '2':
+		case '4':
+		case '8':
+		    if (argv[0][3] != '\0')
+			goto usage;
+		    glyph = argv[0][2] - '0';
+		    break;
+		default:
+		    goto usage;
+		}
+		break;
+
+	    case 'u':
+		switch (argv[0][2]) {
+		case '1':
+		case '2':
+		case '4':
+		    if (argv[0][3] != '\0')
+			goto usage;
+		    scan = argv[0][2] - '0';
+		    break;
+		default:
+		    goto usage;
+		}
+		break;
+
+	    case 'm':
+		if (argv[0][2] != '\0')
+		    goto usage;
+		bit = MSBFirst;
+		break;
+
+	    case 'l':
+		if (argv[0][2] != '\0')
+		    goto usage;
+		bit = LSBFirst;
+		break;
+
+	    case 'M':
+		if (argv[0][2] != '\0')
+		    goto usage;
+		byte = MSBFirst;
+		break;
+
+	    case 'L':
+		if (argv[0][2] != '\0')
+		    goto usage;
+		byte = LSBFirst;
+		break;
+
+	    case 't':	/* attempt to make terminal fonts if possible */
+		if (argv[0][2] != '\0')
+		    goto usage;
+		break;
+
+	    case 'i':	/* inhibit ink metric computation */
+		if (argv[0][2] != '\0')
+		    goto usage;
+		break;
+	    case 'o':
+		if (argv[0][2])
+		    output_name = argv[0] + 2;
+		else
+		{
+		    if (!argv[1])
+			goto usage;
+		    argv++;
+		    argc--;
+		    output_name = argv[0];
+		}
+		break;
+	    default:
+		goto usage;
+	    }
+	} else {
+	    if (input_name)
+	    {
+	usage:
+		fprintf(stderr,
+	"usage: %s [-p#] [-u#] [-m] [-l] [-M] [-L] [-t] [-i] [-o pcf file] [bdf file]\n",
+			program_name);
+		fprintf(stderr,
+			"       where # for -p is 1, 2, 4, or 8\n");
+		fprintf(stderr,
+			"       and   # for -s is 1, 2, or 4\n");
+		exit(1);
+	    }
+	    input_name = argv[0];
+	}
+	argv++;
+    }
+    if (input_name)
+    {
+    	input = FontFileOpen (input_name);
+    	if (!input)
+    	{
+	    fprintf (stderr, "%s: can't open bdf source file %s\n",
+		     program_name, input_name);
+	    exit (1);
+    	}
+    }
+    else
+	input = FontFileOpenFd (0);
+    if (bdfReadFont (&font, input, bit, byte, glyph, scan) != Successful)
+    {
+	fprintf (stderr, "%s: bdf input, %s, corrupt\n",
+		 program_name, input_name ? input_name : "<stdin>");
+	exit (1);
+    }
+    if (output_name)
+    {
+	output = FontFileOpenWrite (output_name);
+    	if (!output)
+    	{
+	    fprintf (stderr, "%s: can't open pcf sink file %s\n",
+		     program_name, output_name);
+	    exit (1);
+    	}
+    } 
+    else
+	output = FontFileOpenWriteFd (1);
+    if (pcfWriteFont (&font, output) != Successful)
+    {
+	fprintf (stderr, "%s: can't write pcf file %s\n",
+		 program_name, output_name ? output_name : "<stdout>");
+	if (output_name)
+	    unlink (output_name);
+	exit (1);
+    }
+    else
+	FontFileClose (output);
+    return (0);
+}
diff --git a/bdftopcf/bdftopcf.man b/bdftopcf/bdftopcf.man
index d405a0ae9..4d05e1b16 100644
--- a/bdftopcf/bdftopcf.man
+++ b/bdftopcf/bdftopcf.man
@@ -1,112 +1,112 @@
-.\" Copyright 1993, 1994, 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.

-.\"

-.TH BDFTOPCF 1 __xorgversion__

-.SH NAME

-bdftopcf \- convert X font from Bitmap Distribution Format to Portable

-Compiled Format

-.SH SYNOPSIS

-.B bdftopcf

-[

-.BI \-p n

-] [

-.BI \-u n

-] [

-.B \-m

-] [

-.B \-l

-] [

-.B \-M

-] [

-.B \-L

-] [

-.B \-t

-] [

-.B \-i

-] [

-.B \-o

-.I outputfile

-] fontfile.bdf

-.SH DESCRIPTION

-.I Bdftopcf

-is a font compiler for the X server and font server.

-Fonts in Portable Compiled Format can be

-read by any architecture, although the file is structured to allow one

-particular architecture to read them directly without reformatting.  This

-allows fast reading on the appropriate machine, but the files are still

-portable (but read more slowly) on other machines.

-.SH OPTIONS

-.TP 8

-.B \-p\fIn\fP

-Sets the font glyph padding.  Each glyph in the font will have each scanline

-padded in to a multiple of \fIn\fP bytes, where \fIn\fP is 1, 2, 4 or 8.

-.TP 8

-.B \-u\fIn\fP

-Sets the font scanline unit.  When the font bit order is different from the

-font byte order, the scanline unit \fIn\fP describes what unit of data (in

-bytes) are to be swapped; the unit \fIi\fP can be 1, 2 or 4 bytes.

-.TP 8

-.B \-m

-Sets the font bit order to MSB (most significant bit) first.  Bits for each

-glyph will be placed in this order; i.e., the left most bit on the screen

-will be in the highest valued bit in each unit.

-.TP 8

-.B \-l

-Sets the font bit order to LSB (least significant bit) first.  The left most

-bit on the screen will be in the lowest valued bit in each unit.

-.TP 8

-.B \-M

-Sets the font byte order to MSB first.  All multi-byte data in the file

-(metrics, bitmaps and everything else) will be written most significant byte

-first.

-.TP 8

-.B \-L

-Sets the font byte order to LSB first.  All multi-byte data in the file

-(metrics, bitmaps and everything else) will be written least significant

-byte first.

-.TP 8

-.B \-t

-When this option is specified,

-.I bdftopcf

-will convert fonts into "terminal" fonts when possible.  A terminal font has

-each glyph image padded to the same size; the X server can usually render

-these types of fonts more quickly.

-.TP 8

-.B \-i

-This option inhibits the normal computation of ink metrics.  When a font has

-glyph images which do not fill the bitmap image (i.e., the "on" pixels don't

-extend to the edges of the metrics)

-.I bdftopcf

-computes the actual ink metrics and places them in the .pcf file; the \-t

-option inhibits this behaviour.

-.TP 8

-.BI "\-o " output-file-name

-By default

-.I bdftopcf

-writes the pcf file to standard output; this option gives the name of a file

-to be used instead.

-.SH "SEE ALSO"

-X(__miscmansuffix__)

-.SH AUTHOR

-Keith Packard, MIT X Consortium

+.\" Copyright 1993, 1994, 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.
+.\"
+.TH BDFTOPCF 1 __xorgversion__
+.SH NAME
+bdftopcf \- convert X font from Bitmap Distribution Format to Portable
+Compiled Format
+.SH SYNOPSIS
+.B bdftopcf
+[
+.BI \-p n
+] [
+.BI \-u n
+] [
+.B \-m
+] [
+.B \-l
+] [
+.B \-M
+] [
+.B \-L
+] [
+.B \-t
+] [
+.B \-i
+] [
+.B \-o
+.I outputfile
+] fontfile.bdf
+.SH DESCRIPTION
+.I Bdftopcf
+is a font compiler for the X server and font server.
+Fonts in Portable Compiled Format can be
+read by any architecture, although the file is structured to allow one
+particular architecture to read them directly without reformatting.  This
+allows fast reading on the appropriate machine, but the files are still
+portable (but read more slowly) on other machines.
+.SH OPTIONS
+.TP 8
+.B \-p\fIn\fP
+Sets the font glyph padding.  Each glyph in the font will have each scanline
+padded in to a multiple of \fIn\fP bytes, where \fIn\fP is 1, 2, 4 or 8.
+.TP 8
+.B \-u\fIn\fP
+Sets the font scanline unit.  When the font bit order is different from the
+font byte order, the scanline unit \fIn\fP describes what unit of data (in
+bytes) are to be swapped; the unit \fIi\fP can be 1, 2 or 4 bytes.
+.TP 8
+.B \-m
+Sets the font bit order to MSB (most significant bit) first.  Bits for each
+glyph will be placed in this order; i.e., the left most bit on the screen
+will be in the highest valued bit in each unit.
+.TP 8
+.B \-l
+Sets the font bit order to LSB (least significant bit) first.  The left most
+bit on the screen will be in the lowest valued bit in each unit.
+.TP 8
+.B \-M
+Sets the font byte order to MSB first.  All multi-byte data in the file
+(metrics, bitmaps and everything else) will be written most significant byte
+first.
+.TP 8
+.B \-L
+Sets the font byte order to LSB first.  All multi-byte data in the file
+(metrics, bitmaps and everything else) will be written least significant
+byte first.
+.TP 8
+.B \-t
+When this option is specified,
+.I bdftopcf
+will convert fonts into "terminal" fonts when possible.  A terminal font has
+each glyph image padded to the same size; the X server can usually render
+these types of fonts more quickly.
+.TP 8
+.B \-i
+This option inhibits the normal computation of ink metrics.  When a font has
+glyph images which do not fill the bitmap image (i.e., the "on" pixels don't
+extend to the edges of the metrics)
+.I bdftopcf
+computes the actual ink metrics and places them in the .pcf file; the \-t
+option inhibits this behaviour.
+.TP 8
+.BI "\-o " output-file-name
+By default
+.I bdftopcf
+writes the pcf file to standard output; this option gives the name of a file
+to be used instead.
+.SH "SEE ALSO"
+X(__miscmansuffix__)
+.SH AUTHOR
+Keith Packard, MIT X Consortium
diff --git a/bdftopcf/configure.ac b/bdftopcf/configure.ac
index 07fa6b3e0..1f00ef7fb 100644
--- a/bdftopcf/configure.ac
+++ b/bdftopcf/configure.ac
@@ -1,44 +1,44 @@
-dnl  Copyright 2005 Red Hat, Inc.

-dnl 

-dnl  Permission to use, copy, modify, distribute, and sell this software

-dnl  and its documentation for any purpose is hereby granted without fee,

-dnl  provided that the above copyright notice appear in all copies and

-dnl  that both that copyright notice and this permission notice appear in

-dnl  supporting documentation, and that the name of Red Hat not be used in

-dnl  advertising or publicity pertaining to distribution of the software

-dnl  without specific, written prior permission.  Red Hat makes no

-dnl  representations about the suitability of this software for any

-dnl  purpose.  It is provided "as is" without express or implied warranty.

-dnl 

-dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

-dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN

-dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR

-dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS

-dnl  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE

-dnl  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE

-dnl  USE OR PERFORMANCE OF THIS SOFTWARE.

-dnl

-dnl Process this file with autoconf to create configure.

-

-AC_PREREQ([2.60])

-AC_INIT([bdftopcf], [1.0.3],

-        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [bdftopcf])

-AM_INIT_AUTOMAKE([foreign dist-bzip2])

-AM_MAINTAINER_MODE

-

-AM_CONFIG_HEADER(config.h)

-

-# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS

-m4_ifndef([XORG_MACROS_VERSION],

-          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])

-XORG_MACROS_VERSION(1.8)

-XORG_DEFAULT_OPTIONS

-

-AC_PROG_INSTALL

-

-# Checks for pkg-config packages

-PKG_CHECK_MODULES(BDFTOPCF, xfont)

-

-XORG_WITH_LINT

-

-AC_OUTPUT([Makefile])

+dnl  Copyright 2005 Red Hat, Inc.
+dnl 
+dnl  Permission to use, copy, modify, distribute, and sell this software
+dnl  and its documentation for any purpose is hereby granted without fee,
+dnl  provided that the above copyright notice appear in all copies and
+dnl  that both that copyright notice and this permission notice appear in
+dnl  supporting documentation, and that the name of Red Hat not be used in
+dnl  advertising or publicity pertaining to distribution of the software
+dnl  without specific, written prior permission.  Red Hat makes no
+dnl  representations about the suitability of this software for any
+dnl  purpose.  It is provided "as is" without express or implied warranty.
+dnl 
+dnl  RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+dnl  INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+dnl  NO EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+dnl  CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+dnl  OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+dnl  OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
+dnl  USE OR PERFORMANCE OF THIS SOFTWARE.
+dnl
+dnl Process this file with autoconf to create configure.
+
+AC_PREREQ([2.60])
+AC_INIT([bdftopcf], [1.0.3],
+        [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [bdftopcf])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
+
+AM_CONFIG_HEADER(config.h)
+
+# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
+m4_ifndef([XORG_MACROS_VERSION],
+          [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
+XORG_DEFAULT_OPTIONS
+
+AC_PROG_INSTALL
+
+# Checks for pkg-config packages
+PKG_CHECK_MODULES(BDFTOPCF, xfont)
+
+XORG_WITH_LINT
+
+AC_OUTPUT([Makefile])