Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/wsfont Replace qvss8x15 with version from NetBSD/vax...



details:   https://anonhg.NetBSD.org/src/rev/bcbba03e4245
branches:  trunk
changeset: 471910:bcbba03e4245
user:      ad <ad%NetBSD.org@localhost>
date:      Wed Apr 14 23:06:26 1999 +0000

description:
Replace qvss8x15 with version from NetBSD/vax, which contains the full ISO
character set.

diffstat:

 sys/dev/wsfont/files.wsfont |     7 +-
 sys/dev/wsfont/qvss8x15.h   |  4719 ++++++++++++++++++++++++++++--------------
 sys/dev/wsfont/wsfont.c     |    21 +-
 3 files changed, 3095 insertions(+), 1652 deletions(-)

diffs (truncated from 4817 to 300 lines):

diff -r d1af425a5cf8 -r bcbba03e4245 sys/dev/wsfont/files.wsfont
--- a/sys/dev/wsfont/files.wsfont       Wed Apr 14 22:23:15 1999 +0000
+++ b/sys/dev/wsfont/files.wsfont       Wed Apr 14 23:06:26 1999 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: files.wsfont,v 1.2 1999/04/14 18:25:47 ad Exp $
+# $NetBSD: files.wsfont,v 1.3 1999/04/14 23:06:26 ad Exp $
 #
 # "Workstation Font" config glue used by rcons and wscons.
 #
 file   dev/wsfont/wsfont.c     rasterconsole | wsdisplay
 
-defopt opt_wsfont.h            FONT_ISO8x16 FONT_BOLD8x16
-                               FONT_GALLANT12x22 FONT_QVSS8x15
+defopt opt_wsfont.h            FONT_BOLD8x16
+                               FONT_GALLANT12x22 
+                               FONT_QVSS8x15
                                FONT_LUCIDA16x29
diff -r d1af425a5cf8 -r bcbba03e4245 sys/dev/wsfont/qvss8x15.h
--- a/sys/dev/wsfont/qvss8x15.h Wed Apr 14 22:23:15 1999 +0000
+++ b/sys/dev/wsfont/qvss8x15.h Wed Apr 14 23:06:26 1999 +0000
@@ -1,11 +1,13 @@
-/* $NetBSD: qvss8x15.h,v 1.1 1999/04/13 00:24:13 ad Exp $ */
+/* $NetBSD: qvss8x15.h,v 1.2 1999/04/14 23:06:26 ad Exp $ */
 
-/* 
- * Copyright (c) 1992, 1993
+/*-
+ * Copyright (c) 1982, 1986
  *     The Regents of the University of California.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * Ralph Campbell.
+ * (c) UNIX System Laboratories, Inc.
+ * All or some portions of this file are derived from material licensed
+ * to the University of California by American Telephone and Telegraph
+ * Co. or Unix System Laboratories, Inc. and are reproduced herein with
+ * the permission of UNIX System Laboratories, Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -35,28 +37,46 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * Derived from:
- *
- *     @(#)font.c      8.1 (Berkeley) 6/10/93
- *
- *  font.c --
- *
- *             The font table for the pmax.
- *
- *     Copyright (C) 1989 Digital Equipment Corporation.
- *     Permission to use, copy, modify, and distribute this software and
- *     its documentation for any purpose and without fee is hereby granted,
- *     provided that the above copyright notice appears in all copies.  
- *     Digital Equipment Corporation makes no representations about the
- *     suitability of this software for any purpose.  It is provided "as is"
- *     without express or implied warranty.
+ *     @(#)qfont.c     7.2 (Berkeley) 1/21/94
+ */
+
+/*
+ *     derived from:  "@(#)qfont.c     6.2     ULTRIX  2/4/88"
  */
+
+/************************************************************************
+ *                                                                     *
+ *                     Copyright (c) 1984, 1987 by                     *
+ *             Digital Equipment Corporation, Maynard, MA              *
+ *                     All rights reserved.                            *
+ *                                                                     *
+ *   This software is furnished under a license and may be used and    *
+ *   copied  only  in accordance with the terms of such license and    *
+ *   with the  inclusion  of  the  above  copyright  notice.   This    *
+ *   software  or  any  other copies thereof may not be provided or    *
+ *   otherwise made available to any other person.  No title to and    *
+ *   ownership of the software is hereby transferred.                  *
+ *                                                                     *
+ *   This software is  derived  from  software  received  from  the    *
+ *   University    of   California,   Berkeley,   and   from   Bell    *
+ *   Laboratories.  Use, duplication, or disclosure is  subject  to    *
+ *   restrictions  under  license  agreements  with  University  of    *
+ *   California and with AT&T.                                         *
+ *                                                                     *
+ *   The information in this software is subject to change  without    *
+ *   notice  and should not be construed as a commitment by Digital    *
+ *   Equipment Corporation.                                            *
+ *                                                                     *
+ *   Digital assumes no responsibility for the use  or  reliability    *
+ *   of its software on equipment which is not supplied by Digital.    *
+ *                                                                     *
+ ************************************************************************/
 extern u_char qvss8x15_data[];
 
 struct wsdisplay_font qvss8x15 = { 
        "QVSS",                         /* typeface name */
        ' ',                            /* firstchar */
-       '~' - ' ' + 1,                  /* numchars */
+       0377 - ' ' + 1,                 /* numchars */
        WSDISPLAY_FONTENC_ISO,          /* encoding */
        8,                              /* width */
        15,                             /* height */
@@ -65,1618 +85,3045 @@
 };
 
 static u_char qvss8x15_data[] = {
-       /*   */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* ! */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x00,   /* ........ */
-       0x10,   /* ...*.... */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* " */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x24,   /* ..*..*.. */
-       0x24,   /* ..*..*.. */
-       0x24,   /* ..*..*.. */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* # */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x48,   /* .*..*... */
-       0x48,   /* .*..*... */
-       0xfc,   /* ******.. */
-       0x48,   /* .*..*... */
-       0x48,   /* .*..*... */
-       0xfc,   /* ******.. */
-       0x48,   /* .*..*... */
-       0x48,   /* .*..*... */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* $ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x10,   /* ...*.... */
-       0x7c,   /* .*****.. */
-       0x90,   /* *..*.... */
-       0x90,   /* *..*.... */
-       0x7c,   /* .*****.. */
-       0x12,   /* ...*..*. */
-       0x12,   /* ...*..*. */
-       0x7c,   /* .*****.. */
-       0x10,   /* ...*.... */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* % */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x42,   /* .*....*. */
-       0xa4,   /* *.*..*.. */
-       0xa4,   /* *.*..*.. */
-       0x48,   /* .*..*... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x24,   /* ..*..*.. */
-       0x4a,   /* .*..*.*. */
-       0x4a,   /* .*..*.*. */
-       0x84,   /* *....*.. */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* & */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x70,   /* .***.... */
-       0x88,   /* *...*... */
-       0x88,   /* *...*... */
-       0x88,   /* *...*... */
-       0x70,   /* .***.... */
-       0x88,   /* *...*... */
-       0x8a,   /* *...*.*. */
-       0x84,   /* *....*.. */
-       0x8c,   /* *...**.. */
-       0x72,   /* .***..*. */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* ' */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x1c,   /* ...***.. */
-       0x18,   /* ...**... */
-       0x20,   /* ..*..... */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* ( */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x08,   /* ....*... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x20,   /* ..*..... */
-       0x20,   /* ..*..... */
-       0x20,   /* ..*..... */
-       0x20,   /* ..*..... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x08,   /* ....*... */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* ) */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x20,   /* ..*..... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x08,   /* ....*... */
-       0x08,   /* ....*... */
-       0x08,   /* ....*... */
-       0x08,   /* ....*... */
-       0x10,   /* ...*.... */
-       0x10,   /* ...*.... */
-       0x20,   /* ..*..... */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* * */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x44,   /* .*...*.. */
-       0x28,   /* ..*.*... */
-       0xfe,   /* *******. */
-       0x28,   /* ..*.*... */
-       0x44,   /* .*...*.. */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-
-       /* + */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x00,   /* ........ */
-       0x10,   /* ...*.... */



Home | Main Index | Thread Index | Old Index