Remove courier11x18 due to licensing concerns. Fixup license on lucida16x29.
This commit is contained in:
parent
0f274aa73e
commit
619320f97d
File diff suppressed because it is too large
Load Diff
|
@ -1,9 +1,9 @@
|
|||
# $NetBSD: files.wsfont,v 1.1 1999/04/13 00:24:09 ad Exp $
|
||||
# $NetBSD: files.wsfont,v 1.2 1999/04/14 18:25:47 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_COURIER11x18
|
||||
defopt opt_wsfont.h FONT_ISO8x16 FONT_BOLD8x16
|
||||
FONT_GALLANT12x22 FONT_QVSS8x15
|
||||
FONT_LUCIDA16x29
|
||||
|
|
|
@ -1,31 +1,67 @@
|
|||
/* $NetBSD: lucida16x29.h,v 1.1 1999/04/13 00:24:12 ad Exp $ */
|
||||
/* $NetBSD: lucida16x29.h,v 1.2 1999/04/14 18:25:47 ad Exp $ */
|
||||
|
||||
/*
|
||||
* (c) Copyright 1989 Sun Microsystems, Inc. Sun design patents
|
||||
* pending in the U.S. and foreign countries. OPEN LOOK is a
|
||||
* trademark of AT&T. Used by written permission of the owners.
|
||||
*
|
||||
* (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered
|
||||
* trademark of Bigelow & Holmes. Permission to use the Lucida
|
||||
* trademark is hereby granted only in association with the images
|
||||
* and fonts described in this file.
|
||||
*
|
||||
* SUN MICROSYSTEMS, INC., AT&T, AND BIGELOW & HOLMES
|
||||
* MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF
|
||||
* THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS"
|
||||
* WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.
|
||||
* SUN MICROSYSTEMS, INC., AT&T AND BIGELOW & HOLMES,
|
||||
* SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED
|
||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
* PARTICULAR PURPOSE. IN NO EVENT SHALL SUN MICROSYSTEMS,
|
||||
* INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY
|
||||
* SPECIAL, INDIRECT, INCIDENTAL, 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 SOURCE CODE.
|
||||
*/
|
||||
|
||||
This is the LEGAL NOTICE pertaining to the Lucida fonts from Bigelow & Holmes:
|
||||
|
||||
NOTICE TO USER: The source code, including the glyphs or icons
|
||||
forming a par of the OPEN LOOK TM Graphic User Interface, on this
|
||||
tape and in these files is copyrighted under U.S. and international
|
||||
laws. Sun Microsystems, Inc. of Mountain View, California owns
|
||||
the copyright and has design patents pending on many of the icons.
|
||||
AT&T is the owner of the OPEN LOOK trademark associated with the
|
||||
materials on this tape. Users and possessors of this source code
|
||||
are hereby granted a nonexclusive, royalty-free copyright and
|
||||
design patent license to use this code in individual and
|
||||
commercial software. A royalty-free, nonexclusive trademark
|
||||
license to refer to the code and output as "OPEN LOOK" compatible
|
||||
is available from AT&T if, and only if, the appearance of the
|
||||
icons or glyphs is not changed in any manner except as absolutely
|
||||
necessary to accommodate the standard resolution of the screen or
|
||||
other output device, the code and output is not changed except as
|
||||
authorized herein, and the code and output is validated by AT&T.
|
||||
Bigelow & Holmes is the owner of the Lucida (R) trademark for the
|
||||
fonts and bit-mapped images associated with the materials on this
|
||||
tape. Users are granted a royalty-free, nonexclusive license to use
|
||||
the trademark only to identify the fonts and bit-mapped images if,
|
||||
and only if, the fonts and bit-mapped images are not modified in any
|
||||
way by the user.
|
||||
|
||||
|
||||
Any use of this source code must include, in the user documentation
|
||||
and internal comments to the code, notices to the end user as
|
||||
follows:
|
||||
|
||||
|
||||
(c) Copyright 1989 Sun Microsystems, Inc. Sun design patents
|
||||
pending in the U.S. and foreign countries. OPEN LOOK is a
|
||||
trademark of AT&T. Used by written permission of the owners.
|
||||
|
||||
|
||||
(c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered
|
||||
trademark of Bigelow & Holmes. Permission to use the Lucida
|
||||
trademark is hereby granted only in association with the images
|
||||
and fonts described in this file.
|
||||
|
||||
|
||||
|
||||
SUN MICROSYSTEMS, INC., AT&T, AND BIGELOW & HOLMES
|
||||
MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY OF
|
||||
THIS SOURCE CODE FOR ANY PURPOSE. IT IS PROVIDED "AS IS"
|
||||
WITHOUT EXPRESS OR IMPLIED WARRANTY OF ANY KIND.
|
||||
SUN MICROSYSTEMS, INC., AT&T AND BIGELOW & HOLMES,
|
||||
SEVERALLY AND INDIVIDUALLY, DISCLAIM ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOURCE CODE, INCLUDING ALL IMPLIED
|
||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
||||
PARTICULAR PURPOSE. IN NO EVENT SHALL SUN MICROSYSTEMS,
|
||||
INC., AT&T OR BIGELOW & HOLMES BE LIABLE FOR ANY
|
||||
SPECIAL, INDIRECT, INCIDENTAL, 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 SOURCE CODE.
|
||||
|
||||
*/
|
||||
extern u_char lucida16x29_data[];
|
||||
|
||||
struct wsdisplay_font lucida16x29 = {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: wsfont.c,v 1.2 1999/04/13 00:40:11 ad Exp $ */
|
||||
/* $NetBSD: wsfont.c,v 1.3 1999/04/14 18:25:47 ad Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1999 Andy Doran <ad@NetBSD.org>
|
||||
|
@ -28,7 +28,7 @@
|
|||
*/
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.2 1999/04/13 00:40:11 ad Exp $");
|
||||
__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.3 1999/04/14 18:25:47 ad Exp $");
|
||||
|
||||
#include "opt_wsfont.h"
|
||||
|
||||
|
@ -54,11 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.2 1999/04/13 00:40:11 ad Exp $");
|
|||
#include <dev/wsfont/bold8x16.h>
|
||||
#endif
|
||||
|
||||
#ifdef FONT_COURIER11x18
|
||||
#define HAVE_FONT 1
|
||||
#include <dev/wsfont/courier11x18.h>
|
||||
#endif
|
||||
|
||||
#ifdef FONT_GALLANT12x22
|
||||
#define HAVE_FONT 1
|
||||
#include <dev/wsfont/gallant12x22.h>
|
||||
|
|
Loading…
Reference in New Issue