Release 6.4 Public Patch #02 Open Group X Project Team To apply this patch: cd to the top of the source tree (to the directory containing the "xc" subdirectory) and do: patch -p -s < ThisFile Patch will work silently unless an error occurs. If you want to watch patch do its thing, leave out the "-s" argument to patch. Finally, to rebuild after applying this patch, cd to the "xc" subdirectory and do: make Everything >& every.log Brief notes on what this patch fixes: config: support for gcc-2.8.x on i386 config: build Netscape plug-in on IBM AIX 4.x config: CDE/Motif changes for building on Linux config: imake recognize Red Hat distribution config: imake recognize libc2/glibc6 version config: makedepend ignore #warning in *BSD and Linux headers Xlib: support for Final Committee Draft 8859-15 (Latin-9) and Euro character libraries: fix warnings from gcc -Wall -pedantic libraries: fix buffer overflows Xinerama: miscellaneous bug-fixes from contributor LBX: miscellaneous bug fixes Xserver: fix buffer overflows proxymngr: miscellaneous bug fixes xdm: don't make duplicate authorization entries on some systems xfs: fix buffer overflows xfwp: miscellaneous bug fixes xieperf: miscellaneous bug fixes xrx: plugin bug fixes and build on IBM AIX 4.x xterm: fix buffer overflows fonts: add missing glyph for nobreakspace to various bitmap fonts fonts: add two 8859-15 fonts registry: add coded charset names for Unicode, ISO10646 doc: update X Protocol specification with Latin-9 and Currency keysyms ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** This patch is freely redistributable. There are no license terms associated with the fixes in this patch file. Anyone may use this patch free of charge. ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** NOTE ** ***************************************************************************** Prereq: R6.4, public-patch-1 *** bug-report@@/PUBLIC-LATEST Wed May 13 09:10:24 1998 --- xc/bug-report Mon Jun 29 10:04:45 1998 *************** *** 9,15 **** VERSION: ! R6.4, public-patch-1 [X Project Team public patches edit this line to indicate the patch level] CLIENT MACHINE and OPERATING SYSTEM: --- 9,15 ---- VERSION: ! R6.4, public-patch-2 [X Project Team public patches edit this line to indicate the patch level] CLIENT MACHINE and OPERATING SYSTEM: *** ./config/cf/Imake.cf@@/PUBLIC-LATEST Wed Jun 25 08:31:34 1997 --- xc/config/cf/Imake.cf Tue Apr 28 13:55:23 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imake.cf /main/28 1997/06/25 08:31:36 barstow $ /* * To add support for another platform: * --- 1,4 ---- ! XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ /* * To add support for another platform: * *************** *** 407,417 **** --- 407,423 ---- # ifdef i386 # define i386Architecture # undef i386 + # ifdef __i386__ + # ifndef i386Architecture + # define i386Architecture + # endif + # undef __i386__ # endif /* i386 */ # ifdef __alpha # define AlphaArchitecture # undef __alpha # endif /* __alpha */ + #endif #endif /* linux */ #ifdef __uxp__ *** ./config/cf/README@@/PUBLIC-LATEST Mon Nov 24 16:43:06 1997 --- xc/config/cf/README Mon May 11 14:35:06 1998 *************** *** 1,4 **** ! $TOG: README /main/75 1997/11/24 16:47:09 kaleb $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! --- 1,4 ---- ! $TOG: README /main/76 1998/05/11 14:35:10 barstow $ The easiest way to write an Imakefile is to find another one that does something similar and copy/modify it! *************** *** 122,127 **** --- 122,128 ---- OSMajorVersion major version number of operating system OSMinorVersion minor version number of operating system OptimizedCDebugFlags C compiler flags to turn on optimization + XtPopdownConformance XtPopdown conformans to the specification PreProcessCmd command to run /lib/cpp on scripts RanlibCmd command to clean up libraries RanlibInstFlags flags to ranlib after copying *** ./config/cf/X11.tmpl@@/PUBLIC-LATEST Mon Feb 2 12:01:17 1998 --- xc/config/cf/X11.tmpl Tue Jun 16 15:13:43 1998 *************** *** 1,6 **** XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules ! XCOMM $TOG: X11.tmpl /main/306 1998/02/02 12:01:44 kaleb $ /*************************************************************************** * * --- 1,6 ---- XCOMM ---------------------------------------------------------------------- XCOMM X Window System Build Parameters and Rules ! XCOMM $TOG: X11.tmpl /main/308 1998/06/16 15:14:24 msr $ /*************************************************************************** * * *************** *** 211,216 **** --- 211,233 ---- #endif #endif #endif + #ifndef DefaultFSFontPath + /* + * Define a default fontpath for Font Server independent of that + * for X server if building the X server for low memory footprint + */ + #if BuildLowMem + #if PrimaryScreenResolution < 88 /* (75 + 100) / 2 */ + #define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/, + $(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ + #else + #define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Speedo/,$(FONTDIR)/Type1/, + $(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ + #endif + #else + #define DefaultFSFontPath DefaultFontPath + #endif + #endif #ifndef DefaultRGBDatabase #define DefaultRGBDatabase $(LIBDIR)/rgb #endif *************** *** 670,675 **** --- 687,696 ---- #ifndef ResourceConfigurationManagement #define ResourceConfigurationManagement YES + #endif + + #ifndef XtPopdownConformance + #define XtPopdownConformance YES #endif XCOMM ----------------------------------------------------------------------- *** ./config/cf/ibm.cf@@/PUBLIC-LATEST Thu Oct 16 11:25:51 1997 --- xc/config/cf/ibm.cf Thu Feb 26 17:03:25 1998 *************** *** 1,4 **** ! XCOMM platform: $TOG: ibm.cf /main/81 1997/10/16 11:27:45 kaleb $ #ifndef OSName # define OSName DefaultOSName --- 1,4 ---- ! XCOMM platform: $TOG: ibm.cf /main/82 1998/02/26 17:03:51 kaleb $ #ifndef OSName # define OSName DefaultOSName *************** *** 23,28 **** --- 23,29 ---- #if OSMajorVersion > 3 || (OSMajorVersion == 3 && OSMinorVersion >= 2) #define HasBSD44Sockets YES #define HasPutenv YES + #define HasPlugin YES /* * If you do not have threads support installed, put * #define HasPosixThreads NO *** ./config/cf/linux.cf@@/PUBLIC-LATEST Sat Oct 25 20:16:21 1997 --- xc/config/cf/linux.cf Fri Apr 17 11:33:11 1998 *************** *** 1,4 **** ! XCOMM platform: $TOG: linux.cf /main/41 1997/10/25 20:18:47 kaleb $ #ifndef OSName #define OSName DefaultOSName --- 1,4 ---- ! XCOMM platform: $TOG: linux.cf /main/47 1998/04/17 11:32:51 mgreess $ #ifndef OSName #define OSName DefaultOSName *************** *** 58,63 **** --- 58,64 ---- #define UseElfFormat NO #endif #endif + #define BuildLibPathVar LD_LIBRARY_PATH #define HasGcc YES #define HasGcc2 YES #define HasGcc2ForCplusplus YES *************** *** 65,73 **** #define UseGas YES #define GnuCpp YES #define HasShadowPasswd NO - #ifndef HasLibCrypt - # define HasLibCrypt NO - #endif #define HasPutenv YES #define HasShm YES #define HasSockets YES --- 66,71 ---- *************** *** 112,118 **** #endif #define MkdirHierCmd mkdir -p #define CppCmd /lib/cpp ! #define YaccCmd bison -y #define LexCmd flex -l #define LexLib -lfl #define PreProcessCmd CcCmd -E --- 110,120 ---- #endif #define MkdirHierCmd mkdir -p #define CppCmd /lib/cpp ! #if OSMajorVersion >= 2 ! #define YaccCmd yacc ! #else ! #define YaccCmd bison -y ! #endif #define LexCmd flex -l #define LexLib -lfl #define PreProcessCmd CcCmd -E *************** *** 132,137 **** --- 134,142 ---- #if LinuxCLibMajorVersion < 6 #define LinuxSourceDefines -D_POSIX_SOURCE \ -D_BSD_SOURCE -D_SVID_SOURCE LinuxLocaleDefines + #ifndef HasLibCrypt + # define HasLibCrypt NO + #endif #else #define LinuxSourceDefines -D_POSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE \ *************** *** 141,147 **** --- 146,155 ---- #define HasThreadSafeAPI YES #define ThreadsLibraries -lpthread #define SystemMTDefines -D_REENTRANT + #ifndef HasLibCrypt + # define HasLibCrypt YES #endif + #endif #ifdef i386Architecture #define OptimizedCDebugFlags DefaultGcc2i386Opt *************** *** 192,197 **** --- 200,210 ---- #ifndef FileManDir # define FileManDir $(MANSOURCEPATH)5 #endif + + #define ArchitectureDefines -DLINUX_ARCHITECTURE + + #define TtClientLibs $(TTLIB) $(XTOOLLIB) $(XLIB) + #define TtClientDepLibs $(DEPTTLIB) $(DEPXTOOLLIB) $(DEPXLIB) #include #include *** ./config/cf/lnxLib.rules@@/PUBLIC-LATEST Sat Sep 28 16:19:19 1996 --- xc/config/cf/lnxLib.rules Mon Mar 16 11:15:29 1998 *************** *** 1,4 **** ! XCOMM $XConsortium: lnxLib.rules /main/13 1996/09/28 16:11:01 rws $ /* * Linux shared library rules (DLL & ELF versions) --- 1,4 ---- ! XCOMM $TOG: lnxLib.rules /main/14 1998/03/16 11:15:30 mgreess $ /* * Linux shared library rules (DLL & ELF versions) *************** *** 74,80 **** Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ (cd down; T=`echo $@ | sed 's/\.[^\.]*$$//'`; \ ! $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$T solist $(REQUIREDLIBS)) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ $(RM) Concat(lib,libname.so) @@\ --- 74,81 ---- Concat(lib,libname.so.rev): solist $(EXTRALIBRARYDEPS) @@\ $(RM) $@~ @@\ (cd down; T=`echo $@ | sed 's/\.[^\.]*$$//'`; \ ! $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$T solist $(REQUIREDLIBS); \ ! $(RM) $$T && $(LN) $@ $$T) @@\ $(RM) $@ @@\ $(MV) $@~ $@ @@\ $(RM) Concat(lib,libname.so) @@\ *************** *** 81,86 **** --- 82,89 ---- $(LN) $@ Concat(lib,libname.so) @@\ LinkBuildLibrary($@) @@\ LinkBuildLibrary(Concat(lib,libname.so)) @@\ + (T=`echo $@ | sed 's/\.[^\.]*$$//'`; \ + $(RM) $(BUILDLIBDIR)/$$T; cd $(BUILDLIBDIR); $(LN) $(BUILDLIBTOP)/$(CURRENT_DIR)/$$T .) @@\ @@\ clean:: @@\ $(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so) *** ./config/cf/lnxLib.tmpl@@/PUBLIC-LATEST Wed Jan 11 21:44:44 1995 --- xc/config/cf/lnxLib.tmpl Fri Mar 20 14:14:18 1998 *************** *** 1,4 **** ! XCOMM $XConsortium: lnxLib.tmpl,v 1.5 95/01/11 21:44:44 kaleb Exp $ /* * Linux shared library template --- 1,4 ---- ! XCOMM $TOG: lnxLib.tmpl /main/7 1998/03/20 14:26:41 mgreess $ /* * Linux shared library template *************** *** 19,22 **** --- 19,37 ---- #define FixupLibReferences() @@\ XMULIB = -lXmu $(XLIB) #endif + #endif + + #ifndef SharedXReqs + # define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) + #endif + + #ifndef SharedXmReqs + # define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc + #endif + + #ifndef SharedTtReqs + # define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB) + #endif + + #define NoMessageCatalog *** ./config/cf/sgi.cf@@/PUBLIC-LATEST Tue Oct 14 12:03:55 1997 --- xc/config/cf/sgi.cf Thu Feb 26 09:24:03 1998 *************** *** 1,4 **** ! XCOMM platform: $TOG: sgi.cf /main/48 1997/10/14 11:56:04 kaleb $ #ifndef OSName # define OSName DefaultOSName --- 1,4 ---- ! XCOMM platform: $TOG: sgi.cf /main/49 1998/02/26 09:12:19 barstow $ #ifndef OSName # define OSName DefaultOSName *************** *** 109,115 **** # if OSMajorVersion < 6 # define sgiCCOptions -xansi # else ! # define CppCmd cc -E # ifdef Mips64Architecture /* set Mips64Architecture in host.def. Usually don't need it but we * (the X Consortium) want a 64-bit big-endian machine to test on. */ --- 109,115 ---- # if OSMajorVersion < 6 # define sgiCCOptions -xansi # else ! # define CppCmd cc -E -cckr # ifdef Mips64Architecture /* set Mips64Architecture in host.def. Usually don't need it but we * (the X Consortium) want a 64-bit big-endian machine to test on. */ *** ./config/imake/imake.c@@/PUBLIC-LATEST Fri Feb 6 11:02:29 1998 --- xc/config/imake/imake.c Tue Mar 24 12:42:31 1998 *************** *** 1,4 **** ! /* $TOG: imake.c /main/102 1998/02/06 11:02:33 kaleb $ */ /*************************************************************************** * * --- 1,4 ---- ! /* $TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $ */ /*************************************************************************** * * *************** *** 811,816 **** --- 811,817 ---- struct stat sb; static char* yast = "/sbin/YaST"; + static char* redhat = "/etc/redhat-release"; fprintf (inFile, "%s\n", "#define LinuxUnknown 0"); fprintf (inFile, "%s\n", "#define LinuxSuSE 1"); *************** *** 830,835 **** --- 831,840 ---- fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxSuSE"); return; } + if (lstat (redhat, &sb) == 0) { + fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxRedHat"); + return; + } /* what's the definitive way to tell what any particular distribution is? */ fprintf (inFile, "%s\n", "#define DefaultLinuxDistribution LinuxUnknown"); *************** *** 836,841 **** --- 841,911 ---- /* would like to know what version of the distribution it is */ } + static const char *libc_c= + "#include \n" + "#include \n" + "\n" + "#if 0\n" + "#pragma weak gnu_get_libc_version\n" + "#pragma weak __libc_version\n" + "#pragma weak __linux_C_lib_version\n" + "#else\n" + "asm (\".weak gnu_get_libc_version\");\n" + "asm (\".weak __libc_version\");\n" + "asm (\".weak __linux_C_lib_version\");\n" + "#endif\n" + "\n" + "extern const char * gnu_get_libc_version (void);\n" + "extern const char * __linux_C_lib_version;\n" + "extern const char __libc_version [];\n" + "\n" + "int\n" + "main ()\n" + "{\n" + " int libcmajor = 0, libcminor = 0, libcteeny = 0;\n" + "\n" + " if (((&__linux_C_lib_version != 0)\n" + " && ((&__libc_version != 0) || (gnu_get_libc_version != 0)))\n" + " || (!(&__linux_C_lib_version != 0) && !(&__libc_version != 0)\n" + " && !(gnu_get_libc_version != 0)))\n" + " {\n" + " libcmajor = 0;\n" + " libcminor = 0;\n" + " libcteeny = 0;\n" + " }\n" + " else\n" + " {\n" + " const char * ptr;\n" + " int glibcmajor = 0;\n" + "\n" + " if (gnu_get_libc_version != 0)\n" + " {\n" + " ptr = gnu_get_libc_version ();\n" + " glibcmajor = 4;\n" + " }\n" + " else if (&__libc_version != 0)\n" + " {\n" + " ptr = __libc_version;\n" + " glibcmajor = 4;\n" + " }\n" + " else\n" + " ptr = __linux_C_lib_version;\n" + "\n" + " while (!isdigit (*ptr))\n" + " ptr++;\n" + "\n" + " sscanf (ptr, \"%d.%d.%d\", &libcmajor, &libcminor, &libcteeny);\n" + " libcmajor += glibcmajor;\n" + " }\n" + "\n" + " printf(\"#define DefaultLinuxCLibMajorVersion %d\\n\", libcmajor);\n" + " printf(\"#define DefaultLinuxCLibMinorVersion %d\\n\", libcminor);\n" + " printf(\"#define DefaultLinuxCLibTeenyVersion %d\\n\", libcteeny);\n" + "\n" + " return 0;\n" + "}\n" + ; + static void get_libc_version(inFile) FILE* inFile; { *************** *** 847,852 **** --- 917,926 ---- if (lstat (libcso, &sb) == 0) { if (S_ISLNK (sb.st_mode)) { + /* + * /usr/lib/libc.so is a symlink -- this is libc 5.x + * we can do this the quick way + */ if (readlink (libcso, buf, PATH_MAX) >= 0) { for (ptr = buf; *ptr && !isdigit (*ptr); ptr++); (void) sscanf (ptr, "%d.%d.%d", &libcmajor, &libcminor, &libcteeny); *************** *** 854,859 **** --- 928,970 ---- fprintf(inFile, "#define DefaultLinuxCLibMinorVersion %d\n", libcminor); fprintf(inFile, "#define DefaultLinuxCLibTeenyVersion %d\n", libcteeny); } + } else { + /* + * /usr/lib/libc.so is NOT a symlink -- this is libc 6.x / glibc 2.x + * now we have to figure this out the hard way. + */ + char *aout = tmpnam (NULL); + FILE *fp; + const char *format = "%s -o %s -x c -"; + char *cc; + int len; + char *command; + + cc = getenv ("CC"); + if (cc == NULL) + cc = "gcc"; + len = strlen (aout) + strlen (format) + strlen (cc); + if (len < 128) len = 128; + command = alloca (len); + + if (snprintf (command , len, format, cc, aout) == len) + abort (); + + fp = popen (command, "w"); + if (fp == NULL || fprintf (fp, "%s\n", libc_c) < 0 || pclose (fp) != 0) + abort (); + + fp = popen (aout, "r"); + if (fp == NULL) + abort (); + + while (fgets (command, len, fp)) + fprintf (inFile, command); + + len = pclose (fp); + remove (aout); + if (len) + abort (); } } } *************** *** 1318,1324 **** initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", ! "$TOG: imake.c /main/102 1998/02/06 11:02:33 kaleb $"); } for (p1 = pline; p1 < end; p1++) { --- 1429,1435 ---- initialized = TRUE; fprintf (tmpfd, "# Makefile generated by imake - do not edit!\n"); fprintf (tmpfd, "# %s\n", ! "$TOG: imake.c /main/104 1998/03/24 12:45:15 kaleb $"); } for (p1 = pline; p1 < end; p1++) { *** ./config/makedepend/def.h@@/PUBLIC-LATEST Fri Feb 6 11:09:43 1998 --- xc/config/makedepend/def.h Wed Mar 25 08:14:31 1998 *************** *** 1,4 **** ! /* $TOG: def.h /main/31 1998/02/06 11:09:47 kaleb $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group. --- 1,4 ---- ! /* $TOG: def.h /main/32 1998/03/25 08:17:45 kaleb $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group. *************** *** 57,67 **** #define SCCS 12 #define ELIF 13 #define EJECT 14 ! #define IFFALSE 15 /* pseudo value --- never matched */ ! #define ELIFFALSE 16 /* pseudo value --- never matched */ ! #define INCLUDEDOT 17 /* pseudo value --- never matched */ ! #define IFGUESSFALSE 18 /* pseudo value --- never matched */ ! #define ELIFGUESSFALSE 19 /* pseudo value --- never matched */ #ifdef DEBUG extern int _debugmask; --- 57,68 ---- #define SCCS 12 #define ELIF 13 #define EJECT 14 ! #define WARNING 15 ! #define IFFALSE 16 /* pseudo value --- never matched */ ! #define ELIFFALSE 17 /* pseudo value --- never matched */ ! #define INCLUDEDOT 18 /* pseudo value --- never matched */ ! #define IFGUESSFALSE 19 /* pseudo value --- never matched */ ! #define ELIFGUESSFALSE 20 /* pseudo value --- never matched */ #ifdef DEBUG extern int _debugmask; *** ./config/makedepend/main.c@@/PUBLIC-LATEST Fri Feb 6 11:10:07 1998 --- xc/config/makedepend/main.c Wed Mar 25 08:15:11 1998 *************** *** 1,4 **** ! /* $TOG: main.c /main/85 1998/02/06 11:10:11 kaleb $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: main.c /main/86 1998/03/25 08:17:50 kaleb $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group *************** *** 66,71 **** --- 66,72 ---- "sccs", "elif", "eject", + "warning", NULL }; *** ./config/makedepend/parse.c@@/PUBLIC-LATEST Fri Feb 6 11:10:20 1998 --- xc/config/makedepend/parse.c Wed Mar 25 08:15:15 1998 *************** *** 1,4 **** ! /* $TOG: parse.c /main/34 1998/02/06 11:10:24 kaleb $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: parse.c /main/35 1998/03/25 08:17:55 kaleb $ */ /* Copyright (c) 1993, 1994, 1998 The Open Group *************** *** 63,68 **** --- 63,69 ---- case IDENT: case SCCS: case EJECT: + case WARNING: break; case ELIF: case ELIFFALSE: *** ./include/extensions/XInput.h@@/PUBLIC-LATEST Mon Feb 9 11:20:14 1998 --- xc/include/extensions/XInput.h Thu Apr 30 15:52:06 1998 *************** *** 1,4 **** ! /* $TOG: XInput.h /main/23 1998/02/09 11:20:28 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XInput.h /main/24 1998/04/30 15:56:44 kaleb $ */ /************************************************************ *************** *** 961,967 **** #endif ); ! extern int XFreeFeedbackList( #if NeedFunctionPrototypes XFeedbackState* /* list */ #endif --- 961,967 ---- #endif ); ! extern void XFreeFeedbackList( #if NeedFunctionPrototypes XFeedbackState* /* list */ #endif *************** *** 1051,1057 **** #endif ); ! extern int XFreeDeviceState( #if NeedFunctionPrototypes XDeviceState* /* list */ #endif --- 1051,1057 ---- #endif ); ! extern void XFreeDeviceState( #if NeedFunctionPrototypes XDeviceState* /* list */ #endif *************** *** 1071,1077 **** #endif ); ! extern int XFreeDeviceList( #if NeedFunctionPrototypes XDeviceInfo* /* list */ #endif --- 1071,1077 ---- #endif ); ! extern void XFreeDeviceList( #if NeedFunctionPrototypes XDeviceInfo* /* list */ #endif *************** *** 1188,1200 **** #endif ); ! extern int XFreeDeviceMotionEvents( #if NeedFunctionPrototypes XDeviceTimeCoord* /* events */ #endif ); ! extern int XFreeDeviceControl( #if NeedFunctionPrototypes XDeviceControl* /* control */ #endif --- 1188,1200 ---- #endif ); ! extern void XFreeDeviceMotionEvents( #if NeedFunctionPrototypes XDeviceTimeCoord* /* events */ #endif ); ! extern void XFreeDeviceControl( #if NeedFunctionPrototypes XDeviceControl* /* control */ #endif *** ./include/extensions/panoramiX.h@@/PUBLIC-LATEST Fri Feb 13 13:08:36 1998 --- xc/include/extensions/panoramiX.h Tue Mar 17 06:48:05 1998 *************** *** 1,4 **** ! /* $TOG: panoramiX.h /main/3 1998/02/13 13:09:04 kaleb $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * --- 1,4 ---- ! /* $TOG: panoramiX.h /main/4 1998/03/17 06:51:02 kaleb $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * *************** *** 50,55 **** --- 50,56 ---- typedef struct _PanoramiXList { struct _PanoramiXList *next; Bool FreeMe; + Bool VisibilitySent; unsigned int visibility ; PanoramiXInfo info[MAXSCREENS]; } PanoramiXList; *** ./include/keysym.h@@/PUBLIC-LATEST Mon Feb 9 11:19:22 1998 --- xc/include/keysym.h Fri May 22 16:12:06 1998 *************** *** 1,4 **** ! /* $TOG: keysym.h /main/8 1998/02/09 11:19:36 kaleb $ */ /*********************************************************** --- 1,4 ---- ! /* $TOG: keysym.h /main/9 1998/05/22 16:17:55 kaleb $ */ /*********************************************************** *************** *** 50,55 **** --- 50,57 ---- #define XK_LATIN2 #define XK_LATIN3 #define XK_LATIN4 + #define XK_LATIN9 #define XK_GREEK + #define XK_CURRENCY #include *** ./include/keysymdef.h@@/PUBLIC-LATEST Mon Feb 9 11:19:26 1998 --- xc/include/keysymdef.h Fri May 22 16:12:12 1998 *************** *** 1,4 **** ! /* $TOG: keysymdef.h /main/27 1998/02/09 11:19:40 kaleb $ */ /*********************************************************** Copyright 1987, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: keysymdef.h /main/28 1998/05/22 16:18:01 kaleb $ */ /*********************************************************** Copyright 1987, 1994, 1998 The Open Group *************** *** 758,763 **** --- 758,774 ---- #endif /* XK_LATIN4 */ /* + * Latin-9 (a.k.a. Latin-0) + * Byte 3 = 19 + */ + + #ifdef XK_LATIN9 + #define XK_OE 0x13bc + #define XK_oe 0x13bd + #define XK_Ydiaeresis 0x13be + #endif /* XK_LATIN9 */ + + /* * Katakana * Byte 3 = 4 */ *************** *** 1566,1568 **** --- 1577,1595 ---- #define XK_Korean_Won 0xeff #endif /* XK_KOREAN */ + + #ifdef XK_CURRENCY + #define XK_EcuSign 0x20a0 + #define XK_ColonSign 0x20a1 + #define XK_CruzeiroSign 0x20a2 + #define XK_FFrancSign 0x20a3 + #define XK_LiraSign 0x20a4 + #define XK_MillSign 0x20a5 + #define XK_NairaSign 0x20a6 + #define XK_PesetaSign 0x20a7 + #define XK_RupeeSign 0x20a8 + #define XK_WonSign 0x20a9 + #define XK_NewSheqelSign 0x20aa + #define XK_DongSign 0x20ab + #define XK_EuroSign 0x20ac + #endif *** HPkeysym.h@@/PUBLIC-LATEST Mon Feb 9 11:17:59 1998 --- xc/include/HPkeysym.h Mon Jun 29 08:45:23 1998 *************** *** 1,4 **** ! /* $TOG: HPkeysym.h /main/4 1998/02/09 11:18:14 kaleb $ */ /* Copyright 1987, 1998 The Open Group --- 1,4 ---- ! /* $TOG: HPkeysym.h /main/5 1998/06/29 08:53:32 kaleb $ */ /* Copyright 1987, 1998 The Open Group *************** *** 147,153 **** --- 147,155 ---- #define XK_mute_asciitilde 0x100000ac #define XK_lira 0x100000af #define XK_guilder 0x100000be + #ifndef XK_Ydiaeresis #define XK_Ydiaeresis 0x100000ee + #endif #define XK_IO 0x100000ee #define XK_longminus 0x100000f6 #define XK_block 0x100000fc *** ./lib/FS/FSClServ.c@@/PUBLIC-LATEST Fri Feb 6 13:42:09 1998 --- xc/lib/FS/FSClServ.c Fri May 1 12:45:38 1998 *************** *** 1,4 **** ! /* $TOG: FSClServ.c /main/6 1998/02/06 13:42:14 kaleb $ */ /* @(#)FSClServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSClServ.c /main/9 1998/05/01 12:50:19 kaleb $ */ /* @(#)FSClServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 51,56 **** --- 51,57 ---- extern FSServer *_FSHeadOfServerList; + int FSCloseServer(svr) FSServer *svr; { *************** *** 58,66 **** FSServer **sv = &_FSHeadOfServerList; FSServer *s = _FSHeadOfServerList; extern void _FSFreeQ(); svr->flags |= FSlibServerClosing; ! FSSync(svr, 1); /* throw out pending events */ ext = svr->ext_procs; while (ext) { if (ext->close_server != NULL) --- 59,69 ---- FSServer **sv = &_FSHeadOfServerList; FSServer *s = _FSHeadOfServerList; extern void _FSFreeQ(); + extern void _FSDisconnectServer(); + extern int FSSync(); svr->flags |= FSlibServerClosing; ! (void) FSSync(svr, 1); /* throw out pending events */ ext = svr->ext_procs; while (ext) { if (ext->close_server != NULL) *************** *** 80,83 **** --- 83,87 ---- if (_FSHeadOfServerList == NULL) { _FSFreeQ(); } + return 1; } *** ./lib/FS/FSCloseFt.c@@/PUBLIC-LATEST Fri Feb 6 13:42:01 1998 --- xc/lib/FS/FSCloseFt.c Fri May 1 12:45:45 1998 *************** *** 1,4 **** ! /* $TOG: FSCloseFt.c /main/5 1998/02/06 13:42:06 kaleb $ */ /* @(#)FSCloseFt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSCloseFt.c /main/7 1998/05/01 12:50:25 kaleb $ */ /* @(#)FSCloseFt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 50,55 **** --- 50,56 ---- #include "FSlibint.h" + int FSCloseFont(svr, fid) FSServer *svr; Font fid; *************** *** 58,61 **** --- 59,63 ---- GetResReq(CloseFont, fid, req); SyncHandle(); + return 1; } *** ./lib/FS/FSConnServ.c@@/PUBLIC-LATEST Fri Feb 6 13:42:14 1998 --- xc/lib/FS/FSConnServ.c Fri May 1 11:29:50 1998 *************** *** 1,4 **** ! /* $TOG: FSConnServ.c /main/28 1998/02/06 13:42:18 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSConnServ.c /main/29 1998/05/01 11:34:29 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 122,128 **** * Disconnect from server. */ ! int _FSDisconnectServer(trans_conn) XtransConnInfo trans_conn; --- 122,128 ---- * Disconnect from server. */ ! void _FSDisconnectServer(trans_conn) XtransConnInfo trans_conn; *************** *** 138,144 **** * 2) if the connection can be read, must enqueue events and handle errors, * until the connection is writable. */ ! _FSWaitForWritable(svr) FSServer *svr; { fd_set r_mask; --- 138,144 ---- * 2) if the connection can be read, must enqueue events and handle errors, * until the connection is writable. */ ! void _FSWaitForWritable(svr) FSServer *svr; { fd_set r_mask; *************** *** 201,207 **** } ! _FSWaitForReadable(svr) FSServer *svr; { fd_set r_mask; --- 201,207 ---- } ! void _FSWaitForReadable(svr) FSServer *svr; { fd_set r_mask; *************** *** 216,222 **** } while (result <= 0); } ! _FSSendClientPrefix(svr, client) FSServer *svr; fsConnClientPrefix *client; { --- 216,222 ---- } while (result <= 0); } ! void _FSSendClientPrefix(svr, client) FSServer *svr; fsConnClientPrefix *client; { *** ./lib/FS/FSErrDis.c@@/PUBLIC-LATEST Fri Feb 6 13:42:19 1998 --- xc/lib/FS/FSErrDis.c Fri May 1 12:45:50 1998 *************** *** 1,4 **** ! /* $TOG: FSErrDis.c /main/6 1998/02/06 13:42:23 kaleb $ */ /* @(#)FSErrDis.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSErrDis.c /main/8 1998/05/01 12:50:29 kaleb $ */ /* @(#)FSErrDis.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 68,74 **** int FSErrorListSize = sizeof(FSErrorList); ! FSGetErrorText(svr, code, buffer, nbytes) register int code; register FSServer *svr; char *buffer; --- 68,91 ---- int FSErrorListSize = sizeof(FSErrorList); ! /* ARGSUSED */ ! int FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes) ! register char *name, ! *type; ! char *defaultp; ! FSServer *svr; ! char *buffer; ! int nbytes; ! { ! if (nbytes == 0) ! return 0; ! (void) strncpy(buffer, (char *) defaultp, nbytes); ! if ((strlen(defaultp) + 1) > nbytes) ! buffer[nbytes - 1] = '\0'; ! return 1; ! } ! ! int FSGetErrorText(svr, code, buffer, nbytes) register int code; register FSServer *svr; char *buffer; *************** *** 80,86 **** register _FSExtension *ext; if (nbytes == 0) ! return; sprintf(buf, "%d", code); if (code <= (FSErrorListSize / sizeof(char *)) && code > 0) { defaultp = FSErrorList[code]; --- 97,103 ---- register _FSExtension *ext; if (nbytes == 0) ! return 0; sprintf(buf, "%d", code); if (code <= (FSErrorListSize / sizeof(char *)) && code > 0) { defaultp = FSErrorList[code]; *************** *** 92,112 **** (*ext->error_string) (svr, code, &ext->codes, buffer, nbytes); ext = ext->next; } ! return; } - /* ARGSUSED */ - FSGetErrorDatabaseText(svr, name, type, defaultp, buffer, nbytes) - register char *name, - *type; - char *defaultp; - FSServer *svr; - char *buffer; - int nbytes; - { - if (nbytes == 0) - return; - (void) strncpy(buffer, (char *) defaultp, nbytes); - if ((strlen(defaultp) + 1) > nbytes) - buffer[nbytes - 1] = '\0'; - } --- 109,114 ---- (*ext->error_string) (svr, code, &ext->codes, buffer, nbytes); ext = ext->next; } ! return 1; } *** ./lib/FS/FSFlush.c@@/PUBLIC-LATEST Fri Feb 6 13:42:29 1998 --- xc/lib/FS/FSFlush.c Fri May 1 11:29:59 1998 *************** *** 1,4 **** ! /* $TOG: FSFlush.c /main/5 1998/02/06 13:42:33 kaleb $ */ /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSFlush.c /main/6 1998/05/01 11:34:38 kaleb $ */ /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 48,55 **** */ #include "FSlibint.h" ! FSFlush(svr) FSServer *svr; { _FSFlush(svr); } --- 48,56 ---- */ #include "FSlibint.h" ! int FSFlush(svr) FSServer *svr; { _FSFlush(svr); + return 1; } *** ./lib/FS/FSFontInfo.c@@/PUBLIC-LATEST Fri Feb 6 13:42:34 1998 --- xc/lib/FS/FSFontInfo.c Fri May 1 12:45:55 1998 *************** *** 1,4 **** ! /* $TOG: FSFontInfo.c /main/8 1998/02/06 13:42:38 kaleb $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation --- 1,4 ---- ! /* $TOG: FSFontInfo.c /main/9 1998/05/01 12:50:34 kaleb $ */ /* * Copyright 1990 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation *************** *** 216,222 **** { /* get the name */ if (!flist[i]) { ! nbytes = reply.nameLength + 3 & ~3; _FSEatData(svr, (unsigned long) nbytes); goto badmem; } --- 216,222 ---- { /* get the name */ if (!flist[i]) { ! nbytes = (reply.nameLength + 3) & ~3; _FSEatData(svr, (unsigned long) nbytes); goto badmem; } *************** *** 268,274 **** { /* get the name */ if (!flist[i]) { ! nbytes = reply.nameLength + 3 & ~3; _FSEatData(svr, (unsigned long) nbytes); goto badmem; } --- 268,274 ---- { /* get the name */ if (!flist[i]) { ! nbytes = (reply.nameLength + 3) & ~3; _FSEatData(svr, (unsigned long) nbytes); goto badmem; } *** ./lib/FS/FSFtNames.c@@/PUBLIC-LATEST Fri Feb 6 13:42:39 1998 --- xc/lib/FS/FSFtNames.c Fri May 1 11:30:03 1998 *************** *** 1,4 **** ! /* $TOG: FSFtNames.c /main/6 1998/02/06 13:42:44 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSFtNames.c /main/7 1998/05/01 11:34:42 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 83,89 **** if (flist) FSfree((char *) flist); if (c) ! FSFree(c); _FSEatData(svr, (unsigned long) rlen); SyncHandle(); return (char **) NULL; --- 83,89 ---- if (flist) FSfree((char *) flist); if (c) ! FSfree(c); _FSEatData(svr, (unsigned long) rlen); SyncHandle(); return (char **) NULL; *************** *** 108,118 **** } ! FSFreeFontNames(list) char **list; { if (list) { ! FSFree(list[0] - 1); ! FSFree((char *) list); } } --- 108,119 ---- } ! int FSFreeFontNames(list) char **list; { if (list) { ! FSfree(list[0] - 1); ! FSfree((char *) list); } + return 1; } *** ./lib/FS/FSListCats.c@@/PUBLIC-LATEST Fri Feb 6 13:43:12 1998 --- xc/lib/FS/FSListCats.c Fri May 1 12:53:52 1998 *************** *** 1,4 **** ! /* $TOG: FSListCats.c /main/4 1998/02/06 13:43:17 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSListCats.c /main/6 1998/05/01 12:58:31 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 84,90 **** if (clist) FSfree((char *) clist); if (c) ! FSFree(c); _FSEatData(svr, (unsigned long) rlen); SyncHandle(); return (char **) NULL; --- 84,90 ---- if (clist) FSfree((char *) clist); if (c) ! FSfree(c); _FSEatData(svr, (unsigned long) rlen); SyncHandle(); return (char **) NULL; *************** *** 109,119 **** } ! FSFreeCatalogues(list) char **list; { if (list) { ! FSFree(list[0] - 1); ! FSFree((char *) list); } } --- 109,120 ---- } ! int FSFreeCatalogues(list) char **list; { if (list) { ! FSfree(list[0] - 1); ! FSfree((char *) list); } + return 1; } *** ./lib/FS/FSListExt.c@@/PUBLIC-LATEST Fri Feb 6 13:43:17 1998 --- xc/lib/FS/FSListExt.c Fri May 1 11:30:12 1998 *************** *** 1,4 **** ! /* $TOG: FSListExt.c /main/6 1998/02/06 13:43:22 kaleb $ */ /* @(#)FSListExt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSListExt.c /main/7 1998/05/01 11:34:51 kaleb $ */ /* @(#)FSListExt.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 101,107 **** } ! FSFreeExtensionList(list) char **list; { if (list != NULL) { --- 101,107 ---- } ! int FSFreeExtensionList(list) char **list; { if (list != NULL) { *************** *** 108,111 **** --- 108,112 ---- FSfree(list[0] - 1); FSfree((char *) list); } + return 1; } *** ./lib/FS/FSNextEv.c@@/PUBLIC-LATEST Fri Feb 6 13:43:27 1998 --- xc/lib/FS/FSNextEv.c Fri May 1 11:30:17 1998 *************** *** 1,4 **** ! /* $TOG: FSNextEv.c /main/6 1998/02/06 13:43:31 kaleb $ */ /* @(#)FSNextEv.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSNextEv.c /main/7 1998/05/01 11:34:56 kaleb $ */ /* @(#)FSNextEv.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 51,57 **** extern _FSQEvent *_FSqfree; ! FSNextEvent(svr, event) FSServer *svr; FSEvent *event; { --- 51,57 ---- extern _FSQEvent *_FSqfree; ! int FSNextEvent(svr, event) FSServer *svr; FSEvent *event; { *************** *** 67,70 **** --- 67,72 ---- qelt->next = _FSqfree; _FSqfree = qelt; svr->qlen--; + + return 1; } *** ./lib/FS/FSOpenFont.c@@/PUBLIC-LATEST Fri Feb 6 13:43:32 1998 --- xc/lib/FS/FSOpenFont.c Sun May 17 16:24:52 1998 *************** *** 1,4 **** ! /* $TOG: FSOpenFont.c /main/7 1998/02/06 13:43:37 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSOpenFont.c /main/8 1998/05/17 16:30:48 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 61,72 **** fsOpenBitmapFontReq *req; fsOpenBitmapFontReply reply; Font fid; ! char buf[256]; - GetReq(OpenBitmapFont, req); nbytes = name ? strlen(name) : 0; ! buf[0] = (char) nbytes; ! bcopy(name, &buf[1], nbytes); nbytes++; req->fid = fid = svr->resource_id++; req->format_hint = hint; --- 61,74 ---- fsOpenBitmapFontReq *req; fsOpenBitmapFontReply reply; Font fid; ! unsigned char buf[256]; ! char* bufptr; nbytes = name ? strlen(name) : 0; ! if (nbytes > 255) return 0; ! GetReq(OpenBitmapFont, req); ! buf[0] = (unsigned char) nbytes; ! memcpy(&buf[1], name, nbytes); nbytes++; req->fid = fid = svr->resource_id++; req->format_hint = hint; *** ./lib/FS/FSOpenServ.c@@/PUBLIC-LATEST Fri Feb 6 13:43:37 1998 --- xc/lib/FS/FSOpenServ.c Fri May 1 11:30:21 1998 *************** *** 1,4 **** ! /* $TOG: FSOpenServ.c /main/7 1998/02/06 13:43:41 kaleb $ */ /* @(#)FSOpenServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSOpenServ.c /main/8 1998/05/01 11:35:00 kaleb $ */ /* @(#)FSOpenServ.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 67,74 **** extern Status _FSUnknownNativeEvent(); extern Bool _FSUnknownWireEvent(); ! static OutOfMemory(); /* * connects to a server, makes a FSServer object and returns a pointer * to it --- 67,99 ---- extern Status _FSUnknownNativeEvent(); extern Bool _FSUnknownWireEvent(); ! void _FSFreeServerStructure(svr) ! FSServer *svr; ! { ! if (svr->server_name) ! FSfree(svr->server_name); ! if (svr->vendor) ! FSfree(svr->vendor); + if (svr->buffer) + FSfree(svr->buffer); + + FSfree((char *) svr); + } + + static + void OutOfMemory(svr, setup) + FSServer *svr; + char *setup; + { + extern void _FSDisconnectServer(); + + _FSDisconnectServer(svr->trans_conn); + _FSFreeServerStructure(svr); + FSfree(setup); + errno = ENOMEM; + } + /* * connects to a server, makes a FSServer object and returns a pointer * to it *************** *** 92,98 **** int altlen; char *vendor_string; long setuplength; ! extern int _FSSendClientPrefix(); extern XtransConnInfo _FSConnectServer(); #ifdef X_NOT_STDC_ENV extern char *getenv(); --- 117,123 ---- int altlen; char *vendor_string; long setuplength; ! extern void _FSSendClientPrefix(); extern XtransConnInfo _FSConnectServer(); #ifdef X_NOT_STDC_ENV extern char *getenv(); *************** *** 156,162 **** FSfree((char *) alts[i].name); } FSfree((char *) alts); ! FSFree((char *) alt_data); FSfree((char *) svr); errno = ENOMEM; return (FSServer *) 0; --- 181,187 ---- FSfree((char *) alts[i].name); } FSfree((char *) alts); ! FSfree((char *) alt_data); FSfree((char *) svr); errno = ENOMEM; return (FSServer *) 0; *************** *** 249,275 **** return (svr); } - static - OutOfMemory(svr, setup) - FSServer *svr; - char *setup; - { - _FSDisconnectServer(svr->trans_conn); - _FSFreeServerStructure(svr); - FSfree(setup); - errno = ENOMEM; - } - - _FSFreeServerStructure(svr) - FSServer *svr; - { - if (svr->server_name) - FSfree(svr->server_name); - if (svr->vendor) - FSfree(svr->vendor); - - if (svr->buffer) - FSfree(svr->buffer); - - FSfree((char *) svr); - } --- 274,276 ---- *** ./lib/FS/FSSetCats.c@@/PUBLIC-LATEST Fri Feb 6 13:44:08 1998 --- xc/lib/FS/FSSetCats.c Sun May 17 16:25:22 1998 *************** *** 1,4 **** ! /* $TOG: FSSetCats.c /main/4 1998/02/06 13:44:13 kaleb $ */ /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSSetCats.c /main/5 1998/05/17 16:30:54 kaleb $ */ /* @(#)FSFlush.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 57,80 **** { unsigned char nbytes; fsSetCataloguesReq *req; ! char buf[256]; int i; ! int len; ! for (i = 0, len = 0; i < num; i++) { ! len += strlen(cats[i]); } GetReq(SetCatalogues, req); ! req->num_catalogues = num; req->length += (len + 3) >> 2; for (i = 0; i < num; i++) { nbytes = strlen(cats[i]); ! buf[0] = (char) nbytes; ! bcopy(cats[i], &buf[1], nbytes); ! nbytes++; ! _FSSend(svr, buf, (long) nbytes); } SyncHandle(); return FSSuccess; --- 57,85 ---- { unsigned char nbytes; fsSetCataloguesReq *req; ! unsigned char buf[256]; int i; ! int len, tlen, tnum; ! for (i = 0, tnum = 0, len = 0; i < num; i++) { ! if ((tlen = strlen(cats[i])) < 256) { ! len += tlen; ! tnum++; ! } } GetReq(SetCatalogues, req); ! req->num_catalogues = tnum; req->length += (len + 3) >> 2; for (i = 0; i < num; i++) { nbytes = strlen(cats[i]); ! if (nbytes < 256) { ! buf[0] = (unsigned char) nbytes; ! memcpy(&buf[1], cats[i], nbytes); ! nbytes++; ! _FSSend(svr, buf, (long) nbytes); ! } } SyncHandle(); return FSSuccess; *** ./lib/FS/FSSync.c@@/PUBLIC-LATEST Fri Feb 6 13:44:20 1998 --- xc/lib/FS/FSSync.c Fri May 1 11:30:26 1998 *************** *** 1,4 **** ! /* $TOG: FSSync.c /main/6 1998/02/06 13:44:25 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSSync.c /main/7 1998/05/01 11:35:05 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 53,59 **** /* synchronize with errors and events */ ! FSSync(svr, discard) FSServer *svr; Bool discard; { --- 53,59 ---- /* synchronize with errors and events */ ! int FSSync(svr, discard) FSServer *svr; Bool discard; { *************** *** 69,72 **** --- 69,74 ---- svr->head = svr->tail = NULL; svr->qlen = 0; } + + return 1; } *** ./lib/FS/FSSynchro.c@@/PUBLIC-LATEST Fri Feb 6 13:44:13 1998 --- xc/lib/FS/FSSynchro.c Fri May 1 12:45:59 1998 *************** *** 1,4 **** ! /* $TOG: FSSynchro.c /main/5 1998/02/06 13:44:18 kaleb $ */ /* @(#)FSSynchro.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSSynchro.c /main/7 1998/05/01 12:50:38 kaleb $ */ /* @(#)FSSynchro.c 4.1 91/05/02 * Copyright 1990 Network Computing Devices; *************** *** 49,59 **** #include "FSlibint.h" ! int _FSSyncFunction(svr) FSServer *svr; { ! FSSync(svr, 0); } int --- 49,61 ---- #include "FSlibint.h" ! static int _FSSyncFunction(svr) FSServer *svr; { ! extern int FSSync(); ! ! return FSSync(svr, 0); } int *** ./lib/FS/FSlibInt.c@@/PUBLIC-LATEST Fri Feb 6 13:42:49 1998 --- xc/lib/FS/FSlibInt.c Fri May 1 11:38:17 1998 *************** *** 1,4 **** ! /* $TOG: FSlibInt.c /main/20 1998/02/06 13:42:54 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSlibInt.c /main/23 1998/05/01 11:42:57 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 117,122 **** --- 117,123 ---- * action is taken. This routine correctly handles incremental writes. * This routine may have to be reworked if int < long. */ + void _FSFlush(svr) register FSServer *svr; { *************** *** 201,206 **** --- 202,208 ---- /* _FSReadEvents - Flush the output queue, * then read as many events as possible (but at least 1) and enqueue them */ + void _FSReadEvents(svr) register FSServer *svr; { *************** *** 258,263 **** --- 260,266 ---- * _FSRead - Read bytes from the socket taking into account incomplete * reads. This routine may have to be reworked if int < long. */ + void _FSRead(svr, data, size) register FSServer *svr; register char *data; *************** *** 310,316 **** * into a long (64 bits on a CRAY computer). * */ ! static _doFSRead32(svr, data, size, packbuffer) register FSServer *svr; register long *data; --- 313,319 ---- * into a long (64 bits on a CRAY computer). * */ ! static void _doFSRead32(svr, data, size, packbuffer) register FSServer *svr; register long *data; *************** *** 342,347 **** --- 345,351 ---- } } + void _FSRead32(svr, data, len) FSServer *svr; long *data; *************** *** 363,369 **** * into a long (64 bits on a CRAY computer). * */ ! static _doFSRead16(svr, data, size, packbuffer) register FSServer *svr; register short *data; --- 367,373 ---- * into a long (64 bits on a CRAY computer). * */ ! static void _doFSRead16(svr, data, size, packbuffer) register FSServer *svr; register short *data; *************** *** 395,400 **** --- 399,405 ---- } } + void _FSRead16(svr, data, len) FSServer *svr; short *data; *************** *** 409,414 **** --- 414,420 ---- _doFSRead16(svr, data, len, packbuffer); } + void _FSRead16Pad(svr, data, size) FSServer *svr; short *data; *************** *** 431,436 **** --- 437,443 ---- * reads. If the number of bytes is not 0 mod 32, read additional pad * bytes. This routine may have to be reworked if int < long. */ + void _FSReadPad(svr, data, size) register FSServer *svr; register char *data; *************** *** 492,497 **** --- 499,505 ---- * transmission is used, if size is not 0 mod 4, extra bytes are transmitted. * This routine may have to be reworked if int < long; */ + void _FSSend(svr, data, size) register FSServer *svr; char *data; *************** *** 794,799 **** --- 802,808 ---- * note that no squishing of move events in V11, since there * is pointer motion hints.... */ + void _FSEnq(svr, event) register FSServer *svr; register fsEvent *event; *************** *** 801,807 **** register _FSQEvent *qelt; /*NOSTRICT*/ ! if (qelt = _FSqfree) { /* If _FSqfree is non-NULL do this, else malloc a new one. */ _FSqfree = qelt->next; } else if ((qelt = --- 810,816 ---- register _FSQEvent *qelt; /*NOSTRICT*/ ! if ((qelt = _FSqfree) != NULL) { /* If _FSqfree is non-NULL do this, else malloc a new one. */ _FSqfree = qelt->next; } else if ((qelt = *************** *** 909,914 **** --- 918,924 ---- * _FSDefaultIOError - Default fatal system error reporting routine. Called * when an X internal system error is encountered. */ + int _FSDefaultIOError(svr) FSServer *svr; { *************** *** 973,988 **** char number[32]; char *mtype = "FSlibMessage"; register _FSExtension *ext = (_FSExtension *) NULL; ! FSGetErrorText(svr, event->error_code, buffer, BUFSIZ); ! FSGetErrorDatabaseText(svr, mtype, "FSError", "FS Error", mesg, BUFSIZ); (void) fprintf(fp, "%s: %s\n ", mesg, buffer); ! FSGetErrorDatabaseText(svr, mtype, "MajorCode", "Request Major code %d", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, event->request_code); if (event->request_code < 128) { sprintf(number, "%d", event->request_code); ! FSGetErrorDatabaseText(svr, "FSRequest", number, "", buffer, BUFSIZ); } else { for (ext = svr->ext_procs; ext && (ext->codes.major_opcode != event->request_code); --- 983,1002 ---- char number[32]; char *mtype = "FSlibMessage"; register _FSExtension *ext = (_FSExtension *) NULL; + extern int FSGetErrorText(); + extern int FSGetErrorDatabaseText(); ! (void) FSGetErrorText(svr, event->error_code, buffer, BUFSIZ); ! (void) FSGetErrorDatabaseText(svr, mtype, "FSError", "FS Error", mesg, ! BUFSIZ); (void) fprintf(fp, "%s: %s\n ", mesg, buffer); ! (void) FSGetErrorDatabaseText(svr, mtype, "MajorCode", ! "Request Major code %d", mesg, BUFSIZ); (void) fprintf(fp, mesg, event->request_code); if (event->request_code < 128) { sprintf(number, "%d", event->request_code); ! (void) FSGetErrorDatabaseText(svr, "FSRequest", number, "", buffer, ! BUFSIZ); } else { for (ext = svr->ext_procs; ext && (ext->codes.major_opcode != event->request_code); *************** *** 993,1017 **** buffer[0] = '\0'; } (void) fprintf(fp, " (%s)\n ", buffer); ! FSGetErrorDatabaseText(svr, mtype, "MinorCode", "Request Minor code %d", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, event->minor_code); if (ext) { sprintf(mesg, "%s.%d", ext->name, event->minor_code); ! FSGetErrorDatabaseText(svr, "FSRequest", mesg, "", buffer, BUFSIZ); (void) fprintf(fp, " (%s)", buffer); } fputs("\n ", fp); ! FSGetErrorDatabaseText(svr, mtype, "ResourceID", "ResourceID 0x%x", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, event->resourceid); fputs("\n ", fp); ! FSGetErrorDatabaseText(svr, mtype, "ErrorSerial", "Error Serial #%d", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, event->serial); fputs("\n ", fp); ! FSGetErrorDatabaseText(svr, mtype, "CurrentSerial", "Current Serial #%d", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, svr->request); fputs("\n", fp); return 1; --- 1007,1032 ---- buffer[0] = '\0'; } (void) fprintf(fp, " (%s)\n ", buffer); ! (void) FSGetErrorDatabaseText(svr, mtype, "MinorCode", ! "Request Minor code %d", mesg, BUFSIZ); (void) fprintf(fp, mesg, event->minor_code); if (ext) { sprintf(mesg, "%s.%d", ext->name, event->minor_code); ! (void) FSGetErrorDatabaseText(svr, "FSRequest", mesg, "", buffer, ! BUFSIZ); (void) fprintf(fp, " (%s)", buffer); } fputs("\n ", fp); ! (void) FSGetErrorDatabaseText(svr, mtype, "ResourceID", "ResourceID 0x%x", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, event->resourceid); fputs("\n ", fp); ! (void) FSGetErrorDatabaseText(svr, mtype, "ErrorSerial", "Error Serial #%d", ! mesg, BUFSIZ); (void) fprintf(fp, mesg, event->serial); fputs("\n ", fp); ! (void) FSGetErrorDatabaseText(svr, mtype, "CurrentSerial", ! "Current Serial #%d", mesg, BUFSIZ); (void) fprintf(fp, mesg, svr->request); fputs("\n", fp); return 1; *************** *** 1050,1059 **** --- 1065,1076 ---- return (svr->scratch_buffer); } + int FSFree(data) char *data; { FSfree(data); + return 1; } unsigned char * *************** *** 1095,1101 **** * "len" is the length in bytes of the data. */ ! static doData16(svr, data, len, packbuffer) register FSServer *svr; short *data; --- 1112,1118 ---- * "len" is the length in bytes of the data. */ ! static void doData16(svr, data, len, packbuffer) register FSServer *svr; short *data; *************** *** 1133,1138 **** --- 1150,1156 ---- Data(svr, packbuffer, len); } + void Data16(svr, data, len) FSServer *svr; short *data; *************** *** 1193,1198 **** --- 1211,1217 ---- Data(svr, packbuffer, len); } + void Data32(svr, data, len) FSServer *svr; short *data; *** ./lib/FS/FSlibint.h@@/PUBLIC-LATEST Fri Feb 6 13:42:56 1998 --- xc/lib/FS/FSlibint.h Fri May 1 12:46:04 1998 *************** *** 1,4 **** ! /* $TOG: FSlibint.h /main/14 1998/02/06 13:43:01 kaleb $ */ /* * Copyright 1990 Network Computing Devices; --- 1,4 ---- ! /* $TOG: FSlibint.h /main/17 1998/05/01 12:50:43 kaleb $ */ /* * Copyright 1990 Network Computing Devices; *************** *** 79,90 **** extern int errno; /* Internal system error number. */ #endif ! extern (*_FSIOErrorFunction) (); ! extern (*_FSErrorFunction) (); - extern int _FGetHostname(); - extern void _FSEatData(); #ifndef BUFSIZE #define BUFSIZE 2048 /* FS output buffer size. */ --- 79,100 ---- extern int errno; /* Internal system error number. */ #endif ! extern int (*_FSIOErrorFunction) (); ! extern int (*_FSErrorFunction) (); extern void _FSEatData(); + extern void _FSWaitForWritable(); + extern void _FSWaitForReadable(); + extern void _FSFlush(); + extern void _FSRead(); + extern void _FSReadEvents(); + extern void _FSReadPad(); + extern void _FSSend(); + extern void _FSEnq(); + extern void _FSFreeServerStructure(); + extern int _FSError(); + extern int _FSTransGetConnectionNumber(); + extern Status _FSReply(); #ifndef BUFSIZE #define BUFSIZE 2048 /* FS output buffer size. */ *** ./lib/ICE/connect.c@@/PUBLIC-LATEST Fri Feb 6 13:55:52 1998 --- xc/lib/ICE/connect.c Fri May 29 14:24:16 1998 *************** *** 1,4 **** ! /* $TOG: connect.c /main/33 1998/02/06 13:55:57 kaleb $ */ /****************************************************************************** --- 1,4 ---- ! /* $TOG: connect.c /main/34 1998/05/29 14:30:51 kaleb $ */ /****************************************************************************** *************** *** 463,469 **** char **actualConnectionRet; { ! char address[256]; char *ptr, *endptr, *delim; int madeConnection = 0; int len, retry; --- 463,470 ---- char **actualConnectionRet; { ! char addrbuf[256]; ! char* address; char *ptr, *endptr, *delim; int madeConnection = 0; int len, retry; *************** *** 473,480 **** *actualConnectionRet = NULL; ptr = networkIdsList; ! endptr = networkIdsList + strlen (networkIdsList); while (ptr < endptr && !madeConnection) { if ((delim = (char *) strchr (ptr, ',')) == NULL) --- 474,485 ---- *actualConnectionRet = NULL; ptr = networkIdsList; ! len = strlen (networkIdsList); ! endptr = networkIdsList + len; + if (len < sizeof addrbuf) address = addrbuf; + else address = malloc (len + 1); + while (ptr < endptr && !madeConnection) { if ((delim = (char *) strchr (ptr, ',')) == NULL) *************** *** 513,520 **** } } ! ! if (madeConnection) { /* * We need to return the actual network connection string --- 518,524 ---- } } ! if (madeConnection) { /* * We need to return the actual network connection string *************** *** 527,537 **** /* * Return the file descriptor */ ! return (trans_conn); ! } ! else ! { ! return (NULL); ! } } --- 531,540 ---- /* * Return the file descriptor */ + } + else trans_conn = NULL; ! if (address != addrbuf) free (address); ! ! return trans_conn; } *** ./lib/X11/ErrDes.c@@/PUBLIC-LATEST Fri Feb 6 17:19:46 1998 --- xc/lib/X11/ErrDes.c Tue Apr 28 17:13:07 1998 *************** *** 1,5 **** /* ! * $TOG: ErrDes.c /main/43 1998/02/06 17:19:51 kaleb $ */ /*********************************************************** --- 1,5 ---- /* ! * $TOG: ErrDes.c /main/44 1998/04/28 17:17:38 kaleb $ */ /*********************************************************** *************** *** 176,184 **** tlen = strlen (name) + strlen (type) + 2; if (tlen <= BUFSIZE) tptr = temp; else tptr = Xmalloc (tlen); ! sprintf(temp, "%s.%s", name, type); ! XrmGetResource(db, temp, "ErrorType.ErrorNumber", &type_str, &result); ! if (tptr != temp) Xfree (temp); } else result.addr = (XPointer)NULL; --- 176,184 ---- tlen = strlen (name) + strlen (type) + 2; if (tlen <= BUFSIZE) tptr = temp; else tptr = Xmalloc (tlen); ! sprintf(tptr, "%s.%s", name, type); ! XrmGetResource(db, tptr, "ErrorType.ErrorNumber", &type_str, &result); ! if (tptr != temp) Xfree (tptr); } else result.addr = (XPointer)NULL; *** ./lib/X11/FSWrap.c@@/PUBLIC-LATEST Fri Feb 6 17:24:03 1998 --- xc/lib/X11/FSWrap.c Fri May 29 14:39:56 1998 *************** *** 1,4 **** ! /* $TOG: FSWrap.c /main/15 1998/02/06 17:24:08 kaleb $ */ /* * Copyright 1991 by the Open Software Foundation --- 1,4 ---- ! /* $TOG: FSWrap.c /main/16 1998/05/29 14:46:29 kaleb $ */ /* * Copyright 1991 by the Open Software Foundation *************** *** 58,64 **** #include ! #define MAXLIST 256 char ** _XParseBaseFontNameList(str, num) --- 58,64 ---- #include ! #define XMAXLIST 256 char ** _XParseBaseFontNameList(str, num) *************** *** 65,71 **** char *str; int *num; { ! char *plist[MAXLIST]; char **list; char *ptr; --- 65,71 ---- char *str; int *num; { ! char *plist[XMAXLIST]; char **list; char *ptr; *************** *** 83,89 **** } strcpy(ptr, str); ! while (1) { char *back; plist[*num] = ptr; --- 83,90 ---- } strcpy(ptr, str); ! /* somebody who specifies more than XMAXLIST basefontnames will lose */ ! while (*num < (sizeof plist / sizeof plist[0])) { char *back; plist[*num] = ptr; *** ./lib/X11/FontNames.c@@/PUBLIC-LATEST Fri Feb 6 17:22:20 1998 --- xc/lib/X11/FontNames.c Sun May 17 09:10:31 1998 *************** *** 1,4 **** ! /* $TOG: FontNames.c /main/13 1998/02/06 17:22:26 kaleb $ */ /* Copyright 1986, 1998 The Open Group --- 1,4 ---- ! /* $TOG: FontNames.c /main/14 1998/05/17 09:16:03 kaleb $ */ /* Copyright 1986, 1998 The Open Group *************** *** 55,61 **** _XSend (dpy, pattern, nbytes); /* use _XSend instead of Data, since following _XReply will flush buffer */ ! (void) _XReply (dpy, (xReply *)&rep, 0, xFalse); if (rep.nFonts) { flist = (char **)Xmalloc ((unsigned)rep.nFonts * sizeof(char *)); --- 55,66 ---- _XSend (dpy, pattern, nbytes); /* use _XSend instead of Data, since following _XReply will flush buffer */ ! if (!_XReply (dpy, (xReply *)&rep, 0, xFalse)) { ! *actualCount = 0; ! UnlockDisplay(dpy); ! SyncHandle(); ! return (char **) NULL; ! } if (rep.nFonts) { flist = (char **)Xmalloc ((unsigned)rep.nFonts * sizeof(char *)); *************** *** 67,72 **** --- 72,78 ---- if (flist) Xfree((char *) flist); if (ch) Xfree(ch); _XEatData(dpy, (unsigned long) rlen); + *actualCount = 0; UnlockDisplay(dpy); SyncHandle(); return (char **) NULL; *** ./lib/X11/GetPntMap.c@@/PUBLIC-LATEST Fri Feb 6 17:27:34 1998 --- xc/lib/X11/GetPntMap.c Sat May 30 07:59:09 1998 *************** *** 1,4 **** ! /* $TOG: GetPntMap.c /main/13 1998/02/06 17:27:40 kaleb $ */ /* Copyright 1986, 1998 The Open Group --- 1,4 ---- ! /* $TOG: GetPntMap.c /main/14 1998/05/30 08:06:05 kaleb $ */ /* Copyright 1986, 1998 The Open Group *************** *** 36,50 **** { unsigned char mapping[256]; /* known fixed size */ ! long nbytes; xGetPointerMappingReply rep; register xReq *req; LockDisplay(dpy); GetEmptyReq(GetPointerMapping, req); ! (void) _XReply(dpy, (xReply *)&rep, 0, xFalse); nbytes = (long)rep.length << 2; _XRead (dpy, (char *)mapping, nbytes); /* don't return more data than the user asked for. */ if (rep.nElts) { --- 36,59 ---- { unsigned char mapping[256]; /* known fixed size */ ! long nbytes, remainder = 0; xGetPointerMappingReply rep; register xReq *req; LockDisplay(dpy); GetEmptyReq(GetPointerMapping, req); ! if (! _XReply(dpy, (xReply *)&rep, 0, xFalse)) { ! UnlockDisplay(dpy); ! SyncHandle(); ! return 0; ! } nbytes = (long)rep.length << 2; + + if (nbytes > sizeof mapping) { + remainder = nbytes - sizeof mapping; + nbytes = sizeof mapping; + } _XRead (dpy, (char *)mapping, nbytes); /* don't return more data than the user asked for. */ if (rep.nElts) { *************** *** 51,56 **** --- 60,69 ---- memcpy ((char *) map, (char *) mapping, MIN((int)rep.nElts, nmaps) ); } + + if (remainder) + _XEatData(dpy, (unsigned long)remainder); + UnlockDisplay(dpy); SyncHandle(); return ((int) rep.nElts); *** ./lib/X11/SetLocale.c@@/PUBLIC-LATEST Fri Feb 6 17:52:22 1998 --- xc/lib/X11/SetLocale.c Wed Jun 17 14:40:17 1998 *************** *** 1,4 **** ! /* $TOG: SetLocale.c /main/38 1998/02/06 17:52:28 kaleb $ */ /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, --- 1,4 ---- ! /* $TOG: SetLocale.c /main/42 1998/06/17 14:47:35 kaleb $ */ /* * Copyright 1990, 1991 by OMRON Corporation, NTT Software Corporation, *************** *** 65,72 **** extern char *getenv(); #endif - #define MAXLOCALE 64 /* buffer size of locale name */ - #if NeedFunctionPrototypes char * _Xsetlocale( --- 65,70 ---- *************** *** 124,130 **** --- 122,137 ---- * _XlcMapOSLocaleName is an implementation dependent routine that derives * the LC_CTYPE locale name as used in the sample implementation from that * returned by setlocale. + * * Should match the code in Xt ExtractLocaleName. + * + * This function name is a bit of a misnomer. Even the siname parameter + * name is a misnomer. On most modern operating systems this function is + * a no-op, simply returning the osname; but on older operating systems + * like Ultrix, or HPUX 9.x and earlier, when you set LANG=german.88591 + * then the string returned by setlocale(LC_ALL, "") will look something + * like: "german.88591 german.88591 ... german.88591". Then this function + * will pick out the LC_CTYPE component and return a pointer to that. */ char * *************** *** 155,161 **** #define ENDCHAR ';' #define WHITEFILL #else ! #if defined(__osf__) || defined(AIXV3) #define STARTCHAR ' ' #define ENDCHAR ' ' #else --- 162,168 ---- #define ENDCHAR ';' #define WHITEFILL #else ! #if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) #define STARTCHAR ' ' #define ENDCHAR ' ' #else *** ./lib/X11/X11-def.cpp@@/PUBLIC-LATEST Sun Jan 4 12:24:19 1998 --- xc/lib/X11/X11-def.cpp Tue Jun 16 15:57:03 1998 *************** *** 746,752 **** XcmsRGBiColorSpace XcmsTekHVCColorSpace XcmsUNDEFINEDColorSpace ! XimParseStringFile XkbAddGeomColor XkbAddGeomDoodad XkbAddGeomKey --- 746,752 ---- XcmsRGBiColorSpace XcmsTekHVCColorSpace XcmsUNDEFINEDColorSpace ! _XimParseStringFile /* unspecified, retain slot for binary compat */ XkbAddGeomColor XkbAddGeomDoodad XkbAddGeomKey *************** *** 806,809 **** XkbUpdateKeyTypeVirtualMods XkbUpdateMapFromCore XkbXlibControlsImplemented ! /* $TOG: X11-def.cpp /main/18 1998/01/04 12:31:30 kaleb $ */ --- 806,809 ---- XkbUpdateKeyTypeVirtualMods XkbUpdateMapFromCore XkbXlibControlsImplemented ! /* $TOG: X11-def.cpp /main/19 1998/06/16 16:04:58 kaleb $ */ *** ./lib/X11/XKBCvt.c@@/PUBLIC-LATEST Fri Feb 6 17:59:38 1998 --- xc/lib/X11/XKBCvt.c Sat May 30 20:22:52 1998 *************** *** 1,4 **** ! /* $TOG: XKBCvt.c /main/29 1998/02/06 17:59:44 kaleb $ */ /* Copyright 1988, 1989, 1998 The Open Group --- 1,4 ---- ! /* $TOG: XKBCvt.c /main/35 1998/05/30 20:29:41 kaleb $ */ /* Copyright 1988, 1989, 1998 The Open Group *************** *** 63,162 **** #define RConst /**/ #endif ! /* bit (1<> 8) == kset) { ! count = 1; ! switch (keysymSet) { ! case sKana: ! buf[0] = (char)(keysym & 0xff); ! if (buf[0] == 0x7e) ! count = 0; ! break; ! case sCyrillic: ! buf[0] = _Xcyrillic[keysym & 0x7f]; ! break; ! case sGreek: ! buf[0] = _Xgreek[keysym & 0x7f]; ! if (!buf[0]) ! count = 0; ! break; ! default: ! buf[0] = (char)(keysym & 0xff); ! break; ! } ! } else if ((keysymSet != 0) && (isLatin1) && (keysym & 0x80)) { ! if (latin1[keysym & 0x7f] & (1 << kset)) { ! /* Most non-latin1 locales use some latin-1 upper half ! keysyms as defined by bitpatterns in array latin1. ! Enforce it. */ ! buf[0] = (char)(keysym & 0xff); ! count = 1; ! } else { ! count= 1; ! if ((keysymSet == sHebrew) && (keysym == XK_multiply)) ! buf[0] = (char)0xaa; ! else if ((keysymSet == sHebrew) && (keysym == XK_division)) ! buf[0] = (char)0xba; ! else if ((keysymSet == sCyrillic) && (keysym == XK_section)) ! buf[0] = (char)0xfd; ! else if ((keysymSet == sX0201) && (keysym == XK_yen)) ! buf[0] = (char)0x5c; ! else count = 0; ! } ! } else if (isLatin1) { ! if ((keysymSet == sX0201) && ! ((keysym == XK_backslash) || (keysym == XK_asciitilde))) ! count = 0; ! if ( (keysym&0x80)==0 ) { ! buf[0] = (char)(keysym&0x7f); ! count = 1; ! } ! } else if (((keysym >> 8) == sLatin2) && ! (keysym & 0x80) && (latin2[keysym & 0x7f] & (1 << kset))) { ! buf[0] = (char)(keysym & 0xff); ! count = 1; ! } else if ((keysymSet == sGreek) && ! ((keysym == XK_leftsinglequotemark) || ! (keysym == XK_rightsinglequotemark))) { ! buf[0] = (char)(keysym - (XK_leftsinglequotemark - 0xa1)); ! count = 1; ! } ! if (count>nbytes) { ! if (*extra_rtrn) ! *extra_rtrn= count-nbytes; ! return nbytes; ! } ! if (count=32) { register int i; ! for (i=0;i=32) { register int i; ! for (i=0;i<_Xkoi8_size;i++) { if (_Xkoi8[i]==buffer[0]) return 0x680|i; } *************** *** 516,521 **** --- 384,397 ---- _XkbKSToKnownSet,(XPointer)&WantLatin4,_XkbKnownSetToKS,NULL,NULL }; + static XkbConverters RConst cvt_latin5 = { + _XkbKSToKnownSet,(XPointer)&WantLatin5,_XkbKnownSetToKS,NULL,NULL + }; + + static XkbConverters RConst cvt_latin6 = { + _XkbKSToKnownSet,(XPointer)&WantLatin6,_XkbKnownSetToKS,NULL,NULL + }; + static XkbConverters RConst cvt_kana = { _XkbKSToKnownSet,(XPointer)&WantKana,_XkbKnownSetToKS,NULL,NULL }; *************** *** 551,556 **** --- 427,433 ---- static XkbConverters cvt_Koi8 = { _XkbKSToKoi8, NULL, _XkbKoi8ToKS, NULL, NULL }; + static int #if NeedFunctionPrototypes Strcmp(char *str1, char *str2) *************** *** 562,567 **** --- 439,447 ---- char str[256]; char c, *s; + if (strlen (str1) >= sizeof str) /* almost certain it's a mismatch */ + return 1; + for (s = str; c = *str1++; ) { if (isupper(c)) c = tolower(c); *************** *** 601,607 **** *cvt_rtrn = cvt_Greek; else if (Strcmp(encoding_name, "iso8859-8")==0) *cvt_rtrn = cvt_Hebrew; ! else if (Strcmp(encoding_name, "apl")==0) /* what is this? */ *cvt_rtrn = cvt_APL; #if 0 else if (Strcmp(encoding_name, "ja.euc")==0) --- 481,491 ---- *cvt_rtrn = cvt_Greek; else if (Strcmp(encoding_name, "iso8859-8")==0) *cvt_rtrn = cvt_Hebrew; ! else if (Strcmp(encoding_name, "iso8859-9")==0) ! *cvt_rtrn = cvt_latin5; ! else if (Strcmp(encoding_name, "iso8859-10")==0) ! *cvt_rtrn = cvt_latin6; ! else if (Strcmp(encoding_name, "apl")==0) *cvt_rtrn = cvt_APL; #if 0 else if (Strcmp(encoding_name, "ja.euc")==0) *************** *** 615,621 **** *cvt_rtrn = cvt_X0201; else if (Strcmp(encoding_name, "kana")==0) /* ??? */ *cvt_rtrn = cvt_kana; ! else if ((Strcmp(encoding_name, "tactis")==0)|| (Strcmp(encoding_name, "tis620.2533-1")==0)) *cvt_rtrn = cvt_Thai; else if (Strcmp(encoding_name, "koi8-r")==0) --- 499,505 ---- *cvt_rtrn = cvt_X0201; else if (Strcmp(encoding_name, "kana")==0) /* ??? */ *cvt_rtrn = cvt_kana; ! else if ((Strcmp(encoding_name, "tactis")==0) || (Strcmp(encoding_name, "tis620.2533-1")==0)) *cvt_rtrn = cvt_Thai; else if (Strcmp(encoding_name, "koi8-r")==0) *************** *** 636,641 **** --- 520,532 ---- */ #ifdef XKB_EXTEND_LOOKUP_STRING + + /* + * XKB_EXTEND_LOOKUP_STRING is not used by the SI. It is used by various + * X Consortium/X Project Team members, so we leave it in the source as + * an simplify integration by these companies. + */ + #define CHARSET_FILE "/usr/lib/X11/input/charsets" static char *_XkbKnownLanguages = "c=ascii:da,de,en,es,fi,fr,is,it,nl,no,pt,sv=iso8859-1:hu,pl,cs=iso8859-2:bg,ru=iso8859-5:ar,ara=iso8859-6:el=iso8859-7:th,th_TH,th_TH.TACTIS=tactis"; *** ./lib/X11/XKBGetMap.c@@/PUBLIC-LATEST Sun Jan 14 16:44:38 1996 --- xc/lib/X11/XKBGetMap.c Wed Jun 17 13:17:33 1998 *************** *** 1,4 **** ! /* $XConsortium: XKBGetMap.c /main/7 1996/01/14 16:43:27 kaleb $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. --- 1,4 ---- ! /* $TOG: XKBGetMap.c /main/11 1998/06/17 13:24:49 kaleb $ */ /************************************************************ Copyright (c) 1993 by Silicon Graphics Computer Systems, Inc. *************** *** 251,266 **** #endif { int i; ! CARD8 numDesc[248]; register int nKeyActs; if ( (nKeyActs=rep->nKeyActs)>0 ) { XkbSymMapPtr symMap; ! if (!_XkbCopyFromReadBuffer(buf, (char *)numDesc, nKeyActs)) ! return BadLength; i= XkbPaddedSize(nKeyActs)-nKeyActs; ! if ((i>0)&&(!_XkbSkipReadBufferData(buf,i))) ! return BadLength; symMap = &info->map->key_sym_map[rep->firstKeyAct]; for (i=0;i<(int)rep->nKeyActs;i++,symMap++) { if (numDesc[i]==0) { --- 251,276 ---- #endif { int i; ! CARD8 numDescBuf[248]; ! CARD8* numDesc = NULL; register int nKeyActs; + Status ret = Success; if ( (nKeyActs=rep->nKeyActs)>0 ) { XkbSymMapPtr symMap; ! ! if (nKeyActs < sizeof numDescBuf) numDesc = numDescBuf; ! else numDesc = Xmalloc (nKeyActs * sizeof(CARD8)); ! ! if (!_XkbCopyFromReadBuffer(buf, (char *)numDesc, nKeyActs)) { ! ret = BadLength; ! goto done; ! } i= XkbPaddedSize(nKeyActs)-nKeyActs; ! if ((i>0)&&(!_XkbSkipReadBufferData(buf,i))) { ! ret = BadLength; ! goto done; ! } symMap = &info->map->key_sym_map[rep->firstKeyAct]; for (i=0;i<(int)rep->nKeyActs;i++,symMap++) { if (numDesc[i]==0) { *************** *** 272,286 **** /* either zero or XkbKeyNumSyms(info,key) */ newActs=XkbResizeKeyActions(info,i+rep->firstKeyAct, numDesc[i]); ! if (newActs==NULL) ! return BadAlloc; if (!_XkbCopyFromReadBuffer(buf,(char *)newActs, ! (int)(numDesc[i]*sizeof(XkbAction)))) ! return BadLength; } } } ! return Success; } static Status --- 282,302 ---- /* either zero or XkbKeyNumSyms(info,key) */ newActs=XkbResizeKeyActions(info,i+rep->firstKeyAct, numDesc[i]); ! if (newActs==NULL) { ! ret = BadAlloc; ! goto done; ! } if (!_XkbCopyFromReadBuffer(buf,(char *)newActs, ! (int)(numDesc[i]*sizeof(XkbAction)))) { ! ret = BadLength; ! goto done; ! } } } } ! done: ! if (numDesc != NULL && numDesc != numDescBuf) Xfree (numDesc); ! return ret; } static Status *** ./lib/X11/Ximint.h@@/PUBLIC-LATEST Mon Apr 28 16:39:30 1997 --- xc/lib/X11/Ximint.h Tue Jun 16 15:57:57 1998 *************** *** 1,4 **** ! /* $TOG: Ximint.h /main/10 1997/04/28 16:40:16 barstow $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: Ximint.h /main/12 1998/06/16 16:05:08 kaleb $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED *************** *** 340,346 **** #endif ); ! extern int XimParseStringFile( #if NeedFunctionPrototypes FILE *fp, DefTree **ptop --- 340,346 ---- #endif ); ! extern void _XimParseStringFile( #if NeedFunctionPrototypes FILE *fp, DefTree **ptop *************** *** 841,847 **** #if NeedFunctionPrototypes Xic ic, XKeyEvent *event, ! unsigned char *buffer, int nbytes, KeySym *keysym, XComposeStatus *status --- 841,847 ---- #if NeedFunctionPrototypes Xic ic, XKeyEvent *event, ! char *buffer, int nbytes, KeySym *keysym, XComposeStatus *status *** ./lib/X11/XlcUTF.h@@/PUBLIC-LATEST Tue Sep 23 18:15:09 1997 --- xc/lib/X11/XlcUTF.h Wed May 20 14:42:03 1998 *************** *** 1,4 **** ! /* $TOG: XlcUTF.h /main/8 1997/09/23 18:14:24 kaleb $ */ /****************************************************************** Copyright 1993 by SunSoft, Inc. --- 1,4 ---- ! /* $TOG: XlcUTF.h /main/10 1998/05/20 14:47:44 kaleb $ */ /****************************************************************** Copyright 1993 by SunSoft, Inc. *************** *** 52,60 **** --- 52,63 ---- #define tab8859_7 "tab8859_7" #define tab8859_8 "tab8859_8" #define tab8859_9 "tab8859_9" + #define tab8859_10 "tab8859_10" + #define tab8859_15 "tab8859_15" #define jis0208 "jis0208" #define ksc5601 "ksc5601" #define gb2312 "gb2312" + #define tabkoi8_r "tabkoi8_r" #define emit(x) *r = (Rune)x; *** ./lib/X11/Xlib.h@@/PUBLIC-LATEST Fri Feb 6 18:02:37 1998 --- xc/lib/X11/Xlib.h Sun Mar 22 18:22:06 1998 *************** *** 1,4 **** ! /* $TOG: Xlib.h /main/121 1998/02/06 18:02:42 kaleb $ */ /* Copyright 1985, 1986, 1987, 1991, 1998 The Open Group --- 1,4 ---- ! /* $TOG: Xlib.h /main/122 1998/03/22 18:22:09 barstow $ */ /* Copyright 1985, 1986, 1987, 1991, 1998 The Open Group *************** *** 2602,2609 **** Drawable /* d */, GC /* gc */, int /* x1 */, - int /* x2 */, int /* y1 */, int /* y2 */ #endif ); --- 2602,2609 ---- Drawable /* d */, GC /* gc */, int /* x1 */, int /* y1 */, + int /* x2 */, int /* y2 */ #endif ); *** ./lib/X11/Xlibint.h@@/PUBLIC-LATEST Fri Feb 6 18:02:30 1998 --- xc/lib/X11/Xlibint.h Wed Jun 17 08:43:54 1998 *************** *** 1,4 **** ! /* $TOG: Xlibint.h /main/116 1998/02/06 18:02:35 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: Xlibint.h /main/117 1998/06/17 08:44:01 barstow $ */ /* *************** *** 32,37 **** --- 32,40 ---- * Warning, there be dragons here.... */ + #ifndef _XLIBINT_H_ + #define _XLIBINT_H_ + #include #ifdef WIN32 *************** *** 1254,1256 **** --- 1257,1261 ---- #endif _XFUNCPROTOEND + + #endif /* _XLIBINT_H_ */ *** ./lib/X11/cmsColNm.c@@/PUBLIC-LATEST Wed Aug 27 12:13:07 1997 --- xc/lib/X11/cmsColNm.c Fri Mar 13 14:14:47 1998 *************** *** 1,4 **** ! /* $TOG: cmsColNm.c /main/31 1997/08/27 12:12:32 kaleb $" */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. --- 1,4 ---- ! /* $TOG: cmsColNm.c /main/32 1998/03/13 14:14:50 barstow $" */ /* * Code and supporting documentation (c) Copyright 1990 1991 Tektronix, Inc. *************** *** 441,447 **** /* * Now, remove spaces. */ ! for (i = 0, j = 0; i < len; j++) { if (!isspace(name_lowered[j])) { name_lowered[i++] = name_lowered[j]; } --- 441,447 ---- /* * Now, remove spaces. */ ! for (i = 0, j = 0; j < len; j++) { if (!isspace(name_lowered[j])) { name_lowered[i++] = name_lowered[j]; } *** ./lib/X11/imConv.c@@/PUBLIC-LATEST Tue Feb 11 17:50:36 1997 --- xc/lib/X11/imConv.c Wed Jun 17 15:38:33 1998 *************** *** 1,4 **** ! /* $TOG: imConv.c /main/11 1997/02/11 17:48:36 kaleb $ */ /****************************************************************** Copyright 1991, 1992 by Fuji Xerox Co.,Ltd. --- 1,4 ---- ! /* $TOG: imConv.c /main/20 1998/06/17 15:46:41 kaleb $ */ /****************************************************************** Copyright 1991, 1992 by Fuji Xerox Co.,Ltd. *************** *** 38,57 **** #include "Xlcint.h" #include "Ximint.h" #include "XlcPubI.h" #ifdef XKB #include "XKBlib.h" #define XLOOKUPSTRING lookup_string - extern unsigned char _Xcyrillic[]; - #define cyrillic _Xcyrillic - extern unsigned char _Xkoi8[]; - #define koi8 _Xkoi8 - extern unsigned char _Xgreek[]; - #define greek _Xgreek #else #define XLOOKUPSTRING XLookupString /* maps Cyrillic keysyms to 8859-5 */ ! static unsigned char cyrillic[128] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x80 - */ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, /* 0x90 - */ --- 38,100 ---- #include "Xlcint.h" #include "Ximint.h" #include "XlcPubI.h" + #define XK_PUBLISHING + #include "X11/keysym.h" #ifdef XKB + /* + * rather than just call _XLookupString (i.e. the pre-XKB XLookupString) + * do this because with XKB the event may have some funky modifiers that + * _XLookupString doesn't grok. + */ #include "XKBlib.h" #define XLOOKUPSTRING lookup_string #else #define XLOOKUPSTRING XLookupString + #endif + + /* bit (1<display); --- 154,761 ---- 0xf8, 0xf9, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }; ! static unsigned short keysym_to_unicode_1a1_1ff[] = { ! 0x0104, 0x02d8, 0x0141, 0x0000, 0x013d, 0x015a, 0x0000, /* 0x01a0-0x01a7 */ ! 0x0000, 0x0160, 0x015e, 0x0164, 0x0179, 0x0000, 0x017d, 0x017b, /* 0x01a8-0x01af */ ! 0x0000, 0x0105, 0x02db, 0x0142, 0x0000, 0x013e, 0x015b, 0x02c7, /* 0x01b0-0x01b7 */ ! 0x0000, 0x0161, 0x015f, 0x0165, 0x017a, 0x02dd, 0x017e, 0x017c, /* 0x01b8-0x01bf */ ! 0x0154, 0x0000, 0x0000, 0x0102, 0x0000, 0x0139, 0x0106, 0x0000, /* 0x01c0-0x01c7 */ ! 0x010c, 0x0000, 0x0118, 0x0000, 0x011a, 0x0000, 0x0000, 0x010e, /* 0x01c8-0x01cf */ ! 0x0110, 0x0143, 0x0147, 0x0000, 0x0000, 0x0150, 0x0000, 0x0000, /* 0x01d0-0x01d7 */ ! 0x0158, 0x016e, 0x0000, 0x0170, 0x0000, 0x0000, 0x0162, 0x0000, /* 0x01d8-0x01df */ ! 0x0155, 0x0000, 0x0000, 0x0103, 0x0000, 0x013a, 0x0107, 0x0000, /* 0x01e0-0x01e7 */ ! 0x010d, 0x0000, 0x0119, 0x0000, 0x011b, 0x0000, 0x0000, 0x010f, /* 0x01e8-0x01ef */ ! 0x0111, 0x0144, 0x0148, 0x0000, 0x0000, 0x0151, 0x0000, 0x0000, /* 0x01f0-0x01f7 */ ! 0x0159, 0x016f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0163, 0x02d9 /* 0x01f8-0x01ff */ ! }; ! static unsigned short keysym_to_unicode_2a1_2fe[] = { ! 0x0126, 0x0000, 0x0000, 0x0000, 0x0000, 0x0124, 0x0000, /* 0x02a0-0x02a7 */ ! 0x0000, 0x0130, 0x0000, 0x011e, 0x0134, 0x0000, 0x0000, 0x0000, /* 0x02a8-0x02af */ ! 0x0000, 0x0127, 0x0000, 0x0000, 0x0000, 0x0000, 0x0125, 0x0000, /* 0x02b0-0x02b7 */ ! 0x0000, 0x0131, 0x0000, 0x011f, 0x0135, 0x0000, 0x0000, 0x0000, /* 0x02b8-0x02bf */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010a, 0x0108, 0x0000, /* 0x02c0-0x02c7 */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02c8-0x02cf */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0120, 0x0000, 0x0000, /* 0x02d0-0x02d7 */ ! 0x011c, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015c, 0x0000, /* 0x02d8-0x02df */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x010b, 0x0109, 0x0000, /* 0x02e0-0x02e7 */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x02e8-0x02ef */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0121, 0x0000, 0x0000, /* 0x02f0-0x02f7 */ ! 0x011d, 0x0000, 0x0000, 0x0000, 0x0000, 0x016c, 0x015d /* 0x02f8-0x02ff */ }; ! static unsigned short keysym_to_unicode_3a2_3fe[] = { ! 0x0138, 0x0156, 0x0000, 0x0128, 0x013b, 0x0000, /* 0x03a0-0x03a7 */ ! 0x0000, 0x0000, 0x0112, 0x0122, 0x0166, 0x0000, 0x0000, 0x0000, /* 0x03a8-0x03af */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x013c, 0x0000, /* 0x03b0-0x03b7 */ ! 0x0000, 0x0000, 0x0113, 0x0123, 0x0167, 0x014a, 0x0000, 0x014b, /* 0x03b8-0x03bf */ ! 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012e, /* 0x03c0-0x03c7 */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0116, 0x0000, 0x0000, 0x012a, /* 0x03c8-0x03cf */ ! 0x0000, 0x0145, 0x014c, 0x0136, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03d0-0x03d7 */ ! 0x0000, 0x0172, 0x0000, 0x0000, 0x0000, 0x0168, 0x016a, 0x0000, /* 0x03d8-0x03df */ ! 0x0101, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x012f, /* 0x03e0-0x03e7 */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0117, 0x0000, 0x0000, 0x012b, /* 0x03e8-0x03ef */ ! 0x0000, 0x0146, 0x014d, 0x0137, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x03f0-0x03f7 */ ! 0x0000, 0x0173, 0x0000, 0x0000, 0x0000, 0x0169, 0x016b /* 0x03f8-0x03ff */ }; ! static unsigned short keysym_to_unicode_4a1_4df[] = { ! 0x3002, 0x3008, 0x3009, 0x3001, 0x30fb, 0x30f2, 0x30a1, /* 0x04a0-0x04a7 */ ! 0x30a3, 0x03a5, 0x30a7, 0x30a9, 0x30e3, 0x30e5, 0x30e7, 0x30c3, /* 0x04a8-0x04af */ ! 0x30fc, 0x03a2, 0x30a4, 0x30a6, 0x30a8, 0x30aa, 0x30ab, 0x30ad, /* 0x04b0-0x04b7 */ ! 0x30af, 0x30b1, 0x30b3, 0x30b5, 0x30b7, 0x30b9, 0x30bb, 0x30bd, /* 0x04b8-0x04bf */ ! 0x30bf, 0x30c1, 0x30c4, 0x30c6, 0x30c8, 0x30ca, 0x30cb, 0x30cc, /* 0x04c0-0x04c7 */ ! 0x30cd, 0x30ce, 0x30cf, 0x30d2, 0x30d5, 0x30d8, 0x30db, 0x30de, /* 0x04c8-0x04cf */ ! 0x30df, 0x30e0, 0x30e1, 0x30e2, 0x30e4, 0x30e6, 0x30e8, 0x30e9, /* 0x04d0-0x04d7 */ ! 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ef, 0x30f3, 0x309b, 0x309c /* 0x04d8-0x04df */ ! }; ! static unsigned short keysym_to_unicode_5ac_5f2[] = { ! 0x060c, 0x0000, 0x0000, 0x0000, /* 0x05ac-0x05af */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05b0-0x05b7 */ ! 0x0000, 0x0000, 0x0000, 0x061b, 0x0000, 0x0000, 0x0000, 0x061f, /* 0x05b8-0x05bf */ ! 0x0000, 0x0621, 0x0622, 0x0623, 0x0624, 0x0625, 0x0626, 0x0627, /* 0x05c0-0x05c7 */ ! 0x0628, 0x0629, 0x062a, 0x062b, 0x062c, 0x062d, 0x062e, 0x062f, /* 0x05c8-0x05cf */ ! 0x0630, 0x0631, 0x0632, 0x0633, 0x0634, 0x0635, 0x0636, 0x0637, /* 0x05d0-0x05d7 */ ! 0x0638, 0x0639, 0x063a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x05d8-0x05df */ ! 0x0640, 0x0641, 0x0642, 0x0643, 0x0644, 0x0645, 0x0646, 0x0647, /* 0x05e0-0x05e7 */ ! 0x0648, 0x0649, 0x064a, 0x064b, 0x064c, 0x064d, 0x064e, 0x064f, /* 0x05e8-0x05ef */ ! 0x0650, 0x0651, 0x0652 /* 0x05f0-0x05f7 */ }; ! static unsigned short keysym_to_unicode_6a1_6ff[] = { ! 0x0452, 0x0453, 0x0451, 0x0454, 0x0455, 0x0456, 0x0457, /* 0x06a0-0x06a7 */ ! 0x0458, 0x0459, 0x045a, 0x045b, 0x045c, 0x0000, 0x045e, 0x045f, /* 0x06a8-0x06af */ ! 0x2116, 0x0402, 0x0403, 0x0401, 0x0404, 0x0405, 0x0406, 0x0407, /* 0x06b0-0x06b7 */ ! 0x0408, 0x0409, 0x040a, 0x040b, 0x040c, 0x0000, 0x040e, 0x040f, /* 0x06b8-0x06bf */ ! 0x044e, 0x0430, 0x0431, 0x0446, 0x0434, 0x0435, 0x0444, 0x0433, /* 0x06c0-0x06c7 */ ! 0x0445, 0x0438, 0x0439, 0x043a, 0x043b, 0x043c, 0x043d, 0x043e, /* 0x06c8-0x06cf */ ! 0x043f, 0x044f, 0x0440, 0x0441, 0x0442, 0x0443, 0x0436, 0x0432, /* 0x06d0-0x06d7 */ ! 0x044c, 0x044b, 0x0437, 0x0448, 0x044d, 0x0449, 0x0447, 0x044a, /* 0x06d8-0x06df */ ! 0x042e, 0x0410, 0x0411, 0x0426, 0x0414, 0x0415, 0x0424, 0x0413, /* 0x06e0-0x06e7 */ ! 0x0425, 0x0418, 0x0419, 0x041a, 0x041b, 0x041c, 0x041d, 0x041e, /* 0x06e8-0x06ef */ ! 0x041f, 0x042f, 0x0420, 0x0421, 0x0422, 0x0423, 0x0416, 0x0412, /* 0x06f0-0x06f7 */ ! 0x042c, 0x042d, 0x0417, 0x0428, 0x042d, 0x0429, 0x0427, 0x042a /* 0x06f8-0x06ff */ ! }; ! static unsigned short keysym_to_unicode_7a1_7f9[] = { ! 0x0386, 0x0388, 0x0389, 0x038a, 0x03aa, 0x0000, 0x038c, /* 0x07a0-0x07a7 */ ! 0x038e, 0x03ab, 0x0000, 0x038f, 0x0000, 0x0000, 0x0385, 0x2015, /* 0x07a8-0x07af */ ! 0x0000, 0x03ac, 0x03ad, 0x03ae, 0x03af, 0x03ca, 0x0390, 0x03cc, /* 0x07b0-0x07b7 */ ! 0x03cd, 0x03cb, 0x03b0, 0x03ce, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07b8-0x07bf */ ! 0x0000, 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x0396, 0x0397, /* 0x07c0-0x07c7 */ ! 0x0398, 0x0399, 0x039a, 0x039b, 0x039c, 0x039d, 0x039e, 0x039f, /* 0x07c8-0x07cf */ ! 0x03a0, 0x03a1, 0x03a2, 0x03a3, 0x03a4, 0x03a5, 0x03a6, 0x03a7, /* 0x07d0-0x07d7 */ ! 0x03a8, 0x03a9, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x07d8-0x07df */ ! 0x0000, 0x03b1, 0x03b2, 0x03b3, 0x03b4, 0x03b5, 0x03b6, 0x03b7, /* 0x07e0-0x07e7 */ ! 0x03b8, 0x03b9, 0x03ba, 0x03bb, 0x03bc, 0x03bd, 0x03be, 0x03bf, /* 0x07e8-0x07ef */ ! 0x03c0, 0x03c1, 0x03c2, 0x03c3, 0x03c4, 0x03c5, 0x03c6, 0x03c7, /* 0x07f0-0x07f7 */ ! 0x03c8, 0x03c9 /* 0x07f8-0x07ff */ ! }; ! ! static unsigned short keysym_to_unicode_8a4_8fe[] = { ! 0x2320, 0x2321, 0x0000, 0x231c, /* 0x08a0-0x08a7 */ ! 0x231d, 0x231e, 0x231f, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08a8-0x08af */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08b0-0x08b7 */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x2264, 0x2260, 0x2265, 0x222b, /* 0x08b8-0x08bf */ ! 0x2234, 0x0000, 0x221e, 0x0000, 0x0000, 0x2207, 0x0000, 0x0000, /* 0x08c0-0x08c7 */ ! 0x2245, 0x2246, 0x0000, 0x0000, 0x0000, 0x0000, 0x22a2, 0x0000, /* 0x08c8-0x08cf */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x221a, 0x0000, /* 0x08d0-0x08d7 */ ! 0x0000, 0x0000, 0x2282, 0x2283, 0x2229, 0x222a, 0x2227, 0x2228, /* 0x08d8-0x08df */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e0-0x08e7 */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, /* 0x08e8-0x08ef */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0192, 0x0000, /* 0x08f0-0x08f7 */ ! 0x0000, 0x0000, 0x0000, 0x2190, 0x2191, 0x2192, 0x2193 /* 0x08f8-0x08ff */ ! }; ! ! static unsigned short keysym_to_unicode_9df_9f8[] = { ! 0x2422, /* 0x09d8-0x09df */ ! 0x2666, 0x25a6, 0x2409, 0x240c, 0x240d, 0x240a, 0x0000, 0x0000, /* 0x09e0-0x09e7 */ ! 0x240a, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x2500, /* 0x09e8-0x09ef */ ! 0x0000, 0x0000, 0x0000, 0x0000, 0x251c, 0x2524, 0x2534, 0x252c, /* 0x09f0-0x09f7 */ ! 0x2502 /* 0x09f8-0x09ff */ ! }; ! ! static unsigned short keysym_to_unicode_aa1_afe[] = { ! 0x2003, 0x2002, 0x2004, 0x2005, 0x2007, 0x2008, 0x2009, /* 0x0aa0-0x0aa7 */ ! 0x200a, 0x2014, 0x2013, 0x0000, 0x0000, 0x0000, 0x2026, 0x2025, /* 0x0aa8-0x0aaf */ ! 0x2153, 0x2154, 0x2155, 0x2156, 0x2157, 0x2158, 0x2159, 0x215a, /* 0x0ab0-0x0ab7 */ ! 0x2105, 0x0000, 0x0000, 0x2012, 0x2039, 0x2024, 0x203a, 0x0000, /* 0x0ab8-0x0abf */ ! 0x0000, 0x0000, 0x0000, 0x215b, 0x215c, 0x215d, 0x215e, 0x0000, /* 0x0ac0-0x0ac7 */ ! 0x0000, 0x2122, 0x2120, 0x00ae, 0x25c1, 0x25b7, 0x25cb, 0x25ad, /* 0x0ac8-0x0acf */ ! 0x2018, 0x2019, 0x201c, 0x201d, 0x211e, 0x0000, 0x2032, 0x2033, /* 0x0ad0-0x0ad7 */ ! 0x0000, 0x271d, 0x0000, 0x220e, 0x25c2, 0x2023, 0x25cf, 0x25ac, /* 0x0ad8-0x0adf */ ! 0x25e6, 0x25ab, 0x25ae, 0x25b5, 0x25bf, 0x2606, 0x2022, 0x25aa, /* 0x0ae0-0x0ae7 */ ! 0x25b4, 0x25be, 0x261a, 0x261b, 0x2663, 0x2666, 0x2665, 0x0000, /* 0x0ae8-0x0aef */ ! 0x2720, 0x2020, 0x2021, 0x2713, 0x2612, 0x266f, 0x266d, 0x2642, /* 0x0af0-0x0af7 */ ! 0x2640, 0x2121, 0x2315, 0x2117, 0x2038, 0x201a, 0x201e /* 0x0af8-0x0aff */ ! }; ! ! /* none of the APL keysyms match the Unicode characters */ ! ! static unsigned short keysym_to_unicode_cdf_cfa[] = { ! 0x2017, /* 0x0cd8-0x0cdf */ ! 0x05d0, 0x05d1, 0x05d2, 0x05d3, 0x05d4, 0x05d5, 0x05d6, 0x05d7, /* 0x0ce0-0x0ce7 */ ! 0x05d8, 0x05d9, 0x05da, 0x05db, 0x05dc, 0x05dd, 0x05de, 0x05df, /* 0x0ce8-0x0cef */ ! 0x05e0, 0x05e1, 0x05e2, 0x05e3, 0x05e4, 0x05e5, 0x05e6, 0x05e7, /* 0x0cf0-0x0cf7 */ ! 0x05e8, 0x05e9, 0x05ea /* 0x0cf8-0x0cff */ ! }; ! ! static unsigned short keysym_to_unicode_da1_df9[] = { ! 0x0e01, 0x0e02, 0x0e03, 0x0e04, 0x0e05, 0x0e06, 0x0e07, /* 0x0da0-0x0da7 */ ! 0x0e08, 0x0e09, 0x0e0a, 0x0e0b, 0x0e0c, 0x0e0d, 0x0e0e, 0x0e0f, /* 0x0da8-0x0daf */ ! 0x0e10, 0x0e11, 0x0e12, 0x0e13, 0x0e14, 0x0e15, 0x0e16, 0x0e17, /* 0x0db0-0x0db7 */ ! 0x0e18, 0x0e19, 0x0e1a, 0x0e1b, 0x0e1c, 0x0e1d, 0x0e1e, 0x0e1f, /* 0x0db8-0x0dbf */ ! 0x0e20, 0x0e21, 0x0e22, 0x0e23, 0x0e24, 0x0e25, 0x0e26, 0x0e27, /* 0x0dc0-0x0dc7 */ ! 0x0e28, 0x0e29, 0x0e2a, 0x0e2b, 0x0e2c, 0x0e2d, 0x0e2e, 0x0e2f, /* 0x0dc8-0x0dcf */ ! 0x0e30, 0x0e31, 0x0e32, 0x0e33, 0x0e34, 0x0e35, 0x0e36, 0x0e37, /* 0x0dd0-0x0dd7 */ ! 0x0e38, 0x0e39, 0x0e3a, 0x0e3b, 0x0e3c, 0x0e3d, 0x0e3e, 0x0e3f, /* 0x0dd8-0x0ddf */ ! 0x0e40, 0x0e41, 0x0e42, 0x0e43, 0x0e44, 0x0e45, 0x0e46, 0x0e47, /* 0x0de0-0x0de7 */ ! 0x0e48, 0x0e49, 0x0e4a, 0x0e4b, 0x0e4c, 0x0e4d, 0x0000, 0x0000, /* 0x0de8-0x0def */ ! 0x0e50, 0x0e51, 0x0e52, 0x0e53, 0x0e54, 0x0e55, 0x0e56, 0x0e57, /* 0x0df0-0x0df7 */ ! 0x0e58, 0x0e59 /* 0x0df8-0x0dff */ ! }; ! ! static unsigned short keysym_to_unicode_ea0_eff[] = { ! 0x0000, 0x1101, 0x1101, 0x11aa, 0x1102, 0x11ac, 0x11ad, 0x1103, /* 0x0ea0-0x0ea7 */ ! 0x1104, 0x1105, 0x11b0, 0x11b1, 0x11b2, 0x11b3, 0x11b4, 0x11b5, /* 0x0ea8-0x0eaf */ ! 0x11b6, 0x1106, 0x1107, 0x1108, 0x11b9, 0x1109, 0x110a, 0x110b, /* 0x0eb0-0x0eb7 */ ! 0x110c, 0x110d, 0x110e, 0x110f, 0x1110, 0x1111, 0x1112, 0x1161, /* 0x0eb8-0x0ebf */ ! 0x1162, 0x1163, 0x1164, 0x1165, 0x1166, 0x1167, 0x1168, 0x1169, /* 0x0ec0-0x0ec7 */ ! 0x116a, 0x116b, 0x116c, 0x116d, 0x116e, 0x116f, 0x1170, 0x1171, /* 0x0ec8-0x0ecf */ ! 0x1172, 0x1173, 0x1174, 0x1175, 0x11a8, 0x11a9, 0x11aa, 0x11ab, /* 0x0ed0-0x0ed7 */ ! 0x11ac, 0x11ad, 0x11ae, 0x11af, 0x11b0, 0x11b1, 0x11b2, 0x11b3, /* 0x0ed8-0x0edf */ ! 0x11b4, 0x11b5, 0x11b6, 0x11b7, 0x11b8, 0x11b9, 0x11ba, 0x11bb, /* 0x0ee0-0x0ee7 */ ! 0x11bc, 0x11bd, 0x11be, 0x11bf, 0x11c0, 0x11c1, 0x11c2, 0x0000, /* 0x0ee8-0x0eef */ ! 0x0000, 0x0000, 0x1140, 0x0000, 0x0000, 0x1159, 0x119e, 0x0000, /* 0x0ef0-0x0ef7 */ ! 0x11eb, 0x0000, 0x11f9, 0x0000, 0x0000, 0x0000, 0x0000, 0x20a9, /* 0x0ef8-0x0eff */ ! }; ! ! static unsigned short keysym_to_unicode_13bc_13be[] = { ! 0x0152, 0x0153, 0x0178 /* 0x13b8-0x13bf */ ! }; ! ! static unsigned short keysym_to_unicode_20a0_20ac[] = { ! 0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, /* 0x20a0-0x20a7 */ ! 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac /* 0x20a8-0x20af */ ! }; ! ! static int keysym_to_ucs4(keysym) ! KeySym keysym; { ! if (keysym > 0 && keysym < 0x100) ! return keysym; ! else if (keysym > 0x1a0 && keysym < 0x200) ! return keysym_to_unicode_1a1_1ff[keysym - 0x1a1]; ! else if (keysym > 0x2a0 && keysym < 0x2ff) ! return keysym_to_unicode_2a1_2fe[keysym - 0x2a1]; ! else if (keysym > 0x3a1 && keysym < 0x3ff) ! return keysym_to_unicode_3a2_3fe[keysym - 0x3a2]; ! else if (keysym > 0x4a0 && keysym < 0x4e0) ! return keysym_to_unicode_4a1_4df[keysym - 0x4a1]; ! else if (keysym > 0x5ab && keysym < 0x5f3) ! return keysym_to_unicode_5ac_5f2[keysym - 0x5ac]; ! else if (keysym > 0x6a0 && keysym < 0x700) ! return keysym_to_unicode_6a1_6ff[keysym - 0x6a1]; ! else if (keysym > 0x7a0 && keysym < 0x7fa) ! return keysym_to_unicode_7a1_7f9[keysym - 0x7a1]; ! else if (keysym > 0x8a3 && keysym < 0x8ff) ! return keysym_to_unicode_8a4_8fe[keysym - 0x8a4]; ! else if (keysym > 0x9de && keysym < 0x9f9) ! return keysym_to_unicode_9df_9f8[keysym - 0x9df]; ! else if (keysym > 0xaa0 && keysym < 0xaff) ! return keysym_to_unicode_aa1_afe[keysym - 0xaa1]; ! else if (keysym > 0xcde && keysym < 0xcfb) ! return keysym_to_unicode_cdf_cfa[keysym - 0xcdf]; ! else if (keysym > 0xda0 && keysym < 0xdfa) ! return keysym_to_unicode_da1_df9[keysym - 0xda1]; ! else if (keysym > 0xe9f && keysym < 0xf00) ! return keysym_to_unicode_ea0_eff[keysym - 0xea0]; ! else if (keysym > 0x13bb && keysym < 0x13bf) ! return keysym_to_unicode_13bc_13be[keysym - 0x13bc]; ! else if (keysym > 0x209f && keysym < 0x20ad) ! return keysym_to_unicode_20a0_20ac[keysym - 0x20a0]; ! else ! return 0; } ! struct CodesetRec { ! unsigned long locale_code; ! char* locale_name; ! char* escape_seq; ! }; ! ! #define sLatin1 0L ! #define sLatin2 1L ! #define sLatin3 2L ! #define sLatin4 3L ! #define sKana 4L ! #define sX0201 0x01000004L ! #define sArabic 5L ! #define sCyrillic 6L ! #define sKoi8 0x01000006L ! #define sGreek 7L ! #define sHebrew 12L ! #define sThai 13L ! #define sKorean 14L ! #define sLatin5 15L ! #define sLatin6 16L ! #define sLatin7 17L ! #define sLatin8 18L ! #define sLatin9 19L ! #define sCurrency 32L ! #define sUTF8 0x02000000L ! ! static struct CodesetRec CodesetTable[] = { ! {sLatin1, "ISO8859-1", "\033-A"}, ! {sLatin2, "ISO8859-2", "\033-B"}, ! {sLatin3, "ISO8859-3", "\033-C"}, ! {sLatin4, "ISO8859-4", "\033-D"}, ! {sArabic, "ISO8859-5", "\033-G"}, ! {sCyrillic, "ISO8859-6", "\033-L"}, ! {sGreek, "ISO8859-7", "\033-F"}, ! {sHebrew, "ISO8859-8", "\033-H"}, ! {sLatin5, "ISO8859-9", "\033-M"}, ! {sLatin6, "ISO8859-10", "\033-V"}, ! {sThai, "TACTIS", "\033-T"}, ! {sKorean, "ko.euc", "\033$(C"}, ! {sThai, "ISO8859-11", "\033-T"}, ! #if 0 ! {sLatin8, "ISO8859-12", "\033-?"},/* Celtic, superceded by -14 */ ! {sLatin7, "ISO8859-13", "\033-?"},/* Baltic Rim */ ! {sLatin8 "ISO8859-14", "\033-?"},/* Celtic */ ! #endif ! {sUTF8, "utf8", "\033%B"}, ! /* Non-standard */ ! {sCyrillic, "KOI8-R", "\033%/1\200\210koi8-r\002"}, ! {sLatin9, "FCD8859-15", "\033%/1\200\213fcd8859-15\002"},/* a.k.a. Latin-0 */ ! }; ! ! #define NUM_CODESETS sizeof CodesetTable / sizeof CodesetTable[0] ! ! #ifndef XK_emdash ! #define XK_emdash 0xaa9 ! #endif ! ! ! /* ================================================================ */ ! /* ! File: ConvertUTF.C ! Author: Mark E. Davis ! Copyright (C) 1994 Taligent, Inc. All rights reserved. ! ! This code is copyrighted. Under the copyright laws, this code may not ! be copied, in whole or part, without prior written consent of Taligent. ! ! Taligent grants the right to use or reprint this code as long as this ! ENTIRE copyright notice is reproduced in the code or reproduction. ! The code is provided AS-IS, AND TALIGENT DISCLAIMS ALL WARRANTIES, ! EITHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO IMPLIED ! WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN ! NO EVENT WILL TALIGENT BE LIABLE FOR ANY DAMAGES WHATSOEVER (INCLUDING, ! WITHOUT LIMITATION, DAMAGES FOR LOSS OF BUSINESS PROFITS, BUSINESS ! INTERRUPTION, LOSS OF BUSINESS INFORMATION, OR OTHER PECUNIARY ! LOSS) ARISING OUT OF THE USE OR INABILITY TO USE THIS CODE, EVEN ! IF TALIGENT HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. ! BECAUSE SOME STATES DO NOT ALLOW THE EXCLUSION OR LIMITATION OF ! LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE ! LIMITATION MAY NOT APPLY TO YOU. ! ! RESTRICTED RIGHTS LEGEND: Use, duplication, or disclosure by the ! government is subject to restrictions as set forth in subparagraph ! (c)(l)(ii) of the Rights in Technical Data and Computer Software ! clause at DFARS 252.227-7013 and FAR 52.227-19. ! ! This code may be protected by one or more U.S. and International ! Patents. ! ! TRADEMARKS: Taligent and the Taligent Design Mark are registered ! trademarks of Taligent, Inc. ! */ ! /* ================================================================ */ ! ! #define kReplacementCharacter 0x0000FFFDUL ! #define kMaximumUCS2 0x0000FFFFUL ! #define kMaximumUCS4 0x7FFFFFFFUL ! ! typedef enum { ! ok, /* conversion successful */ ! sourceExhausted, /* partial character in source, but hit end */ ! targetExhausted /* insuff. room in target for conversion */ ! } ConversionResult; ! ! #define halfShift 10 ! #define halfBase 0x0010000UL ! #define halfMask 0x3FFUL ! #define kSurrogateHighStart 0xD800UL ! #define kSurrogateHighEnd 0xDBFFUL ! #define kSurrogateLowStart 0xDC00UL ! #define kSurrogateLowEnd 0xDFFFUL ! ! typedef unsigned int UCS4; /* wchar_t, but on AIX, SunOS wchar_t is 16 bits */ ! typedef unsigned char UTF8; ! ! static UCS4 offsetsFromUTF8[6] = { ! 0x00000000UL, 0x00003080UL, 0x000E2080UL, ! 0x03C82080UL, 0xFA082080UL, 0x82082080UL ! }; ! ! static char bytesFromUTF8[256] = { ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ! 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, ! 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, ! 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5 ! }; ! ! static UTF8 firstByteMark[7] = { ! 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC ! }; ! ! static ConversionResult ConvertUCS4toUTF8 ( ! UCS4** sourceStart, UCS4* sourceEnd, ! UTF8** targetStart, UTF8* targetEnd) { ! ConversionResult result = ok; ! register UCS4* source = *sourceStart; ! register UTF8* target = *targetStart; ! while (source < sourceEnd) { ! register UCS4 ch; ! register unsigned short bytesToWrite = 0; ! register const UCS4 byteMask = 0xBF; ! register const UCS4 byteMark = 0x80; ! ch = *source++; ! if (ch >= kSurrogateHighStart && ch <= kSurrogateHighEnd ! && source < sourceEnd) { ! register UCS4 ch2 = *source; ! if (ch2 >= kSurrogateLowStart && ch2 <= kSurrogateLowEnd) { ! ch = ((ch - kSurrogateHighStart) << halfShift) ! + (ch2 - kSurrogateLowStart) + halfBase; ! ++source; ! }; ! }; ! if (ch < 0x80) { bytesToWrite = 1; ! } else if (ch < 0x800) { bytesToWrite = 2; ! } else if (ch < 0x10000) { bytesToWrite = 3; ! } else if (ch < 0x200000) { bytesToWrite = 4; ! } else if (ch < 0x4000000) { bytesToWrite = 5; ! } else if (ch <= kMaximumUCS4){ bytesToWrite = 6; ! } else { bytesToWrite = 2; ! ch = kReplacementCharacter; ! }; /* I wish there were a smart way to avoid this conditional */ ! ! target += bytesToWrite; ! if (target > targetEnd) { ! target -= bytesToWrite; result = targetExhausted; break; ! }; ! switch (bytesToWrite) { /* note: code falls through cases! */ ! case 6: *--target = (ch | byteMark) & byteMask; ch >>= 6; ! case 5: *--target = (ch | byteMark) & byteMask; ch >>= 6; ! case 4: *--target = (ch | byteMark) & byteMask; ch >>= 6; ! case 3: *--target = (ch | byteMark) & byteMask; ch >>= 6; ! case 2: *--target = (ch | byteMark) & byteMask; ch >>= 6; ! case 1: *--target = ch | firstByteMark[bytesToWrite]; ! }; ! target += bytesToWrite; ! }; ! *sourceStart = source; ! *targetStart = target; ! return result; } ! /*ARGSUSED*/ ! int ! #if NeedFunctionPrototypes ! _XGetCharCode ( ! unsigned long locale_code, ! KeySym keysym, ! unsigned char* buf, ! int nbytes) ! #else ! _XGetCharCode (locale_code, keysym, buf, nbytes) ! unsigned long locale_code; ! KeySym keysym; ! unsigned char *buf; ! int nbytes; ! #endif { ! unsigned long kset; ! int count,isLatin1; ! ! if (locale_code == sUTF8) { ! unsigned int ucs4[2]; ! unsigned int* ucs4vec[1]; ! unsigned char* utf8vec[1]; ! ! ucs4[0] = keysym_to_ucs4 (keysym); ! ucs4[1] = 0; ! ucs4vec[0] = ucs4; ! utf8vec[0] = buf; ! ! (void) ConvertUCS4toUTF8 (ucs4vec, &ucs4[1], utf8vec, &buf[nbytes]); ! return (strlen ((char*) buf)); ! } ! ! kset = locale_code&0xffffff; ! ! isLatin1 = ((keysym&0xffffff00)==0); ! count = 0; ! ! if ( keysym == NoSymbol ) ! return 0; ! else if ((keysym >> 8) == kset) { ! count = 1; ! switch (kset) { ! case sKana: ! *buf = (unsigned char)(keysym & 0xff); ! if (buf[0] == 0x7e) ! count = 0; ! break; ! case sCyrillic: ! if (locale_code == sKoi8) ! *buf = _Xkoi8[keysym & 0x7f]; ! else ! *buf = _Xcyrillic[keysym & 0x7f]; ! break; ! case sGreek: ! *buf = _Xgreek[keysym & 0x7f]; ! if (!buf[0]) ! count = 0; ! break; ! default: ! *buf = (unsigned char)(keysym & 0xff); ! break; ! } ! } else if ((locale_code != 0) && (isLatin1) && (keysym & 0x80)) { ! if (_Xlatin1[keysym & 0x7f] & (1 << kset)) { ! /* Most non-latin1 locales use some latin-1 upper half ! keysyms as defined by bitpatterns in array latin1. ! Enforce it. */ ! *buf = (unsigned char)(keysym & 0xff); ! count = 1; ! } else { ! count= 1; ! if ((locale_code == sHebrew) && (keysym == XK_multiply)) ! *buf = (unsigned char)0xaa; ! else if ((locale_code == sHebrew) && (keysym == XK_division)) ! *buf = (unsigned char)0xba; ! else if ((locale_code == sCyrillic) && (keysym == XK_section)) ! *buf = (unsigned char)0xfd; ! else if ((locale_code == sX0201) && (keysym == XK_yen)) ! *buf = (unsigned char)0x5c; ! else count = 0; ! } ! } else if (isLatin1) { ! if ((locale_code == sX0201) && ! ((keysym == XK_backslash) || (keysym == XK_asciitilde))) ! count = 0; ! if ( (keysym&0x80)==0 ) { ! *buf = (unsigned char)(keysym&0x7f); ! count = 1; ! } ! } else if ((keysym >> 8) == sLatin2) { ! count = 1; ! if ((keysym & 0x80) && (_Xlatin2[keysym & 0x7f] & (1 << kset))) ! *buf = (unsigned char)(keysym & 0xff); ! else if (locale_code == sLatin5) { ! if (keysym == XK_Scedilla) ! *buf = (unsigned char)0xde; ! else if (keysym == XK_scedilla) ! *buf = (unsigned char)0xfe; ! else count = 0; ! } else if (locale_code == sLatin9) { ! if (keysym == XK_Scaron) ! *buf = (unsigned char)0xa6; ! else if (keysym == XK_scaron) ! *buf = (unsigned char)0xa8; ! else if (keysym == XK_Zcaron) ! *buf = (unsigned char)0xb4; ! else if (keysym == XK_zcaron) ! *buf = (unsigned char)0xb8; ! else count = 0; ! } else count = 0; ! } else if ((keysym >> 8) == sLatin3) { ! if (locale_code == sLatin5) { ! count = 1; ! switch (keysym) { ! case XK_Gbreve: *buf = (unsigned char)0xd0; break; ! case XK_gbreve: *buf = (unsigned char)0xf0; break; ! case XK_Scedilla: *buf = (unsigned char)0xde; break; ! case XK_scedilla: *buf = (unsigned char)0xfe; break; ! case XK_Iabovedot: *buf = (unsigned char)0xdd; break; ! case XK_idotless: *buf = (unsigned char)0xfd; break; ! default: count = 0; ! } ! } ! } else if ((keysym >> 8) == sLatin4) { ! if (locale_code == sLatin6) { ! count = 1; ! switch (keysym) { ! case XK_Emacron: *buf = (unsigned char)0xa2; break; ! case XK_Gcedilla: *buf = (unsigned char)0xa3; break; ! case XK_Imacron: *buf = (unsigned char)0xa4; break; ! case XK_Lcedilla: *buf = (unsigned char) 0xa8; break; ! case XK_Dstroke: *buf = (unsigned char)0xa9; break; ! case XK_Scaron: *buf = (unsigned char)0xaa; break; ! case XK_Tslash: *buf = (unsigned char)0xab; break; ! case XK_Zcaron: *buf = (unsigned char)0xac; break; ! case XK_Umacron: *buf = (unsigned char)0xae; break; ! case XK_Utilde: *buf = (unsigned char)0xd7; break; ! case XK_ENG: *buf = (unsigned char)0xaf; break; ! case XK_emacron: *buf = (unsigned char)0xb2; break; ! case XK_gcedilla: *buf = (unsigned char)0xb3; break; ! case XK_imacron: *buf = (unsigned char)0xb4; break; ! case XK_lcedilla: *buf = (unsigned char) 0xb8; break; ! case XK_dstroke: *buf = (unsigned char)0xb9; break; ! case XK_scaron: *buf = (unsigned char)0xba; break; ! case XK_tslash: *buf = (unsigned char)0xbb; break; ! case XK_zcaron: *buf = (unsigned char)0xbc; break; ! case XK_umacron: *buf = (unsigned char)0xbe; break; ! case XK_utilde: *buf = (unsigned char)0xf7; break; ! case XK_eng: *buf = (unsigned char)0xbf; break; ! case XK_kra: *buf = (unsigned char)0xff; break; ! case XK_Itilde: ! case XK_Kcedilla: ! case XK_Iogonek: ! case XK_Ncedilla: ! case XK_Omacron: ! case XK_Uogonek: ! case XK_itilde: ! case XK_kcedilla: ! case XK_iogonek: ! case XK_ncedilla: ! case XK_omacron: ! case XK_uogonek: *buf = (unsigned char)(keysym & 0xff); break; ! default: count = 0; ! } ! } ! } else if (locale_code == sLatin9 && keysym == XK_EuroSign) { ! count = 1; ! *buf = (unsigned char)0xa4; ! } else if ((locale_code == sGreek) && ! ((keysym == XK_leftsinglequotemark) || ! (keysym == XK_rightsinglequotemark))) { ! *buf = (unsigned char)(keysym - (XK_leftsinglequotemark - 0xa1)); ! count = 1; ! } ! if (count>nbytes) ! return nbytes; ! if (countdisplay); *************** *** 190,313 **** int _XimLookupMBText(ic, event, buffer, nbytes, keysym, status) Xic ic; ! XKeyEvent *event; ! unsigned char *buffer; ! int nbytes; ! KeySym *keysym; ! XComposeStatus *status; { int count, local_count; KeySym symbol; ! unsigned long kset; ! struct CodesetRec *cset = (struct CodesetRec *)NULL; int i; unsigned char c; Status dummy; Xim im = (Xim)ic->core.im; XLCd lcd = im->core.lcd; ! char local_buf[BUF_SIZE]; unsigned char look[BUF_SIZE]; count = XLOOKUPSTRING(event, (char *)buffer, nbytes, &symbol, status); ! if (keysym) *keysym = symbol; ! if ((nbytes == 0) || (symbol == NoSymbol)) { ! return(count); ! } ! if (count == 0) { ! kset = (symbol >> 8) & 0xffffff; ! for (i = 0; i < codeset_size; i++) { ! if (kset == codeset[i].kset) { ! cset = &codeset[i]; ! break; ! } } ! if (kset == sCyrillic && ! (strcmp (XLC_PUBLIC(lcd,encoding_name),"KOI8-R") == 0)) { ! cset = &koi8codeset; ! } ! if ((cset) && (c = (*cset->char_code)(symbol))) { ! strcpy(local_buf, cset->designator); ! local_count = strlen(cset->designator); ! local_buf[local_count] = c; local_count++; local_buf[local_count] = '\0'; if ((count = im->methods->ctstombs(ic->core.im, ! local_buf, local_count, (char *)buffer, nbytes, &dummy)) < 0) { count = 0; } } ! } else if ((count != 1) || (buffer[0] >= 0x80)) { /* not ASCII Encoding */ ! memcpy((char *)look, (char *)buffer,count); look[count] = '\0'; if ((count = im->methods->ctstombs(ic->core.im, ! (char *)look, count, ! (char *)buffer, nbytes, &dummy)) < 0) { count = 0; } } ! return(count); } int _XimLookupWCText(ic, event, buffer, nbytes, keysym, status) Xic ic; ! XKeyEvent *event; ! wchar_t *buffer; ! int nbytes; ! KeySym *keysym; ! XComposeStatus *status; { int count, local_count; KeySym symbol; ! unsigned long kset; ! struct CodesetRec *cset = (struct CodesetRec *)NULL; int i; unsigned char c; Status dummy; Xim im = (Xim)ic->core.im; XLCd lcd = im->core.lcd; ! char local_buf[BUF_SIZE]; unsigned char look[BUF_SIZE]; count = XLOOKUPSTRING(event, (char *)look, nbytes, &symbol, status); ! if (keysym) *keysym = symbol; ! if ((nbytes == 0) || (symbol == NoSymbol)) { ! return(count); ! } ! if (count == 0) { ! /* Not ISO 8859-1 Encoding */ ! kset = (symbol >> 8) & 0xffffff; ! for (i = 0; i < codeset_size; i++) { ! if (kset == codeset[i].kset) { ! cset = &codeset[i]; ! break; ! } } ! if (kset == sCyrillic && ! (strcmp (XLC_PUBLIC(lcd,encoding_name),"KOI8-R") == 0)) { ! cset = &koi8codeset; ! } ! if ((cset) && (c = (*cset->char_code)(symbol))) { ! strcpy(local_buf, cset->designator); ! local_count = strlen(cset->designator); ! local_buf[local_count] = c; local_count++; local_buf[local_count] = '\0'; if ((count = im->methods->ctstowcs(ic->core.im, ! local_buf, local_count, buffer, nbytes, &dummy)) < 0) { count = 0; } } ! } else if ((count == 1) && (look[0] < 0x80)) { /* ASCII Encoding */ ! buffer[0] = look[0]; ! } else { if ((count = im->methods->ctstowcs(ic->core.im, ! (char *)look, count, buffer, nbytes, &dummy)) < 0) { count = 0; } ! } ! return(count); } --- 772,899 ---- int _XimLookupMBText(ic, event, buffer, nbytes, keysym, status) Xic ic; ! XKeyEvent* event; ! char* buffer; ! int nbytes; ! KeySym* keysym; ! XComposeStatus* status; { int count, local_count; KeySym symbol; ! struct CodesetRec *cset; int i; unsigned char c; Status dummy; Xim im = (Xim)ic->core.im; XLCd lcd = im->core.lcd; ! unsigned char local_buf[BUF_SIZE]; unsigned char look[BUF_SIZE]; + + /* force a latin-1 lookup for compatibility */ count = XLOOKUPSTRING(event, (char *)buffer, nbytes, &symbol, status); ! if (keysym != NULL) *keysym = symbol; ! if ((nbytes == 0) || (symbol == NoSymbol)) return count; ! ! for (cset = NULL, i = 0; i < NUM_CODESETS; i++) { ! if (strcmp (XLC_PUBLIC(lcd,encoding_name), CodesetTable[i].locale_name) == 0) { ! cset = &CodesetTable[i]; ! break; } ! } ! if (count == 0 && cset != NULL || ! (count == 1 && (symbol > 0x7f && symbol < 0xff00) && ! cset != NULL && cset->locale_code != 0)) { ! if ((count = _XGetCharCode(cset->locale_code, symbol, ! look, sizeof look))) { ! strcpy((char*) local_buf, cset->escape_seq); ! local_count = strlen(cset->escape_seq); ! local_buf[local_count] = look[0]; local_count++; local_buf[local_count] = '\0'; if ((count = im->methods->ctstombs(ic->core.im, ! (char*) local_buf, local_count, (char *)buffer, nbytes, &dummy)) < 0) { count = 0; } } ! } else if (count > 1) { /* not ASCII Encoding */ ! memcpy(look, (char *)buffer,count); look[count] = '\0'; if ((count = im->methods->ctstombs(ic->core.im, ! (char*) look, count, ! buffer, nbytes, &dummy)) < 0) { count = 0; } } ! /* ! * we should make sure that if the character is a Latin1 character ! * and it's on the right side, and we're in a non-Latin1 locale ! * that this is a valid Latin1 character for this locale. ! */ ! return count; } int _XimLookupWCText(ic, event, buffer, nbytes, keysym, status) Xic ic; ! XKeyEvent* event; ! wchar_t* buffer; ! int nbytes; ! KeySym* keysym; ! XComposeStatus* status; { int count, local_count; KeySym symbol; ! struct CodesetRec *cset; int i; unsigned char c; Status dummy; Xim im = (Xim)ic->core.im; XLCd lcd = im->core.lcd; ! unsigned char local_buf[BUF_SIZE]; unsigned char look[BUF_SIZE]; + /* force a latin-1 lookup for compatibility */ count = XLOOKUPSTRING(event, (char *)look, nbytes, &symbol, status); ! if (keysym != NULL) *keysym = symbol; ! if ((nbytes == 0) || (symbol == NoSymbol)) return count; ! ! for (cset = NULL, i = 0; i < NUM_CODESETS; i++) { ! if (strcmp (XLC_PUBLIC(lcd,encoding_name), CodesetTable[i].locale_name) == 0) { ! cset = &CodesetTable[i]; ! break; } ! } ! if (count == 0 && cset != NULL || ! (count == 1 && (symbol > 0x7f && symbol < 0xff00) && ! cset != NULL && cset->locale_code != 0)) { ! if ((count = _XGetCharCode(cset->locale_code, symbol, ! look, sizeof look))) { ! strcpy((char*) local_buf, cset->escape_seq); ! local_count = strlen(cset->escape_seq); ! local_buf[local_count] = look[0]; local_count++; local_buf[local_count] = '\0'; if ((count = im->methods->ctstowcs(ic->core.im, ! (char*) local_buf, local_count, buffer, nbytes, &dummy)) < 0) { count = 0; } } ! } else if (count > 1) { if ((count = im->methods->ctstowcs(ic->core.im, ! (char*) look, count, buffer, nbytes, &dummy)) < 0) { count = 0; } ! } else ! /* ! * we should make sure that if the character is a Latin1 character ! * and it's on the right side, and we're in a non-Latin1 locale ! * that this is a valid Latin1 character for this locale. ! */ ! buffer[0] = look[0]; ! ! return count; } *** ./lib/X11/imDefLkup.c@@/PUBLIC-LATEST Sat Jun 21 21:32:16 1997 --- xc/lib/X11/imDefLkup.c Tue Apr 28 17:28:41 1998 *************** *** 1,4 **** ! /* $TOG: imDefLkup.c /main/17 1997/06/21 21:30:12 kaleb $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: imDefLkup.c /main/18 1998/04/28 17:33:12 kaleb $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED *************** *** 1103,1110 **** _XimUnregCommitInfo(ic); } else if (ev->type == KeyPress) { ! ret = _XimLookupMBText(ic, ev, (unsigned char *)buffer, ! bytes, keysym, NULL); if (ret > 0) { if (keysym && *keysym != NoSymbol) *state = XLookupBoth; --- 1103,1109 ---- _XimUnregCommitInfo(ic); } else if (ev->type == KeyPress) { ! ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL); if (ret > 0) { if (keysym && *keysym != NoSymbol) *state = XLookupBoth; *** ./lib/X11/imInt.c@@/PUBLIC-LATEST Mon Apr 28 16:39:09 1997 --- xc/lib/X11/imInt.c Sat May 30 21:04:36 1998 *************** *** 1,4 **** ! /* $TOG: imInt.c /main/4 1997/04/28 16:39:57 barstow $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: imInt.c /main/5 1998/05/30 21:11:16 kaleb $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED *************** *** 166,189 **** _XimMakeImName(lcd) XLCd lcd; { ! char buf[BUFSIZE]; ! register char *mod; ! register int i = 0; ! char *ret; ! buf[0] = '\0'; ! if(lcd->core->modifiers != (char *)NULL && *lcd->core->modifiers != '\0') { ! mod = _XimStrstr(lcd->core->modifiers, XIMMODIFIER); ! if(mod) { ! mod += strlen(XIMMODIFIER); ! while (*mod && *mod != '@') ! buf[i++] = *mod++; ! buf[i] = '\0'; } } ! if(!(ret = Xmalloc(i + 1))) ! return NULL; ! (void)strcpy(ret, buf); return ret; } --- 166,190 ---- _XimMakeImName(lcd) XLCd lcd; { ! char* begin; ! char* end; ! char* ret; ! int i = 0; ! char* ximmodifier = XIMMODIFIER; ! if(lcd->core->modifiers != NULL && *lcd->core->modifiers != '\0') { ! begin = _XimStrstr(lcd->core->modifiers, ximmodifier); ! if (begin != NULL) { ! end = begin += strlen(ximmodifier); ! while (*end && *end != '@') ! end++; } } ! ret = Xmalloc(end - begin + 2); ! if (ret != NULL) { ! (void)strncpy(ret, begin, end - begin + 1); ! ret[end - begin + 1] = '\0'; ! } return ret; } *** ./lib/X11/imLcIm.c@@/PUBLIC-LATEST Wed Aug 27 12:13:18 1997 --- xc/lib/X11/imLcIm.c Tue Jun 16 15:58:04 1998 *************** *** 1,4 **** ! /* $TOG: imLcIm.c /main/11 1997/08/27 12:12:44 kaleb $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: imLcIm.c /main/12 1998/06/16 16:05:15 kaleb $ */ /****************************************************************** Copyright 1992, 1993, 1994 by FUJITSU LIMITED *************** *** 186,192 **** Xfree(name); if (fp == (FILE *)NULL) return; ! (void)XimParseStringFile(fp, &im->private.local.top); fclose(fp); } --- 186,192 ---- Xfree(name); if (fp == (FILE *)NULL) return; ! _XimParseStringFile(fp, &im->private.local.top); fclose(fp); } *** ./lib/X11/imLcLkup.c@@/PUBLIC-LATEST Wed Jun 7 22:41:51 1995 --- xc/lib/X11/imLcLkup.c Tue Apr 28 17:30:25 1998 *************** *** 1,4 **** ! /* $XConsortium: imLcLkup.c,v 1.7 95/06/07 22:41:51 kaleb Exp $ */ /****************************************************************** Copyright 1992 by Fuji Xerox Co., Ltd. --- 1,4 ---- ! /* $TOG: imLcLkup.c /main/9 1998/04/28 17:34:55 kaleb $ */ /****************************************************************** Copyright 1992 by Fuji Xerox Co., Ltd. *************** *** 79,86 **** } return (ret); } else { /* Throughed Event */ ! ret = _XimLookupMBText(ic, ev, (unsigned char *)buffer, bytes, keysym, ! NULL); if(ret > 0) { if(keysym && *keysym != NoSymbol) { if(status) *status = XLookupBoth; --- 79,85 ---- } return (ret); } else { /* Throughed Event */ ! ret = _XimLookupMBText(ic, ev, buffer, bytes, keysym, NULL); if(ret > 0) { if(keysym && *keysym != NoSymbol) { if(status) *status = XLookupBoth; *** ./lib/X11/imLcPrs.c@@/PUBLIC-LATEST Wed Nov 20 18:16:07 1996 --- xc/lib/X11/imLcPrs.c Wed Jun 17 12:12:10 1998 *************** *** 1,4 **** ! /* $XConsortium: imLcPrs.c /main/7 1996/11/20 18:13:05 kaleb $ */ /****************************************************************** Copyright 1992 by Oki Technosystems Laboratory, Inc. --- 1,4 ---- ! /* $TOG: imLcPrs.c /main/11 1998/06/17 12:19:31 kaleb $ */ /****************************************************************** Copyright 1992 by Oki Technosystems Laboratory, Inc. *************** *** 30,36 **** ******************************************************************/ - #include #include #include #include --- 30,35 ---- *************** *** 37,42 **** --- 36,43 ---- #include "Xlibint.h" #include "Xlcint.h" #include "Ximint.h" + #include + #include extern int _Xmbstowcs( #if NeedFunctionPrototypes *************** *** 112,119 **** #define KEY 8 #define ERROR 9 - #define MAXSTRLEN 100 - #ifndef isalnum #define isalnum(c) \ (('0' <= (c) && (c) <= '9') || \ --- 113,118 ---- *************** *** 297,307 **** #define SEQUENCE_MAX 10 static int ! parseline(fp, top, tokenbuf, lastch) FILE *fp; DefTree **top; ! char *tokenbuf; ! int *lastch; { int token; unsigned modifier_mask; --- 296,305 ---- #define SEQUENCE_MAX 10 static int ! parseline(fp, top, tokenbuf) FILE *fp; DefTree **top; ! char* tokenbuf; { int token; unsigned modifier_mask; *************** *** 313,318 **** --- 311,317 ---- KeySym rhs_keysym; char *rhs_string_mb; int l; + int lastch = 0; wchar_t local_wc_buf[LOCAL_WC_BUFSIZE], *rhs_string_wc; struct DefBuffer { *************** *** 325,331 **** int i, n; do { ! token = nexttoken(fp, tokenbuf, lastch); } while (token == ENDOFLINE); if (token == ENDOFFILE) { --- 324,330 ---- int i, n; do { ! token = nexttoken(fp, tokenbuf, &lastch); } while (token == ENDOFLINE); if (token == ENDOFFILE) { *************** *** 337,359 **** if ((token == KEY) && (strcmp("None", tokenbuf) == 0)) { modifier = 0; modifier_mask = AllMask; ! token = nexttoken(fp, tokenbuf, lastch); } else { modifier_mask = modifier = 0; exclam = False; if (token == EXCLAM) { exclam = True; ! token = nexttoken(fp, tokenbuf, lastch); } while (token == TILDE || token == KEY) { tilde = False; if (token == TILDE) { ! token = nexttoken(fp, tokenbuf, lastch); tilde = True; if (token != KEY) goto error; } ! token = nexttoken(fp, tokenbuf, lastch); tmp = modmask(tokenbuf); if (!tmp) { goto error; --- 336,358 ---- if ((token == KEY) && (strcmp("None", tokenbuf) == 0)) { modifier = 0; modifier_mask = AllMask; ! token = nexttoken(fp, tokenbuf, &lastch); } else { modifier_mask = modifier = 0; exclam = False; if (token == EXCLAM) { exclam = True; ! token = nexttoken(fp, tokenbuf, &lastch); } while (token == TILDE || token == KEY) { tilde = False; if (token == TILDE) { ! token = nexttoken(fp, tokenbuf, &lastch); tilde = True; if (token != KEY) goto error; } ! token = nexttoken(fp, tokenbuf, &lastch); tmp = modmask(tokenbuf); if (!tmp) { goto error; *************** *** 374,385 **** goto error; } ! token = nexttoken(fp, tokenbuf, lastch); if (token != KEY) { goto error; } ! token = nexttoken(fp, tokenbuf, lastch); if (token != GREATER) { goto error; } --- 373,384 ---- goto error; } ! token = nexttoken(fp, tokenbuf, &lastch); if (token != KEY) { goto error; } ! token = nexttoken(fp, tokenbuf, &lastch); if (token != GREATER) { goto error; } *************** *** 395,409 **** n++; if( n >= SEQUENCE_MAX ) goto error; ! token = nexttoken(fp, tokenbuf, lastch); } while (token != COLON); ! token = nexttoken(fp, tokenbuf, lastch); if (token == STRING) { if( (rhs_string_mb = Xmalloc(strlen(tokenbuf) + 1)) == NULL ) goto error; strcpy(rhs_string_mb, tokenbuf); ! token = nexttoken(fp, tokenbuf, lastch); if (token == KEY) { rhs_keysym = XStringToKeysym(tokenbuf); if (rhs_keysym == NoSymbol) { --- 394,408 ---- n++; if( n >= SEQUENCE_MAX ) goto error; ! token = nexttoken(fp, tokenbuf, &lastch); } while (token != COLON); ! token = nexttoken(fp, tokenbuf, &lastch); if (token == STRING) { if( (rhs_string_mb = Xmalloc(strlen(tokenbuf) + 1)) == NULL ) goto error; strcpy(rhs_string_mb, tokenbuf); ! token = nexttoken(fp, tokenbuf, &lastch); if (token == KEY) { rhs_keysym = XStringToKeysym(tokenbuf); if (rhs_keysym == NoSymbol) { *************** *** 410,416 **** Xfree(rhs_string_mb); goto error; } ! token = nexttoken(fp, tokenbuf, lastch); } if (token != ENDOFLINE && token != ENDOFFILE) { Xfree(rhs_string_mb); --- 409,415 ---- Xfree(rhs_string_mb); goto error; } ! token = nexttoken(fp, tokenbuf, &lastch); } if (token != ENDOFLINE && token != ENDOFFILE) { Xfree(rhs_string_mb); *************** *** 421,427 **** if (rhs_keysym == NoSymbol) { goto error; } ! token = nexttoken(fp, tokenbuf, lastch); if (token != ENDOFLINE && token != ENDOFFILE) { goto error; } --- 420,426 ---- if (rhs_keysym == NoSymbol) { goto error; } ! token = nexttoken(fp, tokenbuf, &lastch); if (token != ENDOFLINE && token != ENDOFFILE) { goto error; } *************** *** 482,503 **** return(n); error: while (token != ENDOFLINE && token != ENDOFFILE) { ! token = nexttoken(fp, tokenbuf, lastch); } return(0); } ! int ! XimParseStringFile(fp, ptop) FILE *fp; DefTree **ptop; { ! int max_ev_seq = 0, i; ! char tokenbuf[MAXSTRLEN]; ! int lastch = 0; ! while ((i = parseline(fp, ptop, tokenbuf, &lastch)) >= 0) { ! if (i > max_ev_seq) max_ev_seq = i; } - return (max_ev_seq); } --- 481,508 ---- return(n); error: while (token != ENDOFLINE && token != ENDOFFILE) { ! token = nexttoken(fp, tokenbuf, &lastch); } return(0); } ! void ! _XimParseStringFile(fp, ptop) FILE *fp; DefTree **ptop; { ! char tb[65535]; ! char* tbp; ! struct stat st; ! if (fstat (fileno (fp), &st) != -1) { ! unsigned long size = (unsigned long) st.st_size; ! if (size < sizeof tb) tbp = tb; ! else tbp = malloc (size); ! ! if (tbp != NULL) { ! while (parseline(fp, ptop, tbp) >= 0) {} ! if (tbp != tb) free (tbp); ! } } } *** ./lib/X11/imRm.c@@/PUBLIC-LATEST Wed Dec 24 13:07:33 1997 --- xc/lib/X11/imRm.c Mon Jun 1 09:48:15 1998 *************** *** 1,4 **** ! /* $TOG: imRm.c /main/12 1997/12/24 13:09:32 kaleb $ */ /****************************************************************** Copyright 1990, 1991, 1992,1993, 1994 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: imRm.c /main/14 1998/06/01 09:55:01 kaleb $ */ /****************************************************************** Copyright 1990, 1991, 1992,1993, 1994 by FUJITSU LIMITED *************** *** 38,50 **** #include "Ximint.h" #include "Xresource.h" - #ifndef isalnum - #define isalnum(c) \ - (('0' <= (c) && (c) <= '9') || \ - ('A' <= (c) && (c) <= 'Z') || \ - ('a' <= (c) && (c) <= 'z')) - #endif - typedef struct _XimValueOffsetInfo { char *name; XrmQuark quark; --- 38,43 ---- *************** *** 66,93 **** ); } XimValueOffsetInfoRec, *XimValueOffsetInfo; - void - _XimGetResourceName(im, res_name, res_class) - Xim im; - char *res_name; - char *res_class; - { - if(im->core.res_name == NULL) { - strcpy(res_name, "*"); - } else { - strcpy(res_name, im->core.res_name); - strcat(res_name, "."); - } - if(im->core.res_class == NULL) { - strcpy(res_class, "*"); - } else { - strcpy(res_class, im->core.res_class); - strcat(res_class, "."); - } - strcat(res_name, "xim."); - strcat(res_class, "Xim."); - } - #ifdef XIM_CONNECTABLE Private Bool _XimCheckBool(str) --- 59,64 ---- *************** *** 104,126 **** _XimSetProtoResource(im) Xim im; { ! char xim_res_name[256]; ! char xim_res_class[256]; ! char res_name[256]; ! char res_class[256]; ! char *str_type; ! XrmValue value; ! XIMStyle preedit_style = 0; ! XIMStyle status_style = 0; ! XIMStyles *imstyles; if (!im->core.rdb) return; ! _XimGetResourceName(im, xim_res_name, xim_res_class); ! sprintf(res_name, "%s%s", xim_res_name, "useAuth"); ! sprintf(res_class, "%s%s", xim_res_class, "UseAuth"); bzero(&value, sizeof(XrmValue)); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(_XimCheckBool(value.addr)) { --- 75,111 ---- _XimSetProtoResource(im) Xim im; { ! char res_name_buf[256]; ! char* res_name; ! char res_class_buf[256]; ! char* res_class; ! char* str_type; ! XrmValue value; ! XIMStyle preedit_style = 0; ! XIMStyle status_style = 0; ! XIMStyles* imstyles; ! char* dotximdot = ".xim."; ! char* ximdot = "xim."; ! char* dotXimdot = ".Xim."; ! char* Ximdot = "Xim."; if (!im->core.rdb) return; ! if (strlen (im->core.res_name) < 200) res_name = res_name_buf; ! else res_name = Xmalloc (strlen (im->core.res_name) + 50); ! if (strlen (im->core.res_class) < 200) res_class = res_class_buf; ! else res_class = Xmalloc (strlen (im->core.res_class) + 50); ! /* pretend malloc always works */ ! (void) sprintf (res_name, "%s%s%s", ! im->core.res_name != NULL ? im->core.res_name : "*", ! im->core.res_name != NULL ? dotximdot : ximdot, ! "useAuth"); ! (void) sprintf (res_class, "%s%s%s", ! im->core.res_class != NULL ? im->core.res_class : "*", ! im->core.res_class != NULL ? dotXimdot : Ximdot, ! "UseAuth"); bzero(&value, sizeof(XrmValue)); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(_XimCheckBool(value.addr)) { *************** *** 128,135 **** } } ! sprintf(res_name, "%s%s", xim_res_name, "delaybinding"); ! sprintf(res_class, "%s%s", xim_res_class, "Delaybinding"); bzero(&value, sizeof(XrmValue)); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(_XimCheckBool(value.addr)) { --- 113,126 ---- } } ! (void) sprintf (res_name, "%s%s%s", ! im->core.res_name != NULL ? im->core.res_name : "*", ! im->core.res_name != NULL ? dotximdot : ximdot, ! "delaybinding"); ! (void) sprintf (res_class, "%s%s%s", ! im->core.res_class != NULL ? im->core.res_class : "*", ! im->core.res_class != NULL ? dotXimdot : Ximdot, ! "Delaybinding"); bzero(&value, sizeof(XrmValue)); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(_XimCheckBool(value.addr)) { *************** *** 137,144 **** } } ! sprintf(res_name, "%s%s", xim_res_name, "reconnect"); ! sprintf(res_class, "%s%s", xim_res_class, "Reconnect"); bzero(&value, sizeof(XrmValue)); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(_XimCheckBool(value.addr)) { --- 128,141 ---- } } ! (void) sprintf (res_name, "%s%s%s", ! im->core.res_name != NULL ? im->core.res_name : "*", ! im->core.res_name != NULL ? dotximdot : ximdot, ! "reconnect"); ! (void) sprintf (res_class, "%s%s%s", ! im->core.res_class != NULL ? im->core.res_class : "*", ! im->core.res_class != NULL ? dotXimdot : Ximdot, ! "Reconnect"); bzero(&value, sizeof(XrmValue)); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(_XimCheckBool(value.addr)) { *************** *** 146,156 **** } } ! if(!IS_CONNECTABLE(im)) return; ! sprintf(res_name, "%s%s", xim_res_name, "preeditDefaultStyle"); ! sprintf(res_class, "%s%s", xim_res_class, "PreeditDefaultStyle"); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(!strcmp(value.addr, "XIMPreeditArea")) preedit_style = XIMPreeditArea; --- 143,162 ---- } } ! if(!IS_CONNECTABLE(im)) { ! if (res_name != res_name_buf) Xfree (res_name); ! if (res_class != res_class_buf) Xfree (res_class); return; + } ! (void) sprintf (res_name, "%s%s%s", ! im->core.res_name != NULL ? im->core.res_name : "*", ! im->core.res_name != NULL ? dotximdot : ximdot, ! "preeditDefaultStyle"); ! (void) sprintf (res_class, "%s%s%s", ! im->core.res_class != NULL ? im->core.res_class : "*", ! im->core.res_class != NULL ? dotXimdot : Ximdot, ! "PreeditDefaultStyle"); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(!strcmp(value.addr, "XIMPreeditArea")) preedit_style = XIMPreeditArea; *************** *** 166,173 **** if(!preedit_style) preedit_style = XIMPreeditNothing; ! sprintf(res_name, "%s%s", xim_res_name, "statusDefaultStyle"); ! sprintf(res_class, "%s%s", xim_res_class, "StatusDefaultStyle"); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(!strcmp(value.addr, "XIMStatusArea")) status_style = XIMStatusArea; --- 172,185 ---- if(!preedit_style) preedit_style = XIMPreeditNothing; ! (void) sprintf (res_name, "%s%s%s", ! im->core.res_name != NULL ? im->core.res_name : "*", ! im->core.res_name != NULL ? dotximdot : ximdot, ! "statusDefaultStyle"); ! (void) sprintf (res_class, "%s%s%s", ! im->core.res_class != NULL ? im->core.res_class : "*", ! im->core.res_class != NULL ? dotXimdot : Ximdot, ! "StatusDefaultStyle"); if(XrmGetResource(im->core.rdb, res_name, res_class, &str_type, &value)) { if(!strcmp(value.addr, "XIMStatusArea")) status_style = XIMStatusArea; *************** *** 181,193 **** if(!status_style) status_style = XIMStatusNothing; ! if(!(imstyles = (XIMStyles *)Xmalloc(sizeof(XIMStyles) + sizeof(XIMStyle)))) return; imstyles->count_styles = 1; imstyles->supported_styles = (XIMStyle *)((char *)imstyles + sizeof(XIMStyles)); imstyles->supported_styles[0] = preedit_style | status_style; im->private.proto.default_styles = imstyles; } #endif /* XIM_CONNECTABLE */ --- 193,210 ---- if(!status_style) status_style = XIMStatusNothing; ! if(!(imstyles = (XIMStyles *)Xmalloc(sizeof(XIMStyles) + sizeof(XIMStyle)))){ ! if (res_name != res_name_buf) Xfree (res_name); ! if (res_class != res_class_buf) Xfree (res_class); return; + } imstyles->count_styles = 1; imstyles->supported_styles = (XIMStyle *)((char *)imstyles + sizeof(XIMStyles)); imstyles->supported_styles[0] = preedit_style | status_style; im->private.proto.default_styles = imstyles; + if (res_name != res_name_buf) Xfree (res_name); + if (res_class != res_class_buf) Xfree (res_class); } #endif /* XIM_CONNECTABLE */ *************** *** 399,420 **** { Xic ic = (Xic)parm; Xim im = (Xim)ic->core.im; - int len; - char *name; char **out; if(im->core.res_name == (char *)NULL) { return True; } - len = strlen(im->core.res_name); - if(!(name = (char *)Xmalloc(len + 1))) { - return False; - } - (void)strcpy(name, im->core.res_name); - name[len] = '\0'; out = (char **)((char *)top + info->offset); ! *out = name; return True; } --- 416,429 ---- { Xic ic = (Xic)parm; Xim im = (Xim)ic->core.im; char **out; if(im->core.res_name == (char *)NULL) { return True; } out = (char **)((char *)top + info->offset); ! *out = im->core.res_name; return True; } *************** *** 427,448 **** { Xic ic = (Xic)parm; Xim im = (Xim)ic->core.im; - int len; - char *class; char **out; if(im->core.res_class == (char *)NULL) { return True; } - len = strlen(im->core.res_class); - if(!(class = (char *)Xmalloc(len + 1))) { - return False; - } - (void)strcpy(class, im->core.res_class); - class[len] = '\0'; out = (char **)((char *)top + info->offset); ! *out = class; return True; } --- 436,449 ---- { Xic ic = (Xic)parm; Xim im = (Xim)ic->core.im; char **out; if(im->core.res_class == (char *)NULL) { return True; } out = (char **)((char *)top + info->offset); ! *out = im->core.res_class; return True; } *** ./lib/X11/jump_funcs@@/PUBLIC-LATEST Fri Jan 27 22:17:51 1995 --- xc/lib/X11/jump_funcs Wed Jun 17 15:27:39 1998 *************** *** 1,4 **** ! # $XConsortium: jump_funcs,v 1.7 95/01/27 22:17:51 kaleb Exp $ # $XFree86: xc/lib/X11/jump_funcs,v 3.3 1995/01/14 10:41:20 dawes Exp $ # 00000000 T _XSaveContext libX11 Context --- 1,4 ---- ! # $TOG: jump_funcs /main/8 1998/06/17 15:34:53 kaleb $ # $XFree86: xc/lib/X11/jump_funcs,v 3.3 1995/01/14 10:41:20 dawes Exp $ # 00000000 T _XSaveContext libX11 Context *************** *** 797,803 **** 00000000 T __XimLocalOpenIM libX11 imLcIm 00000000 T __XimLocalMbLookupString libX11 imLcLkup 00000000 T __XimLocalWcLookupString libX11 imLcLkup ! 00000000 T _XimParseStringFile libX11 imLcPrs 00000000 T __XimSetICValueData libX11 imLcSIc 00000000 T __XimLocalSetICValues libX11 imLcSIc 00000000 T __XimSetIMResourceList libX11 imRm --- 797,803 ---- 00000000 T __XimLocalOpenIM libX11 imLcIm 00000000 T __XimLocalMbLookupString libX11 imLcLkup 00000000 T __XimLocalWcLookupString libX11 imLcLkup ! 00000000 T __XimParseStringFile libX11 imLcPrs 00000000 T __XimSetICValueData libX11 imLcSIc 00000000 T __XimLocalSetICValues libX11 imLcSIc 00000000 T __XimSetIMResourceList libX11 imRm *** ./lib/X11/lcCT.c@@/PUBLIC-LATEST Tue Feb 11 17:50:39 1997 --- xc/lib/X11/lcCT.c Thu Jun 18 13:09:13 1998 *************** *** 1,4 **** ! /* $TOG: lcCT.c /main/11 1997/02/11 17:48:39 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: lcCT.c /main/17 1998/06/18 13:17:06 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 71,76 **** --- 71,77 ---- { "ISO8859-8:GR", "\033-H" }, { "ISO8859-5:GR", "\033-L" }, { "ISO8859-9:GR", "\033-M" }, + { "ISO8859-10:GR", "\033-V" }, { "JISX0201.1976-0:GL", "\033(J" }, { "JISX0201.1976-0:GR", "\033)I" }, *************** *** 87,97 **** { "CNS11643.1986-1:GR", "\033$)G" }, { "CNS11643.1986-2:GL", "\033$(H" }, { "CNS11643.1986-2:GR", "\033$)H" }, - - /* Non-Standard Character Set Encodings */ - { "TIS620.2533-1:GR", "\033-T"}, #endif { "KOI8-R:GR", "\033%/1\200\210koi8-r\002"}, } ; #define XctC0 0x0000 --- 88,99 ---- { "CNS11643.1986-1:GR", "\033$)G" }, { "CNS11643.1986-2:GL", "\033$(H" }, { "CNS11643.1986-2:GR", "\033$)H" }, #endif + { "TIS620.2533-1:GR", "\033-T"}, + { "ISO10646-1", "\033%B"}, + /* Non-Standard Character Set Encodings */ { "KOI8-R:GR", "\033%/1\200\210koi8-r\002"}, + { "FCD8859-15:GR", "\033%/1\200\213fcd8859-15\002"}, } ; #define XctC0 0x0000 *************** *** 395,401 **** XlcCharSet charset; { CTParseRec parse; ! char *ptr, buf[BUFSIZ]; int length; if (charset->ct_sequence == NULL) --- 397,403 ---- XlcCharSet charset; { CTParseRec parse; ! char *ptr, *bufp, buf[BUFSIZ]; int length; if (charset->ct_sequence == NULL) *************** *** 409,418 **** if (charset->name) { charset->xrm_name = XrmStringToQuark(charset->name); ! strcpy(buf, charset->name); ! if (ptr = strchr(buf, ':')) *ptr = '\0'; ! charset->xrm_encoding_name = XrmStringToQuark(buf); charset->encoding_name = XrmQuarkToString(charset->xrm_encoding_name); } else { charset->xrm_name = 0; --- 411,425 ---- if (charset->name) { charset->xrm_name = XrmStringToQuark(charset->name); ! if ((length = strlen (charset->name)) < sizeof buf) bufp = buf; ! else bufp = Xmalloc (length + 1); ! ! if (bufp == NULL) return False; ! strcpy(bufp, charset->name); ! if (ptr = strchr(bufp, ':')) *ptr = '\0'; ! charset->xrm_encoding_name = XrmStringToQuark(bufp); ! if (bufp != buf) Xfree (bufp); charset->encoding_name = XrmQuarkToString(charset->xrm_encoding_name); } else { charset->xrm_name = 0; *** ./lib/X11/lcDB.c@@/PUBLIC-LATEST Wed Aug 27 12:13:25 1997 --- xc/lib/X11/lcDB.c Fri Jun 26 14:29:31 1998 *************** *** 1,4 **** ! /* $TOG: lcDB.c /main/13 1997/08/27 12:12:53 kaleb $ */ /* * * Copyright IBM Corporation 1993 --- 1,4 ---- ! /* $TOG: lcDB.c /main/16 1998/06/26 14:37:14 kaleb $ */ /* * * Copyright IBM Corporation 1993 *************** *** 329,335 **** if(cur + len + 1 > line->maxsize){ /* need to reallocate buffer. */ if(! realloc_line(line, line->maxsize + BUFSIZE)){ ! goto err; /* realloc error. */ } str = line->str; } --- 329,335 ---- if(cur + len + 1 > line->maxsize){ /* need to reallocate buffer. */ if(! realloc_line(line, line->maxsize + BUFSIZE)){ ! return -1; /* realloc error. */ } str = line->str; } *************** *** 351,362 **** } if(quoted){ /* error. still in quoted state. */ ! goto err; } return line->cursize = cur; - - err:; - return -1; } /************************************************************************/ --- 351,359 ---- } if(quoted){ /* error. still in quoted state. */ ! return -1; } return line->cursize = cur; } /************************************************************************/ *************** *** 511,517 **** parse_info.bufsize = 0; return 1; ! err:; if(value_list){ Xfree((char **)value_list); } --- 508,514 ---- parse_info.bufsize = 0; return 1; ! err: if(value_list){ Xfree((char **)value_list); } *************** *** 597,603 **** return 1; ! err:; if(new){ if(new->category){ Xfree(new->category); --- 594,600 ---- return 1; ! err: if(new){ if(new->category){ Xfree(new->category); *************** *** 658,677 **** case S_CATEGORY: break; case S_NAME: ! goto err; /* no value */ case S_VALUE: ! if(!store_to_database(db)){ ! goto err; ! } parse_info.pre_state = S_CATEGORY; break; default: ! goto err; } return token_tbl[token].len; - - err:; - return 0; } static int --- 655,670 ---- case S_CATEGORY: break; case S_NAME: ! return 0; /* no value */ case S_VALUE: ! if(!store_to_database(db)) ! return 0; parse_info.pre_state = S_CATEGORY; break; default: ! return 0; } return token_tbl[token].len; } static int *************** *** 715,734 **** case S_NULL: case S_CATEGORY: case S_NAME: ! goto err; case S_VALUE: ! if(! append_value_list()){ ! goto err; ! } parse_info.pre_state = S_VALUE; break; default: ! goto err; } return token_tbl[token].len; - - err:; - return 0; } static int --- 708,723 ---- case S_NULL: case S_CATEGORY: case S_NAME: ! return 0; case S_VALUE: ! if(! append_value_list()) ! return 0; parse_info.pre_state = S_VALUE; break; default: ! return 0; } return token_tbl[token].len; } static int *************** *** 740,762 **** switch(parse_info.pre_state){ case S_NULL: case S_CATEGORY: ! goto err; case S_NAME: if(parse_info.name[parse_info.nest_depth] == NULL || ! parse_info.nest_depth + 1 > MAX_NAME_NEST){ ! goto err; ! } ++parse_info.nest_depth; parse_info.pre_state = S_CATEGORY; break; - case S_VALUE: default: ! goto err; } return token_tbl[token].len; - - err: - return 0; } static int --- 729,747 ---- switch(parse_info.pre_state){ case S_NULL: case S_CATEGORY: ! case S_VALUE: ! return 0; case S_NAME: if(parse_info.name[parse_info.nest_depth] == NULL || ! parse_info.nest_depth + 1 > MAX_NAME_NEST) ! return 0; ++parse_info.nest_depth; parse_info.pre_state = S_CATEGORY; break; default: ! return 0; } return token_tbl[token].len; } static int *************** *** 765,782 **** Token token; Database *db; { ! if(parse_info.nest_depth < 1){ ! goto err; ! } switch(parse_info.pre_state){ case S_NULL: case S_NAME: ! goto err; case S_VALUE: ! if(! store_to_database(db)){ ! goto err; ! } /* fall into next case */ case S_CATEGORY: if(parse_info.name[parse_info.nest_depth] != NULL){ --- 750,765 ---- Token token; Database *db; { ! if(parse_info.nest_depth < 1) ! return 0; switch(parse_info.pre_state){ case S_NULL: case S_NAME: ! return 0; case S_VALUE: ! if(! store_to_database(db)) ! return 0; /* fall into next case */ case S_CATEGORY: if(parse_info.name[parse_info.nest_depth] != NULL){ *************** *** 787,798 **** parse_info.pre_state = S_CATEGORY; break; default: ! goto err; } return token_tbl[token].len; - - err:; - return 0; } static int --- 770,778 ---- parse_info.pre_state = S_CATEGORY; break; default: ! return 0; } return token_tbl[token].len; } static int *************** *** 802,809 **** Database *db; { char word[BUFSIZE]; ! int len = 0; switch(parse_info.pre_state){ case S_NULL: case S_CATEGORY: --- 782,798 ---- Database *db; { char word[BUFSIZE]; ! char* wordp; ! int len; + if ((len = strlen (str)) < sizeof word) + wordp = word; + else + wordp = Xmalloc (len + 1); + if (wordp == NULL) + return 0; + + len = 0; switch(parse_info.pre_state){ case S_NULL: case S_CATEGORY: *************** *** 810,835 **** goto err; case S_NAME: case S_VALUE: ! len = get_quoted_word(str, word); ! if(len < 1){ goto err; ! } ! if( (parse_info.bufsize + (int)strlen(word) +1) >= parse_info.bufMaxSize){ ! if(realloc_parse_info(strlen(word) +1) == False){ goto err; } } ! strcpy(&parse_info.buf[parse_info.bufsize], word); ! parse_info.bufsize += strlen(word); parse_info.pre_state = S_VALUE; break; default: goto err; } return len; /* including length of token */ ! err:; return 0; } --- 799,825 ---- goto err; case S_NAME: case S_VALUE: ! len = get_quoted_word(str, wordp); ! if(len < 1) goto err; ! if( (parse_info.bufsize + (int)strlen(wordp) +1) >= parse_info.bufMaxSize){ ! if(realloc_parse_info(strlen(wordp) +1) == False){ goto err; } } ! strcpy(&parse_info.buf[parse_info.bufsize], wordp); ! parse_info.bufsize += strlen(wordp); parse_info.pre_state = S_VALUE; break; default: goto err; } + if (wordp != word) Xfree (wordp); return len; /* including length of token */ ! err: ! if (wordp != word) Xfree (wordp); return 0; } *************** *** 849,857 **** --- 839,855 ---- Database *db; { char word[BUFSIZE], *p; + char* wordp; int len; int token_len; + if ((len = strlen (str)) < sizeof word) + wordp = word; + else + wordp = Xmalloc (len + 1); + if (wordp == NULL) + return 0; + switch(parse_info.pre_state){ case S_NULL: case S_CATEGORY: *************** *** 860,886 **** case S_VALUE: token_len = token_tbl[token].len; p = str + token_len; ! len = get_word(p, word); ! if(len < 1){ goto err; ! } ! if( (parse_info.bufsize + token_len + (int)strlen(word) +1) >= parse_info.bufMaxSize){ ! if(realloc_parse_info(token_len + strlen(word) +1) == False){ goto err; - } } strncpy(&parse_info.buf[parse_info.bufsize], str, token_len); ! strcpy(&parse_info.buf[parse_info.bufsize + token_len], word); ! parse_info.bufsize += token_len + strlen(word); parse_info.pre_state = S_VALUE; break; default: goto err; } return len + token_len; ! err:; return 0; } --- 858,884 ---- case S_VALUE: token_len = token_tbl[token].len; p = str + token_len; ! len = get_word(p, wordp); ! if(len < 1) goto err; ! if( (parse_info.bufsize + token_len + (int)strlen(wordp) +1) >= parse_info.bufMaxSize){ ! if(realloc_parse_info(token_len + strlen(wordp) +1) == False) goto err; } strncpy(&parse_info.buf[parse_info.bufsize], str, token_len); ! strcpy(&parse_info.buf[parse_info.bufsize + token_len], wordp); ! parse_info.bufsize += token_len + strlen(wordp); parse_info.pre_state = S_VALUE; break; default: goto err; } + if (wordp != word) Xfree (wordp); return len + token_len; ! err: ! if (wordp != word) Xfree (wordp); return 0; } *************** *** 891,913 **** Database *db; { char word[BUFSIZE], *p; int len; ! len = get_word(str, word); ! if(len < 1){ goto err; - } switch(parse_info.pre_state){ case S_NULL: ! if(parse_info.category != NULL){ goto err; ! } ! p = (char *)Xmalloc(strlen(word) + 1); ! if(p == NULL){ goto err; ! } ! strcpy(p, word); parse_info.category = p; parse_info.pre_state = S_CATEGORY; break; --- 889,916 ---- Database *db; { char word[BUFSIZE], *p; + char* wordp; int len; ! if ((len = strlen (str)) < sizeof word) ! wordp = word; ! else ! wordp = Xmalloc (len + 1); ! if (wordp == NULL) ! return 0; ! ! len = get_word(str, wordp); ! if(len < 1) goto err; switch(parse_info.pre_state){ case S_NULL: ! if(parse_info.category != NULL) goto err; ! p = (char *)Xmalloc(strlen(wordp) + 1); ! if(p == NULL) goto err; ! strcpy(p, wordp); parse_info.category = p; parse_info.pre_state = S_CATEGORY; break; *************** *** 921,931 **** break; } } ! p = (char *)Xmalloc(strlen(word) + 1); ! if(p == NULL){ goto err; ! } ! strcpy(p, word); if(parse_info.name[parse_info.nest_depth] != NULL){ Xfree(parse_info.name[parse_info.nest_depth]); } --- 924,933 ---- break; } } ! p = (char *)Xmalloc(strlen(wordp) + 1); ! if(p == NULL) goto err; ! strcpy(p, wordp); if(parse_info.name[parse_info.nest_depth] != NULL){ Xfree(parse_info.name[parse_info.nest_depth]); } *************** *** 934,955 **** break; case S_NAME: case S_VALUE: ! if( (parse_info.bufsize + (int)strlen(word) +1 ) >= parse_info.bufMaxSize){ ! if(realloc_parse_info(strlen(word) +1) == False){ goto err; - } } ! strcpy(&parse_info.buf[parse_info.bufsize], word); ! parse_info.bufsize += strlen(word); parse_info.pre_state = S_VALUE; break; default: goto err; } return len; ! err:; return 0; } --- 936,958 ---- break; case S_NAME: case S_VALUE: ! if( (parse_info.bufsize + (int)strlen(wordp) +1 ) >= parse_info.bufMaxSize){ ! if(realloc_parse_info(strlen(wordp) +1) == False) goto err; } ! strcpy(&parse_info.buf[parse_info.bufsize], wordp); ! parse_info.bufsize += strlen(wordp); parse_info.pre_state = S_VALUE; break; default: goto err; } + if (wordp != word) Xfree (wordp); return len; ! err: ! if (wordp != word) Xfree (wordp); return 0; } *** ./lib/X11/lcEuc.c@@/PUBLIC-LATEST Thu Nov 13 18:50:57 1997 --- xc/lib/X11/lcEuc.c Thu Apr 30 10:57:35 1998 *************** *** 1,4 **** ! /* $TOG: lcEuc.c /main/16 1997/11/13 18:54:22 kaleb $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: lcEuc.c /main/21 1998/04/30 11:02:13 kaleb $ */ /****************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED *************** *** 31,36 **** --- 31,38 ---- *****************************************************************/ + #ifdef X_LOCALE + #include "Xlibint.h" #include "XlcGeneric.h" *************** *** 1497,1499 **** --- 1499,1505 ---- return lcd; } + + #else + typedef int dummy; + #endif /* X_LOCALE */ *** ./lib/X11/lcFile.c@@/PUBLIC-LATEST Thu Nov 13 17:29:27 1997 --- xc/lib/X11/lcFile.c Thu May 28 14:15:17 1998 *************** *** 1,4 **** ! /* $TOG: lcFile.c /main/11 1997/11/13 17:32:51 kaleb $ */ /* * * Copyright IBM Corporation 1993 --- 1,4 ---- ! /* $TOG: lcFile.c /main/13 1998/05/28 14:21:35 kaleb $ */ /* * * Copyright IBM Corporation 1993 *************** *** 86,92 **** break; } argv[argc++] = p; ! while(! isspace(*p) && *p != '\0'){ ++p; } if(*p == '\0'){ --- 86,92 ---- break; } argv[argc++] = p; ! while(*p != ':' && *p != '\n' && *p != '\0'){ ++p; } if(*p == '\0'){ *************** *** 108,116 **** --- 108,118 ---- char *p = path; int i, n; + #if 0 while((p = strchr(p, ':')) != NULL){ *p = ' '; /* place space on delimter */ } + #endif n = parse_line(path, argv, argsize); if(n == 0){ return 0; *** ./lib/X11/lcGeneric.c@@/PUBLIC-LATEST Thu Jul 17 21:48:39 1997 --- xc/lib/X11/lcGeneric.c Thu Jun 25 16:01:47 1998 *************** *** 1,4 **** ! /* $TOG: lcGeneric.c /main/11 1997/07/17 21:48:57 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: lcGeneric.c /main/12 1998/06/25 16:09:44 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 300,306 **** char *str; FontScope scp; { ! char buff[256],*next; unsigned long start=0,end=0,dest=0,shift=0,direction=0; sscanf(str,"[\\x%lx,\\x%lx]->\\x%lx", &start, &end,&dest); if( dest ){ --- 300,306 ---- char *str; FontScope scp; { ! char* next; unsigned long start=0,end=0,dest=0,shift=0,direction=0; sscanf(str,"[\\x%lx,\\x%lx]->\\x%lx", &start, &end,&dest); if( dest ){ *************** *** 430,436 **** _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num); _XlcDbg_printValue(name,value,num); if (num > 0) { ! strcpy(cset_name,value[0]); sprintf(name, "%s.%s", csd , "side"); _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num); if (num > 0) { --- 430,438 ---- _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num); _XlcDbg_printValue(name,value,num); if (num > 0) { ! /* hackers will get truncated -- C'est la vie */ ! strncpy(cset_name,value[0], sizeof cset_name - 1); ! cset_name[sizeof cset_name] = '\0'; sprintf(name, "%s.%s", csd , "side"); _XlcGetResource(lcd, "XLC_CHARSET_DEFINE", name, &value, &num); if (num > 0) { *************** *** 657,664 **** int num; { ExtdSegment ret; ! char side_str[128],*ptr; ! char cset_name[128],*tmp; int i,new; FontScope scope; ret = (ExtdSegment)Xmalloc(sizeof(ExtdSegmentRec)); --- 659,666 ---- int num; { ExtdSegment ret; ! char* ptr; ! char* cset_name = NULL; int i,new; FontScope scope; ret = (ExtdSegment)Xmalloc(sizeof(ExtdSegmentRec)); *************** *** 668,679 **** if(strchr(value[0],':')){ ret->name = (char *)Xmalloc(strlen(value[0])+1); if(ret->name == NULL){ ! return NULL; /* XXX ick, without freeing ret */ } strcpy(ret->name,value[0]); ptr = strchr(ret->name,':'); *ptr = '\0'; ptr++; if( !_XlcNCompareISOLatin1(ptr, "none", 4) ){ ret->side = XlcNONE ; sprintf(cset_name,"%s:%s",ret->name,"none"); --- 670,688 ---- if(strchr(value[0],':')){ ret->name = (char *)Xmalloc(strlen(value[0])+1); if(ret->name == NULL){ ! Xfree (ret); ! return NULL; } strcpy(ret->name,value[0]); ptr = strchr(ret->name,':'); *ptr = '\0'; ptr++; + cset_name = (char*) Xmalloc (strlen (ret->name) + 6); + if (cset_name == NULL) { + Xfree (ret->name); + Xfree (ret); + return NULL; + } if( !_XlcNCompareISOLatin1(ptr, "none", 4) ){ ret->side = XlcNONE ; sprintf(cset_name,"%s:%s",ret->name,"none"); *************** *** 688,700 **** } else { ret->name = (char *)Xmalloc(strlen(value[0])+1); if(ret->name == NULL){ ! return NULL; /* XXX ick, without freeing ret */ } strcpy(ret->name,value[0]); } ret->area = (FontScope)Xmalloc((num - 1)*sizeof(FontScopeRec)); if(ret->area == NULL){ ! return NULL; /* XXX ick, without freeing ret */ } ret->area_num = num - 1; scope = ret->area ; --- 697,712 ---- } else { ret->name = (char *)Xmalloc(strlen(value[0])+1); if(ret->name == NULL){ ! Xfree (ret); ! return NULL; } strcpy(ret->name,value[0]); } ret->area = (FontScope)Xmalloc((num - 1)*sizeof(FontScopeRec)); if(ret->area == NULL){ ! Xfree (ret->name); ! Xfree (ret); ! return NULL; } ret->area_num = num - 1; scope = ret->area ; *************** *** 703,717 **** &scope[i-1].start,&scope[i-1].end); } ret->charset = srch_charset_define(cset_name,&new); ! if(new){ ! tmp = (char *)Xmalloc(strlen(cset_name)+1); ! if(tmp == NULL){ ! return NULL; /* XXX ick, without freeing ret */ ! } ! strcpy(tmp,cset_name); ! ret->charset->name = tmp; ! } ! return(ret); } /* For VW/UDC end */ --- 715,726 ---- &scope[i-1].start,&scope[i-1].end); } ret->charset = srch_charset_define(cset_name,&new); ! if (new) ! ret->charset->name = cset_name; ! else ! Xfree (cset_name); ! ! return ret; } /* For VW/UDC end */ *************** *** 831,837 **** break; } } ! if (string_to_encoding(tmp, encoding) == False) goto err; add_parse_list(gen, type, encoding, codeset); } --- 840,847 ---- break; } } ! if (strlen (tmp) > sizeof encoding || ! string_to_encoding(tmp, encoding) == False) goto err; add_parse_list(gen, type, encoding, codeset); } *************** *** 858,863 **** --- 868,875 ---- if (codeset == NULL && (codeset = add_codeset(gen)) == NULL) goto err; for ( ; num-- > 0; value++) { + if (strlen (*value) > sizeof name) + goto err; string_to_encoding(*value, name); charset = NULL; if ((encoding = strchr(name, ':')) && *************** *** 913,919 **** (codeset->byteM)[M-1].byteinfo = (ByteInfo)Xmalloc( num * sizeof(ByteInfoRec)); for(ii = 0 ; ii < num ; ii++){ - char tmp[128]; tmpb = (codeset->byteM)[M-1].byteinfo ; /* default 0x00 - 0xff */ sscanf(value[ii],"\\x%lx,\\x%lx",&start,&end); --- 925,930 ---- *** ./lib/X11/lcJis.c@@/PUBLIC-LATEST Thu Nov 13 18:51:16 1997 --- xc/lib/X11/lcJis.c Thu Apr 30 10:57:46 1998 *************** *** 1,4 **** ! /* $TOG: lcJis.c /main/3 1997/11/13 18:54:40 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: lcJis.c /main/8 1998/04/30 11:02:21 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 24,29 **** --- 24,31 ---- * mopi@osa.ilab.toshiba.co.jp */ + #ifdef X_LOCALE + #include "Xlibint.h" #include "XlcGeneric.h" #include *************** *** 307,313 **** } static CodeSet ! _XlcGetCodeSetFromCharSet(lcd, charset) XLCd lcd; XlcCharSet charset; { --- 309,315 ---- } static CodeSet ! GetCodeSetFromCharSet(lcd, charset) XLCd lcd; XlcCharSet charset; { *************** *** 360,366 **** charset = (XlcCharSet) args[0]; ! codeset = _XlcGetCodeSetFromCharSet(state->lcd, charset); if (codeset == NULL) return -1; --- 362,368 ---- charset = (XlcCharSet) args[0]; ! codeset = GetCodeSetFromCharSet(state->lcd, charset); if (codeset == NULL) return -1; *************** *** 462,468 **** if (num_args < 1) return -1; ! codeset = _XlcGetCodeSetFromCharSet(lcd, (XlcCharSet) args[0]); if (codeset == NULL) return -1; --- 464,470 ---- if (num_args < 1) return -1; ! codeset = GetCodeSetFromCharSet(lcd, (XlcCharSet) args[0]); if (codeset == NULL) return -1; *************** *** 917,919 **** --- 919,925 ---- return lcd; } + + #else + typedef int dummy; + #endif /* X_LOCALE */ *** ./lib/X11/lcPublic.c@@/PUBLIC-LATEST Thu Nov 13 09:40:19 1997 --- xc/lib/X11/lcPublic.c Mon Jun 1 16:09:05 1998 *************** *** 1,4 **** ! /* $TOG: lcPublic.c /main/9 1997/11/13 09:43:43 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: lcPublic.c /main/11 1998/06/01 16:15:27 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 190,196 **** XLCdPublicPart *pub = XLC_PUBLIC_PART(lcd); char *name; #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! char siname[256]; char *_XlcMapOSLocaleName(); #endif --- 190,198 ---- XLCdPublicPart *pub = XLC_PUBLIC_PART(lcd); char *name; #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! int len; ! char sinamebuf[256]; ! char* siname; char *_XlcMapOSLocaleName(); #endif *************** *** 201,211 **** name = lcd->core->name; #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) name = _XlcMapOSLocaleName(name, siname); #endif ! ! if (_XlcResolveLocaleName(name, pub) == 0) return False; if (pub->default_string == NULL) pub->default_string = ""; --- 203,227 ---- name = lcd->core->name; #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) + /* + * _XlMapOSLOcaleName will return the same string or a substring + * of name, so strlen(name) is okay + */ + if ((len = strlen(name)) < sizeof sinamebuf) siname = sinamebuf; + else siname = Xmalloc (len + 1); + if (siname == NULL) return False; name = _XlcMapOSLocaleName(name, siname); #endif ! /* _XlcResolveLocaleName will lookup the SI's name for the locale */ ! if (_XlcResolveLocaleName(name, pub) == 0) { ! #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! if (siname != sinamebuf) Xfree (siname); ! #endif return False; + } + #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) + if (siname != sinamebuf) Xfree (siname); + #endif if (pub->default_string == NULL) pub->default_string = ""; *** ./lib/X11/lcSjis.c@@/PUBLIC-LATEST Thu Nov 13 18:51:22 1997 --- xc/lib/X11/lcSjis.c Thu Apr 30 10:57:52 1998 *************** *** 1,4 **** ! /* $TOG: lcSjis.c /main/20 1997/11/13 18:54:45 kaleb $ */ /**************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED --- 1,4 ---- ! /* $TOG: lcSjis.c /main/25 1998/04/30 11:02:27 kaleb $ */ /**************************************************************** Copyright 1992, 1993 by FUJITSU LIMITED *************** *** 36,41 **** --- 36,43 ---- *****************************************************************/ + #ifdef X_LOCALE + #include "Xlibint.h" #include "XlcGeneric.h" *************** *** 1561,1563 **** --- 1563,1569 ---- return lcd; } + + #else + typedef int dummy; + #endif /* X_LOCALE */ *** ./lib/X11/lcUTF.c@@/PUBLIC-LATEST Thu Nov 13 18:51:27 1997 --- xc/lib/X11/lcUTF.c Wed May 20 14:42:09 1998 *************** *** 1,4 **** ! /* $TOG: lcUTF.c /main/19 1997/11/13 18:54:51 kaleb $ */ /****************************************************************** Copyright 1993 by SunSoft, Inc. --- 1,4 ---- ! /* $TOG: lcUTF.c /main/25 1998/05/20 14:47:50 kaleb $ */ /****************************************************************** Copyright 1993 by SunSoft, Inc. *************** *** 25,30 **** --- 25,33 ---- Author: Hiromu Inukai (inukai@Japan.Sun.COM) SunSoft, inc. ******************************************************************/ + + #ifdef X_LOCALE + #include "XlcUTF.h" static int getutfrune( *************** *** 101,130 **** wchar_t #endif ); ! static void init_latin5tab( #if NeedFunctionPrototypes int*, wchar_t #endif ); ! static void init_latin6tab( #if NeedFunctionPrototypes int*, wchar_t #endif ); ! static void init_latin7tab( #if NeedFunctionPrototypes int*, wchar_t #endif ); ! static void init_latin8tab( #if NeedFunctionPrototypes int*, wchar_t #endif ); static void init_latin9tab( #if NeedFunctionPrototypes int*, --- 104,151 ---- wchar_t #endif ); ! static void init_cyrillictab( #if NeedFunctionPrototypes int*, wchar_t #endif ); ! static void init_koi8rtab( #if NeedFunctionPrototypes int*, wchar_t #endif ); ! static void init_arabictab( #if NeedFunctionPrototypes int*, wchar_t #endif ); ! static void init_greektab( #if NeedFunctionPrototypes int*, wchar_t #endif ); + static void init_hebrewtab( + #if NeedFunctionPrototypes + int*, + wchar_t + #endif + ); + static void init_latin5tab( + #if NeedFunctionPrototypes + int*, + wchar_t + #endif + ); + static void init_latin6tab( + #if NeedFunctionPrototypes + int*, + wchar_t + #endif + ); static void init_latin9tab( #if NeedFunctionPrototypes int*, *************** *** 172,187 **** {"ISO8859-3", XlcGR, init_latin3tab, latin2rune, N11n_none, 0x20}, {"ISO8859-4", XlcGL, init_latin4tab, latin2rune, N11n_none, 0x20}, {"ISO8859-4", XlcGR, init_latin4tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-5", XlcGL, init_latin5tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-5", XlcGR, init_latin5tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-6", XlcGL, init_latin6tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-6", XlcGR, init_latin6tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-7", XlcGL, init_latin7tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-7", XlcGR, init_latin7tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-8", XlcGL, init_latin8tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-8", XlcGR, init_latin8tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-9", XlcGL, init_latin9tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-9", XlcGR, init_latin9tab, latin2rune, N11n_none, 0x20}, {"JISX0201.1976-0", XlcGL, init_jis0201tab, jis02012rune, N11n_none, 0x20}, {"JISX0201.1976-0", XlcGR, init_jis0201tab, jis02012rune, N11n_none, 0x20}, {"JISX0208.1983-0", XlcGL, init_jis0208tab, jis02082rune, N11n_ja, 0x2222}, --- 193,212 ---- {"ISO8859-3", XlcGR, init_latin3tab, latin2rune, N11n_none, 0x20}, {"ISO8859-4", XlcGL, init_latin4tab, latin2rune, N11n_none, 0x20}, {"ISO8859-4", XlcGR, init_latin4tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-5", XlcGL, init_cyrillictab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-5", XlcGR, init_cyrillictab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-6", XlcGL, init_arabictab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-6", XlcGR, init_arabictab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-7", XlcGL, init_greektab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-7", XlcGR, init_greektab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-8", XlcGL, init_hebrewtab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-8", XlcGR, init_hebrewtab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-9", XlcGL, init_latin5tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-9", XlcGR, init_latin5tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-10", XlcGL, init_latin6tab, latin2rune, N11n_none, 0x20}, ! {"ISO8859-10", XlcGR, init_latin6tab, latin2rune, N11n_none, 0x20}, ! {"FCD8859-15", XlcGL, init_latin9tab, latin2rune, N11n_none, 0x20}, ! {"FCD8859-15", XlcGR, init_latin9tab, latin2rune, N11n_none, 0x20}, {"JISX0201.1976-0", XlcGL, init_jis0201tab, jis02012rune, N11n_none, 0x20}, {"JISX0201.1976-0", XlcGR, init_jis0201tab, jis02012rune, N11n_none, 0x20}, {"JISX0208.1983-0", XlcGL, init_jis0208tab, jis02082rune, N11n_ja, 0x2222}, *************** *** 190,195 **** --- 215,222 ---- {"KSC5601.1987-0", XlcGR, init_ksc5601tab, ksc2rune, N11n_ko, 0x2160}, {"GB2312.1980-0", XlcGL, init_gb2312tab, gb2rune, N11n_zh, 0x2175}, {"GB2312.1980-0", XlcGR, init_gb2312tab, gb2rune, N11n_zh, 0x2175}, + {"KOI8-R", XlcGL, init_koi8rtab, latin2rune, N11n_none, 0x20}, + {"KOI8-R", XlcGR, init_koi8rtab, latin2rune, N11n_none, 0x20}, }; *************** *** 259,270 **** static void #if NeedFunctionPrototypes ! init_latin_tab( int* tbl, wchar_t fb_default, char* which) #else ! init_latin_tab(tbl, fb_default, which) int* tbl; wchar_t fb_default; char* which; --- 286,297 ---- static void #if NeedFunctionPrototypes ! init_8859_tab( int* tbl, wchar_t fb_default, char* which) #else ! init_8859_tab(tbl, fb_default, which) int* tbl; wchar_t fb_default; char* which; *************** *** 370,376 **** wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_1); } static void --- 397,403 ---- wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_1); } static void *************** *** 384,390 **** wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_2); } static void --- 411,417 ---- wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_2); } static void *************** *** 398,404 **** wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_3); } static void --- 425,431 ---- wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_3); } static void *************** *** 412,478 **** wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_4); } static void #if NeedFunctionPrototypes ! init_latin5tab( int* tbl, wchar_t fb_default) #else ! init_latin5tab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_5); } static void #if NeedFunctionPrototypes ! init_latin6tab( int* tbl, wchar_t fb_default) #else ! init_latin6tab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_6); } static void #if NeedFunctionPrototypes ! init_latin7tab( int* tbl, wchar_t fb_default) #else ! init_latin7tab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_7); } static void #if NeedFunctionPrototypes ! init_latin8tab( int* tbl, wchar_t fb_default) #else ! init_latin8tab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_8); } static void #if NeedFunctionPrototypes init_latin9tab( int* tbl, wchar_t fb_default) --- 439,547 ---- wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_4); } static void #if NeedFunctionPrototypes ! init_cyrillictab( int* tbl, wchar_t fb_default) #else ! init_cyrillictab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_5); } static void #if NeedFunctionPrototypes ! init_koi8rtab( int* tbl, wchar_t fb_default) #else ! init_koi8rtab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tabkoi8_r); } static void #if NeedFunctionPrototypes ! init_arabictab( int* tbl, wchar_t fb_default) #else ! init_arabictab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_6); } static void #if NeedFunctionPrototypes ! init_greektab( int* tbl, wchar_t fb_default) #else ! init_greektab(tbl, fb_default) int* tbl; wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_7); } static void #if NeedFunctionPrototypes + init_hebrewtab( + int* tbl, + wchar_t fb_default) + #else + init_hebrewtab(tbl, fb_default) + int* tbl; + wchar_t fb_default; + #endif + { + init_8859_tab (tbl, fb_default, tab8859_8); + } + + static void + #if NeedFunctionPrototypes + init_latin5tab( + int* tbl, + wchar_t fb_default) + #else + init_latin5tab(tbl, fb_default) + int* tbl; + wchar_t fb_default; + #endif + { + init_8859_tab (tbl, fb_default, tab8859_9); + } + + static void + #if NeedFunctionPrototypes + init_latin6tab( + int* tbl, + wchar_t fb_default) + #else + init_latin6tab(tbl, fb_default) + int* tbl; + wchar_t fb_default; + #endif + { + init_8859_tab (tbl, fb_default, tab8859_10); + } + + static void + #if NeedFunctionPrototypes init_latin9tab( int* tbl, wchar_t fb_default) *************** *** 482,488 **** wchar_t fb_default; #endif { ! init_latin_tab (tbl, fb_default, tab8859_9); } static void --- 551,557 ---- wchar_t fb_default; #endif { ! init_8859_tab (tbl, fb_default, tab8859_15); } static void *************** *** 552,559 **** } static int once = 0; static int ! _XlcInitUTFInfo(lcd) XLCd lcd; { if(!once) { --- 621,629 ---- } static int once = 0; + static int ! InitUTFInfo(lcd) XLCd lcd; { if(!once) { *************** *** 1320,1326 **** conv->methods = methods; conv->state = NULL; ! _XlcInitUTFInfo(lcd); return conv; } --- 1390,1396 ---- conv->methods = methods; conv->state = NULL; ! InitUTFInfo(lcd); return conv; } *************** *** 1432,1434 **** --- 1502,1508 ---- return lcd; } + + #else + typedef int dummy; + #endif /* X_LOCALE */ *** ./lib/X11/lcWrap.c@@/PUBLIC-LATEST Fri Feb 6 17:41:41 1998 --- xc/lib/X11/lcWrap.c Mon Jun 1 16:09:15 1998 *************** *** 1,4 **** ! /* $TOG: lcWrap.c /main/26 1998/02/06 17:41:47 kaleb $ */ /* Copyright 1991, 1998 The Open Group --- 1,4 ---- ! /* $TOG: lcWrap.c /main/28 1998/06/01 16:15:36 kaleb $ */ /* Copyright 1991, 1998 The Open Group *************** *** 265,271 **** XlcLoaderList loader; XLCdList cur; #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! char siname[256]; char *_XlcMapOSLocaleName(); #endif --- 265,273 ---- XlcLoaderList loader; XLCdList cur; #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! int len; ! char sinamebuf[256]; ! char* siname; char *_XlcMapOSLocaleName(); #endif *************** *** 272,278 **** if (name == NULL) { name = setlocale (LC_CTYPE, (char *)NULL); #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! name = _XlcMapOSLocaleName (name, siname); #endif } --- 274,287 ---- if (name == NULL) { name = setlocale (LC_CTYPE, (char *)NULL); #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) ! /* ! * _XlMapOSLOcaleName will return the same string or a substring ! * of name, so strlen(name) is okay ! */ ! if ((len = strlen(name)) < sizeof sinamebuf) siname = sinamebuf; ! else siname = Xmalloc (len + 1); ! if (siname == NULL) return NULL; ! name = _XlcMapOSLocaleName(name, siname); #endif } *************** *** 314,319 **** --- 323,333 ---- found: _XUnlockMutex(_Xi18n_lock); + + #if !defined(X_NOT_STDC_ENV) && !defined(X_LOCALE) + if (siname != sinamebuf) Xfree(siname); + #endif + return lcd; } *** ./lib/X11/omGeneric.c@@/PUBLIC-LATEST Wed Nov 12 17:30:34 1997 --- xc/lib/X11/omGeneric.c Thu Jun 25 16:07:47 1998 *************** *** 1,4 **** ! /* $TOG: omGeneric.c /main/24 1997/11/12 17:33:55 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: omGeneric.c /main/28 1998/06/25 16:15:55 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 28,36 **** * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. * ! * Modifier: Takanori Tateno FUJITSU LIMITED * */ #include "Xlibint.h" #include "XomGeneric.h" --- 28,46 ---- * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. * ! * Modifier: Takanori Tateno FUJITSU LIMITED * */ + /* + * Fixed the algorithms in parse_fontname() and parse_fontdata() + * to improve the logic for determining which font should be + * returned for a given CharSet. We even added some comments + * so that you can figure out what in the heck we're doing. We + * realize this is a departure from the norm, but hey, we're + * rebels! :-) :-) + * + * Modifiers: Jeff Walls, Paul Anderson: HEWLETT-PACKARD + */ #include "Xlibint.h" #include "XomGeneric.h" *************** *** 218,223 **** --- 228,255 ---- } static Bool + load_fontset_data(oc, font_set) + XOC oc; + FontSet font_set; + { + Display *dpy = oc->core.om->core.display; + + if(font_set->font_name == (char *)NULL) return False ; + + /* If font_set->font is not NULL, it contains the *best* + * match font for this FontSet. + * -- jjw/pma (HP) + */ + if(font_set->font == NULL) { + font_set->font = XLoadQueryFont(dpy, font_set->font_name); + if (font_set->font == NULL){ + return False; + } + } + return True; + } + + static Bool load_font(oc) XOC oc; { *************** *** 230,235 **** --- 262,270 ---- if (font_set->font_name == NULL) continue; + if (load_fontset_data (oc, font_set) != True) + return False; + if(load_fontdata(oc, font_set->font_data, font_set->font_data_count) != True) return False; *************** *** 238,245 **** font_set->substitute_num) != True) return False; ! if(font_set->font_data_count > 0 && font_set->font_data->font) { ! font_set->font = font_set->font_data->font; } else if(font_set->substitute_num > 0 ) { for(i=0;isubstitute_num;i++){ if(font_set->substitute[i].font != NULL){ --- 273,298 ---- font_set->substitute_num) != True) return False; ! #if 0 ! /* ### This code is no longer needed. This block essentially ! * ### took the font used for this FontSet and figured out ! * ### which font structure to use. This is now accomplished ! * ### via load_fontset_data(), which takes the *best* font ! * ### for this FontSet and performs an XLoadQueryFont() to ! * ### obtain the font structure. Note that this should work ! * ### for either Primary or Substitute fonts. ! * ### -- jjw/pma (HP) ! */ ! if(font_set->font_data_count > 0 && font_set->font_data->font ) { ! for (i=0; ifont_data_count; i++) ! { ! if (!strcmp (font_set->font_data[i].xlfd_name, ! font_set->font_name)) ! { ! font_set->font = font_set->font_data[i].font; ! break; ! } ! } } else if(font_set->substitute_num > 0 ) { for(i=0;isubstitute_num;i++){ if(font_set->substitute[i].font != NULL){ *************** *** 248,253 **** --- 301,307 ---- } } } + #endif /* Add 1996.05.20 */ if( oc->core.orientation == XOMOrientation_TTB_RTL || *************** *** 492,503 **** char *pattern = NULL, *ptr = NULL; char *fields[CHARSET_ENCODING_FIELD]; char str_pixel[32], str_point[4]; - char rotate_font[256]; char *rotate_font_ptr = NULL; int pixel_size = 0; int field_num = 0, len = 0; ! if(font_name == (char *) NULL || (len = strlen(font_name)) <= 0) return NULL; pattern = (char *)Xmalloc(len + 1); --- 546,556 ---- char *pattern = NULL, *ptr = NULL; char *fields[CHARSET_ENCODING_FIELD]; char str_pixel[32], str_point[4]; char *rotate_font_ptr = NULL; int pixel_size = 0; int field_num = 0, len = 0; ! if(font_name == (char *) NULL || (len = strlen(font_name)) <= 0 || len > 255) return NULL; pattern = (char *)Xmalloc(len + 1); *************** *** 545,564 **** strcpy(str_point, "*"); fields[POINT_SIZE_FIELD - 1] = str_point; ! rotate_font[0] = '\0'; for(field_num = 0 ; field_num < CHARSET_ENCODING_FIELD && fields[field_num] ; field_num++) { ! sprintf(rotate_font, "%s-%s", rotate_font, fields[field_num]); } if(pattern) Xfree(pattern); - rotate_font_ptr = (char *)Xmalloc(strlen(rotate_font) + 1); - if(!rotate_font_ptr) - return NULL; - strcpy(rotate_font_ptr, rotate_font); - return rotate_font_ptr; } --- 598,624 ---- strcpy(str_point, "*"); fields[POINT_SIZE_FIELD - 1] = str_point; ! len = 0; for(field_num = 0 ; field_num < CHARSET_ENCODING_FIELD && + fields[field_num] ; field_num++) + len += 1 + strlen (fields[field_num]); + + if (len > 255) + return NULL; + + rotate_font_ptr = (char *)Xmalloc(len + 1); + if(!rotate_font_ptr) + return NULL; + + *rotate_font_ptr = '\0'; + for(field_num = 0 ; field_num < CHARSET_ENCODING_FIELD && fields[field_num] ; field_num++) { ! sprintf(rotate_font_ptr, "%s-%s", rotate_font_ptr, fields[field_num]); } if(pattern) Xfree(pattern); return rotate_font_ptr; } *************** *** 583,588 **** --- 643,676 ---- return False; } + static char * + get_font_name_from_list(oc, pattern, font_data) + XOC oc; + char *pattern; + FontData font_data; + { + char **list, *name = (char *)NULL, *fname; + int count = 0, i; + + list = XListFonts(oc->core.om->core.display, pattern, MAXFONTS, &count); + if (list == NULL) + return NULL; + + for (i = 0; i < count; i++) { + fname = list[i]; + if(is_match_charset(font_data, fname) == True) { + name = (char *) Xmalloc(strlen(fname) + 1); + if (name) + strcpy(name, fname); + break; + } + } + + XFreeFontNames(list); + + return name; + } + static int parse_all_name(oc, font_data, pattern) XOC oc; *************** *** 642,651 **** char* last = (char *) NULL; char* base_name; char buf[BUFSIZE]; /* no XLFD name should be this long */ - char* bufp; int length = 0; int num_fields; if(is_match_charset(font_data, pattern) == True) { if ((font_data->xlfd_name = get_font_name(oc, pattern)) != NULL) { return True; --- 730,741 ---- char* last = (char *) NULL; char* base_name; char buf[BUFSIZE]; /* no XLFD name should be this long */ int length = 0; int num_fields; + /* If the font specified by "pattern" is expandable to be + * a member of "font_data"'s FontSet, we've found a match. + */ if(is_match_charset(font_data, pattern) == True) { if ((font_data->xlfd_name = get_font_name(oc, pattern)) != NULL) { return True; *************** *** 652,690 **** } } ! /* ! * If an XLFD name is arbitrarily (too) long, allocate a buffer, * and some extra space to tack stuff on the end. */ - length = strlen(pattern); - if (length > BUFSIZE/2) bufp = Xmalloc (length * 2); - else bufp = buf; - strcpy(bufp, pattern); - last = bufp + length - 1; - /* ! * Plug in the charset/encoding specified in the XLC_LOCALE file ! * into the *right* place in the XLFD name. */ ! for (num_fields = 0, base_name = bufp; *base_name != '\0'; base_name++) if (*base_name == '-') num_fields++; switch (num_fields) { case 12: ! /* this is the best way to have specifed the fontset */ *++last = '-'; break; case 13: ! /* got the charset, not the encoding, zap the charset */ ! last = strrchr (bufp, '-'); num_fields = 12; break; case 14: ! /* got the charset and the encoding, zap 'em */ ! last = strrchr (bufp, '-'); *last = '\0'; ! last = strrchr (bufp, '-'); num_fields = 12; break; default: --- 742,825 ---- } } ! /* If an XLFD name is arbitrarily (too) long, allocate a buffer, * and some extra space to tack stuff on the end. + * + * ### This is a hack. What happens is, we substitute pattern's + * ### encoding with the default encoding for the FontSet and + * ### try to find a match. For example, we may change pattern + * ### from: + * ### -*-*-*-*-*-*-14-*-*-*-*-*-jisx0212.1990-0 to + * ### -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 + * ### So, the length of the original pattern may not be enough + * ### to store the "new" encoding (e.g., going from ISO8859-1 to + * ### JISX0208.1990-0), so the author decided to simply allocate + * ### a *bunch* of extra space to handle the potentially longer + * ### encoding. + * ### + * ### The real way to do this would be to figure out the length + * ### of the original encoding and the length of the new encoding. + * ### Re-alloc the array with the difference. Since it doesn't + * ### hurt anything keeping the extra-large buffer, I'll leave + * ### it the way it is. --jjw/pma (HP) + * ### */ /* ! * since BUFSIZE is much bigger than any legal XLFD name ! * we'll allow the first half for the XLFD pattern, and the ! * second half for the charset-plus-encoding. If we wanted to ! * be accomodating, we could allocate memory, but that's ! * overkill for this. Hackers who are trying to do bad things ! * don't deserve to be accomodated like that. */ ! if ((length = strlen (pattern)) > BUFSIZE/2) return -1; ! ! strcpy(buf, pattern); ! last = buf + length - 1; ! ! /* Replace the original encoding with the encoding for this FontSet. */ ! ! /* Figure out how many fields have been specified in this xlfd. */ ! for (num_fields = 0, base_name = buf; *base_name != '\0'; base_name++) if (*base_name == '-') num_fields++; switch (num_fields) { case 12: ! /* This is the best way to have specifed the fontset. In this ! * case, there is no original encoding. E.g., ! * -*-*-*-*-*-*-14-*-*-*-*-* ! * To this, we'll append a dash: ! * -*-*-*-*-*-*-14-*-*-*-*-*- ! * then append the encoding to get: ! * -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 ! */ *++last = '-'; break; case 13: ! /* Got the charset, not the encoding, zap the charset In this ! * case, there is no original encoding, but there is a charset. E.g., ! * -*-*-*-*-*-*-14-*-*-*-*-*-jisx0212.1990 ! * To this, we remove the charset: ! * -*-*-*-*-*-*-14-*-*-*-*-*- ! * then append the new encoding to get: ! * -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 ! */ ! last = strrchr (buf, '-'); num_fields = 12; break; case 14: ! /* Both the charset and the encoding are specified. Get rid ! * of them so that we can append the new charset encoding. E.g., ! * -*-*-*-*-*-*-14-*-*-*-*-*-jisx0212.1990-0 ! * To this, we'll remove the encoding and charset to get: ! * -*-*-*-*-*-*-14-*-*-*-*-*- ! * then append the new encoding to get: ! * -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 ! */ ! last = strrchr (buf, '-'); *last = '\0'; ! last = strrchr (buf, '-'); num_fields = 12; break; default: *************** *** 701,712 **** } last++; strcpy(last, font_data->name); ! if ((font_data->xlfd_name = get_font_name(oc, bufp)) != NULL) { ! if (bufp != buf) Xfree (bufp); return True; - } while (num_fields < 12) { *last = '*'; *(last + 1) = '-'; --- 836,867 ---- } last++; + /* At this point, "last" is pointing to the last "-" in the + * xlfd, and all xlfd's at this point take a form similar to: + * -*-*-*-*-*-*-14-*-*-*-*-*- + * (i.e., no encoding). + * After the strcpy, we'll end up with something similar to: + * -*-*-*-*-*-*-14-*-*-*-*-*-JISX0208.1990-0 + * + * If the modified font is found in the current FontSet, + * we've found a match. + */ + + /* don't let hackers trounce the stack... */ + if (strlen (font_data->name) > BUFSIZE/2) + return -1; + + /* ...otherwise there's plenty of room to tack on the charset/encoding */ strcpy(last, font_data->name); ! if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL) return True; + /* This happens if the client specifies less than 12 fields + * (e.g., -*-*-*) for some reason. We'll keep appending + * "-*" until we find something that matches. This "feels" + * as if we're being overly nice to "lazy" client programs, + * but that's the way X is...nice :-) + */ while (num_fields < 12) { *last = '*'; *(last + 1) = '-'; *************** *** 713,725 **** strcpy(last + 2, font_data->name); num_fields++; last+=2; ! if ((font_data->xlfd_name = get_font_name(oc, bufp)) != NULL) { ! if (bufp != buf) Xfree (bufp); return True; - } } ! if (bufp != buf) Xfree (bufp); return False; } --- 868,890 ---- strcpy(last + 2, font_data->name); num_fields++; last+=2; ! if ((font_data->xlfd_name = get_font_name(oc, buf)) != NULL) return True; } ! /* ! I'm not sure what Teeks was trying to do here. It ! seems to me that if "get_font_name()" fails, ! "get_font_name_from_list()" would also fail. I wouldn't ! put this in the SI until I understood it better. ! -- jjw/pma (HP) ! ! Couldn't resolve the wild base fontname ! ! - Teeks ! */ ! if ((font_data->xlfd_name = get_font_name_from_list(oc, buf, font_data)) != NULL) ! return True; ! return False; } *************** *** 727,748 **** typedef enum{C_PRIMARY, C_SUBSTITUTE, C_VMAP, C_VROTATE } ClassType; static int ! parse_fontdata(oc, font_data, font_data_count, name_list, name_list_count, ! class) ! XOC oc; ! FontData font_data; ! int font_data_count; ! char **name_list; ! int name_list_count; ! ClassType class; { char **cur_name_list = name_list; ! char *font_name = (char *) NULL; ! char *pattern = (char *) NULL; ! int found_num = 0, ret = 0; ! int fd_count = font_data_count; ! int count = name_list_count; ! Bool is_found = False; if(name_list == NULL || count <= 0) { return False; --- 892,916 ---- typedef enum{C_PRIMARY, C_SUBSTITUTE, C_VMAP, C_VROTATE } ClassType; static int ! parse_fontdata(oc, font_set, font_data, font_data_count, name_list, name_list_count, ! class, font_data_return) ! XOC oc; ! FontSet font_set; ! FontData font_data; ! int font_data_count; ! char **name_list; ! int name_list_count; ! ClassType class; ! FontDataRec *font_data_return; { + char **cur_name_list = name_list; ! char *font_name = (char *) NULL; ! char *pattern = (char *) NULL; ! int found_num = 0, ret = 0; ! int fd_count = font_data_count; ! int count = name_list_count; ! Bool is_found = False; if(name_list == NULL || count <= 0) { return False; *************** *** 752,762 **** --- 920,933 ---- return False; } + /* Loop through each FontSet defined in the "font_data" CharSet. */ for ( ; font_data_count-- > 0; font_data++) { is_found = False; font_name = (char *) NULL; count = name_list_count; cur_name_list = name_list; + + /* Loop through each font specified by the user in the call to XCreateFontset(). */ while (count-- > 0) { pattern = *cur_name_list++; if (pattern == NULL || *pattern == '\0') *************** *** 763,824 **** continue; ! /* When the font name is specified a full name. */ if (strchr(pattern, '*') == NULL && (font_name = get_font_name(oc, pattern))) { ret = parse_all_name(oc, font_data, font_name); Xfree(font_name); ! if(ret == -1) ! return ret; ! else if (ret == True) { ! found_num++; ! is_found = True; ! break; ! } else ! continue; } ! /* When the font name is specified a omited name. */ ret = parse_omit_name(oc, font_data, pattern); ! if(ret == -1) ! return ret; ! else if (ret == True) { ! found_num++; ! is_found = True; ! break; ! } else ! continue; } switch(class) { case C_PRIMARY: ! if(is_found != True) ! return False; ! break; case C_SUBSTITUTE: case C_VMAP: ! if(is_found == True) ! return True; ! break; case C_VROTATE: ! if(is_found == True) { ! char *rotate_name; ! if((rotate_name = get_rotate_fontname(font_data->xlfd_name)) != NULL) { ! Xfree(font_data->xlfd_name); ! font_data->xlfd_name = rotate_name; ! return True; ! } ! Xfree(font_data->xlfd_name); ! return False; ! } } } ! if(class == C_PRIMARY && found_num == fd_count) return True; return False; --- 934,1078 ---- continue; ! /* If the current font is fully specified (i.e., the xlfd contains ! * no wildcards) and the font exists on the X Server, we have a match. ! */ if (strchr(pattern, '*') == NULL && (font_name = get_font_name(oc, pattern))) { + /* Find the full xlfd name for this font. If the font is already + * in xlfd format, it is simply returned. If the font is an + * alias for another font, the xlfd of the aliased font is returned. + */ ret = parse_all_name(oc, font_data, font_name); Xfree(font_name); ! if (ret == -1) return -1; ! if (ret == False) continue; ! ! /* Since there was an exact match of a fully-specified font ! * or a font alias, we can return now since the desired font ! * was found for the current FontSet for this CharSet. ! * ! * Previous implementations of this algorithm would ! * not return here. Instead, they continued searching ! * through the FontSets for this CharSet. The side-effect ! * of that behavior is you may return a "substitute" match ! * instead of an "exact" match. We believe there should be a ! * preference on exact matches. Therefore, as soon as we ! * find one, we bail. ! * ! * Also, previous implementations seemed to think it was ! * important to find either a primary or substitute font ! * for each FontSet in the CharSet before returning an ! * acceptable font. We don't believe this is necessary. ! * All the client cares about is finding a reasonable font ! * for what was passed in. If we find an exact match, ! * there's no reason to look any further. ! * ! * -- jjw/pma (HP) ! */ ! font_data_return->xlfd_name = (char *)Xmalloc ! (strlen(font_data->xlfd_name) + 1); ! if (!font_data_return->xlfd_name) return -1; ! ! strcpy (font_data_return->xlfd_name, font_data->xlfd_name); ! ! font_data_return->side = font_data->side; ! ! return True; } ! /* If the font name is not fully specified (i.e., it has wildcards), ! * we have more work to do. See the comments in parse_omit_name() ! * for the list of things to do. ! */ ret = parse_omit_name(oc, font_data, pattern); ! ! if (ret == -1) return -1; ! if (ret == False) continue; ! ! /* A font which matched the wild-carded specification was found. ! * Only update the return data if a font has not yet been found. ! * This maintains the convention that FontSets listed higher in ! * a CodeSet in the Locale Database have higher priority than ! * those FontSets listed lower in the CodeSet. In the following ! * example: ! * ! * fs1 { ! * charset HP-JIS:GR ! * font JISX0208.1990-0:GL;\ ! * JISX0208.1990-1:GR;\ ! * JISX0208.1983-0:GL;\ ! * JISX0208.1983-1:GR ! * } ! * ! * a font found in the JISX0208.1990-0 FontSet will have a ! * higher priority than a font found in the JISX0208.1983-0 ! * FontSet. ! */ ! if (font_data_return->xlfd_name == NULL) ! { ! ! font_data_return->xlfd_name = (char *)Xmalloc ! (strlen(font_data->xlfd_name) + 1); ! if (!font_data_return->xlfd_name) return -1; ! ! strcpy (font_data_return->xlfd_name, font_data->xlfd_name); ! font_data_return->side = font_data->side; ! } ! ! found_num++; ! is_found = True; } switch(class) { case C_PRIMARY: ! if(is_found == False) ! { ! /* Did not find a font for the current FontSet. Check the ! * FontSet's "substitute" font for a match. If we find a ! * match, we'll keep searching in hopes of finding an exact ! * match later down the FontSet list. ! */ ! ret = parse_fontdata(oc, font_set, font_set->substitute, ! font_set->substitute_num, name_list, ! name_list_count, C_SUBSTITUTE, ! font_data_return); ! if (ret == -1) return -1; ! if (ret == False) continue; ! ! found_num++; ! is_found = True; ! } ! ! break; ! case C_SUBSTITUTE: case C_VMAP: ! if(is_found == True) ! return True; ! break; ! case C_VROTATE: ! if(is_found == True) { ! char *rotate_name; ! if((rotate_name = get_rotate_fontname(font_data->xlfd_name)) != NULL) { ! Xfree(font_data->xlfd_name); ! font_data->xlfd_name = rotate_name; ! ! return True; ! } ! Xfree(font_data->xlfd_name); ! return False; ! } ! break; } } ! if(class == C_PRIMARY && found_num >= 1) return True; return False; *************** *** 833,838 **** --- 1087,1093 ---- int count; { FontData vmap = font_set->vmap; + FontDataRec font_data_return; VRotate vrotate = font_set->vrotate; int vmap_num = font_set->vmap_num; int vrotate_num = font_set->vrotate_num; *************** *** 839,851 **** int ret = 0, i = 0; if(vmap_num > 0) { ! if(parse_fontdata(oc, vmap, vmap_num, name_list, count, C_VMAP) == -1) return (-1); } if(vrotate_num > 0) { ! ret = parse_fontdata(oc, (FontData) vrotate, vrotate_num, ! name_list, count, C_VROTATE); if(ret == -1) { return (-1); } else if(ret == False) { --- 1094,1106 ---- int ret = 0, i = 0; if(vmap_num > 0) { ! if(parse_fontdata(oc, font_set, vmap, vmap_num, name_list, count, C_VMAP) == -1) return (-1); } if(vrotate_num > 0) { ! ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num, ! name_list, count, C_VROTATE, &font_data_return); if(ret == -1) { return (-1); } else if(ret == False) { *************** *** 878,885 **** font_set->vrotate = (VRotate)NULL; } ! ret = parse_fontdata(oc, (FontData) vrotate, vrotate_num, ! name_list, count, C_VROTATE); if(ret == -1) return (-1); } --- 1133,1140 ---- font_set->vrotate = (VRotate)NULL; } ! ret = parse_fontdata(oc, font_set, (FontData) vrotate, vrotate_num, ! name_list, count, C_VROTATE, &font_data_return); if(ret == -1) return (-1); } *************** *** 893,899 **** XOC oc; { XOCGenericPart *gen = XOC_GENERIC(oc); ! FontSet font_set; char *base_name, **name_list; int font_set_num = 0; int found_num = 0; --- 1148,1155 ---- XOC oc; { XOCGenericPart *gen = XOC_GENERIC(oc); ! FontSet font_set; ! FontDataRec font_data_return; char *base_name, **name_list; int font_set_num = 0; int found_num = 0; *************** *** 908,979 **** font_set = gen->font_set; font_set_num = gen->font_set_num; for( ; font_set_num-- > 0 ; font_set++) { if(font_set->font_name) continue; if(font_set->font_data_count > 0) { ! ret = parse_fontdata(oc, font_set->font_data, font_set->font_data_count, ! name_list, count, C_PRIMARY); if(ret == -1) { goto err; } else if(ret == True) { font_set->font_name = (char *)Xmalloc ! (strlen(font_set->font_data->xlfd_name) + 1); if(font_set->font_name == (char *) NULL) goto err; ! strcpy(font_set->font_name, font_set->font_data->xlfd_name); ! font_set->side = font_set->font_data->side; if(parse_vw(oc, font_set, name_list, count) == -1) goto err; found_num++; ! /* The substitute font is serched, when the primary fonts */ ! /* is not found. */ ! } else { ! /* The primary information is free from FontSet structure */ ! font_set->font_data_count = 0; ! if(font_set->font_data) { ! Xfree(font_set->font_data); ! font_set->font_data = (FontData) NULL; ! } ! /* A vrotate member is replaced to substitute information */ ! /* from primary information. */ ! font_set->vrotate_num = 0; ! if(font_set->vrotate) { ! Xfree(font_set->vrotate); ! font_set->vrotate = (VRotate) NULL; ! } ! ret = parse_fontdata(oc, font_set->substitute, ! font_set->substitute_num, ! name_list, count, C_SUBSTITUTE); ! if(ret == -1) { ! goto err; ! } else if(ret == True) { ! for(i=0;isubstitute_num;i++){ ! if(font_set->substitute[i].xlfd_name != NULL){ ! break; ! } ! } ! font_set->font_name = (char *)Xmalloc ! (strlen(font_set->substitute[i].xlfd_name) + 1); ! if(font_set->font_name == (char *) NULL) ! goto err; ! strcpy(font_set->font_name,font_set->substitute[i].xlfd_name); ! font_set->side = font_set->substitute[i].side; ! if(parse_vw(oc, font_set, name_list, count) == -1) ! goto err; ! found_num++; ! } ! } ! } else if(font_set->substitute_num > 0) { ! ret = parse_fontdata(oc, font_set->substitute, font_set->substitute_num, ! name_list, count, C_SUBSTITUTE); if(ret == -1) { goto err; } else if(ret == True) { --- 1164,1230 ---- font_set = gen->font_set; font_set_num = gen->font_set_num; + /* Loop through all of the CharSets defined in the Locale + * database for the current Locale. + */ for( ; font_set_num-- > 0 ; font_set++) { if(font_set->font_name) continue; if(font_set->font_data_count > 0) { ! ! /* If there are a non-zero number of FontSets defined ! * for this CharSet. ! */ ! font_data_return.name = NULL; ! font_data_return.side = XlcUnknown; ! font_data_return.scopes_num = 0; ! font_data_return.scopes = NULL; ! font_data_return.xlfd_name = NULL; ! font_data_return.font = NULL; ! ! /* Try to find a font for this CharSet. If we find an ! * acceptable font, we save the information for return ! * to the client. If we do not find an acceptable font, ! * a "missing_charset" will be reported to the client ! * for this CharSet. ! */ ! ret = parse_fontdata(oc, font_set, font_set->font_data, font_set->font_data_count, ! name_list, count, C_PRIMARY, ! &font_data_return); if(ret == -1) { goto err; } else if(ret == True) { font_set->font_name = (char *)Xmalloc ! (strlen(font_data_return.xlfd_name) + 1); if(font_set->font_name == (char *) NULL) goto err; ! strcpy(font_set->font_name, font_data_return.xlfd_name); ! font_set->side = font_data_return.side; + Xfree (font_data_return.xlfd_name); + if(parse_vw(oc, font_set, name_list, count) == -1) goto err; found_num++; + } ! } else if(font_set->substitute_num > 0) { ! /* If there are no FontSets defined for this ! * CharSet. We can only find "substitute" fonts. ! */ ! font_data_return.name = NULL; ! font_data_return.side = XlcUnknown; ! font_data_return.scopes_num = 0; ! font_data_return.scopes = NULL; ! font_data_return.xlfd_name = NULL; ! font_data_return.font = NULL; ! ret = parse_fontdata(oc, font_set, font_set->substitute, font_set->substitute_num, ! name_list, count, C_SUBSTITUTE, &font_data_return); if(ret == -1) { goto err; } else if(ret == True) { *** ./lib/X11/omText.c@@/PUBLIC-LATEST Thu Dec 5 10:40:54 1996 --- xc/lib/X11/omText.c Sat Mar 14 06:06:55 1998 *************** *** 1,4 **** ! /* $XConsortium: omText.c /main/4 1996/12/05 10:40:52 swick $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: omText.c /main/6 1998/03/14 06:08:58 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 28,33 **** --- 28,36 ---- * This is source code modified by FUJITSU LIMITED under the Joint * Development Agreement for the CDE/Motif PST. */ + /* + * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD) + */ #include "Xlibint.h" #include "XomGeneric.h" *************** *** 182,191 **** (char *)ptr,length,&ptr_len,is_xchar2b,FONTSCOPE); if(ptr_len <= 0) break; if(fd == (FontData) NULL || ! (font = fd->font) == (XFontStruct *) NULL){ ! if((font = fs->font) == (XFontStruct *) NULL) break; } --- 185,204 ---- (char *)ptr,length,&ptr_len,is_xchar2b,FONTSCOPE); if(ptr_len <= 0) break; + + /* First, see if the "Best Match" font for the FontSet was set. + * If it was, use that font. If it was not set, then use the + * font defined by font_set->font_data[0] (which is what + * _XomGetFontDataFromFontSet() always seems to return for + * non-VW text). Note that given the new algorithm in + * parse_fontname() and parse_fontdata(), fs->font will + * *always* contain good data. We should probably remove + * the check for "fd->font", but we won't :-) -- jjw/pma (HP) + */ if(fd == (FontData) NULL || ! (font = fs->font) == (XFontStruct *) NULL){ ! if((font = fd->font) == (XFontStruct *) NULL) break; } *** ./lib/X11/omXChar.c@@/PUBLIC-LATEST Thu Dec 5 10:41:08 1996 --- xc/lib/X11/omXChar.c Sat Mar 14 06:07:00 1998 *************** *** 1,4 **** ! /* $XConsortium: omXChar.c /main/6 1996/12/05 10:41:05 swick $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * --- 1,4 ---- ! /* $TOG: omXChar.c /main/8 1998/03/14 06:09:03 kaleb $ */ /* * Copyright 1992, 1993 by TOSHIBA Corp. * *************** *** 31,36 **** --- 31,39 ---- * Modifier: Takanori Tateno FUJITSU LIMITED * */ + /* + * Modifiers: Jeff Walls, Paul Anderson (HEWLETT-PACKARD) + */ #include "Xlibint.h" #include "XlcPublic.h" *************** *** 160,165 **** --- 163,178 ---- value = (unsigned long)*c; } + /* ### NOTE: This routine DOES NOT WORK! + * ### We can work around the problem in the calling routine, + * ### but we really need to understand this better. As it + * ### stands, the algorithm ALWAYS returns "fontdata[0]" + * ### for non-VW text! This is clearly wrong. In fact, + * ### given the new parse_font[name|data]() algorithms, + * ### we may not even need this routine to do anything + * ### for non-VW text (since font_set->font always contains + * ### the best font for this fontset). -- jjw/pma (HP) + */ for (i=0;inext = _XieTechFuncs[group - 1]; _XieTechFuncs[group - 1] = newrec; --- 68,74 ---- Xfree ((char *) newrec); status = 0; } ! else if (prev == NULL) { newrec->next = _XieTechFuncs[group - 1]; _XieTechFuncs[group - 1] = newrec; *** ./lib/Xaw/AsciiSrc.c@@/PUBLIC-LATEST Fri Feb 6 12:44:19 1998 --- xc/lib/Xaw/AsciiSrc.c Thu May 14 14:50:07 1998 *************** *** 1,4 **** ! /* $TOG: AsciiSrc.c /main/68 1998/02/06 12:44:23 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: AsciiSrc.c /main/69 1998/05/14 14:55:34 kaleb $ */ /* *************** *** 1286,1292 **** static XrmQuark XtQEstring = NULLQUARK; static XrmQuark XtQEfile; XrmQuark q; ! char lowerName[BUFSIZ]; if (XtQEstring == NULLQUARK) { XtQEstring = XrmPermStringToQuark(XtEstring); --- 1286,1292 ---- static XrmQuark XtQEstring = NULLQUARK; static XrmQuark XtQEfile; XrmQuark q; ! char lowerName[40]; if (XtQEstring == NULLQUARK) { XtQEstring = XrmPermStringToQuark(XtEstring); *************** *** 1293,1307 **** XtQEfile = XrmPermStringToQuark(XtEfile); } ! XmuCopyISOLatin1Lowered(lowerName, (char *) fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == XtQEstring) type = XawAsciiString; ! if (q == XtQEfile) type = XawAsciiFile; ! ! (*toVal).size = sizeof(XawAsciiType); ! (*toVal).addr = (XPointer) &type; ! return; } #if (defined(ASCII_STRING) || defined(ASCII_DISK)) --- 1293,1315 ---- XtQEfile = XrmPermStringToQuark(XtEfile); } ! if (strlen ((char*)fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered(lowerName, (char *) fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == XtQEstring) type = XawAsciiString; ! else if (q == XtQEfile) type = XawAsciiFile; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; ! } ! toVal->size = sizeof type; ! toVal->addr = (XPointer) &type; ! return; ! } ! toVal->size = 0; ! toVal->addr = NULL; } #if (defined(ASCII_STRING) || defined(ASCII_DISK)) *** ./lib/Xaw/AsciiSrcP.h@@/PUBLIC-LATEST Wed Feb 11 14:52:37 1998 --- xc/lib/Xaw/AsciiSrcP.h Wed Jun 24 11:45:20 1998 *************** *** 1,5 **** /* ! * $TOG: AsciiSrcP.h /main/12 1998/02/11 14:53:00 kaleb $ */ --- 1,5 ---- /* ! * $TOG: AsciiSrcP.h /main/13 1998/06/24 11:53:13 kaleb $ */ *************** *** 80,86 **** #ifdef L_tmpnam #define TMPSIZ L_tmpnam #else ! #define TMPSIZ 32 /* bytes to allocate for tmpnam */ #endif #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ --- 80,90 ---- #ifdef L_tmpnam #define TMPSIZ L_tmpnam #else ! #ifdef PATH_MAX ! #define TMPSIZ PATH_MAX ! #else ! #define TMPSIZ 1024 /* bytes to allocate for tmpnam */ ! #endif #endif #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ *** ./lib/Xaw/Form.c@@/PUBLIC-LATEST Fri Feb 6 12:45:47 1998 --- xc/lib/Xaw/Form.c Thu May 14 14:50:24 1998 *************** *** 1,4 **** ! /* $TOG: Form.c /main/53 1998/02/06 12:45:51 kaleb $ */ /*********************************************************** --- 1,4 ---- ! /* $TOG: Form.c /main/54 1998/05/14 14:55:45 kaleb $ */ /*********************************************************** *************** *** 163,174 **** static XrmQuark XtQChainLeft, XtQChainRight, XtQChainTop, XtQChainBottom, XtQRubber; - #define done(address, type) \ - { toVal->size = sizeof(type); \ - toVal->addr = (XPointer) address; \ - return; \ - } - /* ARGSUSED */ static void _CvtStringToEdgeType(args, num_args, fromVal, toVal) XrmValuePtr args; /* unused */ --- 163,168 ---- *************** *** 176,211 **** XrmValuePtr fromVal; XrmValuePtr toVal; { ! static XtEdgeType edgeType; ! XrmQuark q; ! char lowerName[1000]; XmuCopyISOLatin1Lowered (lowerName, (char*)fromVal->addr); q = XrmStringToQuark(lowerName); ! if (q == XtQChainLeft) { ! edgeType = XtChainLeft; ! done(&edgeType, XtEdgeType); } ! if (q == XtQChainRight) { ! edgeType = XtChainRight; ! done(&edgeType, XtEdgeType); ! } ! if (q == XtQChainTop) { ! edgeType = XtChainTop; ! done(&edgeType, XtEdgeType); ! /* NOTREACHED */ ! } ! if (q == XtQChainBottom) { ! edgeType = XtChainBottom; ! done(&edgeType, XtEdgeType); ! } ! if (q == XtQRubber) { ! edgeType = XtRubber; ! done(&edgeType, XtEdgeType); ! } ! XtStringConversionWarning(fromVal->addr, "edgeType"); ! toVal->addr = NULL; ! toVal->size = 0; } static void ClassInitialize() --- 170,198 ---- XrmValuePtr fromVal; XrmValuePtr toVal; { ! static XtEdgeType edgeType; ! XrmQuark q; ! char lowerName[40]; + if (strlen ((char*) fromVal->addr) < sizeof lowerName) { XmuCopyISOLatin1Lowered (lowerName, (char*)fromVal->addr); q = XrmStringToQuark(lowerName); ! if (q == XtQChainLeft) edgeType = XtChainLeft; ! else if (q == XtQChainRight) edgeType = XtChainRight; ! else if (q == XtQChainTop) edgeType = XtChainTop; ! else if (q == XtQChainBottom) edgeType = XtChainBottom; ! else if (q == XtQRubber) edgeType = XtRubber; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; } ! toVal->size = sizeof edgeType; ! toVal->addr = (XPointer) &edgeType; ! return; ! } ! toVal->addr = NULL; ! toVal->size = 0; } static void ClassInitialize() *** ./lib/Xaw/MenuButton.c@@/PUBLIC-LATEST Wed Feb 11 14:53:11 1998 --- xc/lib/Xaw/MenuButton.c Wed Jun 24 11:45:44 1998 *************** *** 1,4 **** ! /* $TOG: MenuButton.c /main/23 1998/02/11 14:53:33 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: MenuButton.c /main/24 1998/06/24 11:53:20 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group *************** *** 171,179 **** if (menu == NULL) { char error_buf[BUFSIZ]; ! (void) sprintf(error_buf, "MenuButton: %s %s.", ! "Could not find menu widget named", mbw->menu_button.menu_name); ! XtAppWarning(XtWidgetToApplicationContext(w), error_buf); return; } if (!XtIsRealized(menu)) --- 171,191 ---- if (menu == NULL) { char error_buf[BUFSIZ]; ! char* errorp; ! int len; ! char* fmt = "MenuButton: Could not find menu widget named %s."; ! ! if ((len = strlen (fmt) + strlen (mbw->menu_button.menu_name)) < sizeof error_buf) ! errorp = error_buf; ! else ! errorp = XtMalloc (len + 1); ! if (errorp == NULL) { ! errorp = error_buf; ! strcpy (errorp, "MenuButton: Could not find menu widget."); ! } else ! (void) sprintf(errorp, fmt, mbw->menu_button.menu_name); ! XtAppWarning (XtWidgetToApplicationContext (w), errorp); ! if (errorp != error_buf) XtFree (errorp); return; } if (!XtIsRealized(menu)) *** ./lib/Xaw/MultiSrc.c@@/PUBLIC-LATEST Wed Feb 11 14:53:28 1998 --- xc/lib/Xaw/MultiSrc.c Thu May 14 14:50:30 1998 *************** *** 1,4 **** ! /* $TOG: MultiSrc.c /main/10 1998/02/11 14:53:49 kaleb $ */ /* * Copyright 1991 by OMRON Corporation --- 1,4 ---- ! /* $TOG: MultiSrc.c /main/12 1998/05/14 14:55:50 kaleb $ */ /* * Copyright 1991 by OMRON Corporation *************** *** 425,431 **** /* In other words, text is not the u_text that the user handed me but one I made myself. I only care, because I need to free the string. */ ! XtFree( text.ptr ); if (src->multi_src.use_string_in_place) start_piece->text[start_piece->used] = (wchar_t)0; --- 425,431 ---- /* In other words, text is not the u_text that the user handed me but one I made myself. I only care, because I need to free the string. */ ! XFree( text.ptr ); if (src->multi_src.use_string_in_place) start_piece->text[start_piece->used] = (wchar_t)0; *************** *** 1427,1433 **** static XrmQuark XtQEstring = NULLQUARK; static XrmQuark XtQEfile; XrmQuark q; ! char lowerName[BUFSIZ]; if (XtQEstring == NULLQUARK) { XtQEstring = XrmPermStringToQuark(XtEstring); --- 1427,1433 ---- static XrmQuark XtQEstring = NULLQUARK; static XrmQuark XtQEfile; XrmQuark q; ! char lowerName[40]; if (XtQEstring == NULLQUARK) { XtQEstring = XrmPermStringToQuark(XtEstring); *************** *** 1434,1446 **** XtQEfile = XrmPermStringToQuark(XtEfile); } ! XmuCopyISOLatin1Lowered(lowerName, (char *) fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == XtQEstring) type = XawAsciiString; ! if (q == XtQEfile) type = XawAsciiFile; ! ! (*toVal).size = sizeof(XawAsciiType); ! (*toVal).addr = (XPointer) &type; ! return; } --- 1434,1454 ---- XtQEfile = XrmPermStringToQuark(XtEfile); } ! if (strlen ((char*) fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered(lowerName, (char *) fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == XtQEstring) type = XawAsciiString; ! else if (q == XtQEfile) type = XawAsciiFile; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; ! } ! toVal->size = sizeof type; ! toVal->addr = (XPointer) &type; ! return; ! } ! toVal->size = 0; ! toVal->addr = NULL; } *** ./lib/Xaw/MultiSrcP.h@@/PUBLIC-LATEST Wed Feb 11 14:53:24 1998 --- xc/lib/Xaw/MultiSrcP.h Wed Jun 24 11:45:49 1998 *************** *** 1,4 **** ! /* $TOG: MultiSrcP.h /main/4 1998/02/11 14:53:45 kaleb $ */ /* * Copyright 1991 by OMRON Corporation --- 1,4 ---- ! /* $TOG: MultiSrcP.h /main/5 1998/06/24 11:53:25 kaleb $ */ /* * Copyright 1991 by OMRON Corporation *************** *** 108,114 **** #ifdef L_tmpnam #define TMPSIZ L_tmpnam #else ! #define TMPSIZ 32 /* bytes to allocate for tmpnam */ #endif #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ --- 108,118 ---- #ifdef L_tmpnam #define TMPSIZ L_tmpnam #else ! #ifdef PATH_MAX ! #define TMPSIZ PATH_MAX ! #else ! #define TMPSIZ 1024 /* bytes to allocate for tmpnam */ ! #endif #endif #define MAGIC_VALUE ((XawTextPosition) -1) /* Magic value. */ *** ./lib/Xaw/Simple.c@@/PUBLIC-LATEST Fri Feb 6 12:49:30 1998 --- xc/lib/Xaw/Simple.c Wed Jun 24 11:45:54 1998 *************** *** 1,4 **** ! /* $TOG: Simple.c /main/37 1998/02/06 12:49:34 kaleb $ */ /*********************************************************** --- 1,4 ---- ! /* $TOG: Simple.c /main/38 1998/06/24 11:53:29 kaleb $ */ /*********************************************************** *************** *** 135,150 **** WidgetClass class; { SimpleWidgetClass c = (SimpleWidgetClass) class; ! SimpleWidgetClass super = (SimpleWidgetClass) ! c->core_class.superclass; if (c->simple_class.change_sensitive == NULL) { char buf[BUFSIZ]; ! (void) sprintf(buf, ! "%s Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited.", ! c->core_class.class_name); XtWarning(buf); c->simple_class.change_sensitive = ChangeSensitive; } --- 135,159 ---- WidgetClass class; { SimpleWidgetClass c = (SimpleWidgetClass) class; ! SimpleWidgetClass super = (SimpleWidgetClass) c->core_class.superclass; if (c->simple_class.change_sensitive == NULL) { char buf[BUFSIZ]; + char* bufp; + int len; + char* fmt = "%s Widget: The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited."; ! if ((len = strlen (fmt) + strlen (c->core_class.class_name)) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! strcpy (bufp, "The Simple Widget class method 'change_sensitive' is undefined.\nA function must be defined or inherited."); ! } else ! (void) sprintf(bufp, fmt, c->core_class.class_name); XtWarning(buf); + if (bufp != buf) XtFree (bufp); c->simple_class.change_sensitive = ChangeSensitive; } *** ./lib/Xaw/SimpleMenu.c@@/PUBLIC-LATEST Wed Feb 11 14:54:29 1998 --- xc/lib/Xaw/SimpleMenu.c Wed Jun 24 11:45:58 1998 *************** *** 1,4 **** ! /* $TOG: SimpleMenu.c /main/46 1998/02/11 14:54:51 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: SimpleMenu.c /main/47 1998/06/24 11:53:33 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group *************** *** 608,613 **** --- 608,617 ---- { Widget menu; XPoint loc; + char error_buf[BUFSIZ]; + char* ebp; + int len; + char* fmt = "Xaw SimpleMenuWidget: could not find menu named: \"%s\""; if (*num_params != 1) { char error_buf[BUFSIZ]; *************** *** 614,628 **** (void) sprintf(error_buf, "%s %s", "Xaw - SimpleMenuWidget: position menu action expects only one", "parameter which is the name of the menu."); ! XtAppWarning(XtWidgetToApplicationContext(w), error_buf); return; } if ( (menu = FindMenu(w, params[0])) == NULL) { ! char error_buf[BUFSIZ]; ! (void) sprintf(error_buf, "%s '%s'", ! "Xaw - SimpleMenuWidget: could not find menu named: ", params[0]); ! XtAppWarning(XtWidgetToApplicationContext(w), error_buf); return; } --- 618,640 ---- (void) sprintf(error_buf, "%s %s", "Xaw - SimpleMenuWidget: position menu action expects only one", "parameter which is the name of the menu."); ! XtAppWarning(XtWidgetToApplicationContext(w), ! "Xaw - SimpleMenuWidget: position menu action expects only one parameter which is the name of the menu."); return; } if ( (menu = FindMenu(w, params[0])) == NULL) { ! if ((len = strlen (fmt) + strlen (params[0])) < sizeof error_buf) ! ebp = error_buf; ! else ! ebp = XtMalloc (len + 1); ! if (ebp == NULL) { ! ebp = error_buf; ! strcpy (ebp, "Xaw - SimpleMenuWidget: could not find menu"); ! } else ! (void) sprintf(ebp, fmt, params[0]); ! XtAppWarning(XtWidgetToApplicationContext(w), ebp); ! if (ebp != error_buf) XtFree (ebp); return; } *** ./lib/Xaw/SmeBSB.c@@/PUBLIC-LATEST Wed Feb 11 14:54:44 1998 --- xc/lib/Xaw/SmeBSB.c Wed Jun 24 11:46:04 1998 *************** *** 1,4 **** ! /* $TOG: SmeBSB.c /main/22 1998/02/11 14:55:05 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: SmeBSB.c /main/23 1998/06/24 11:53:39 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group *************** *** 582,587 **** --- 582,596 ---- int x, y; unsigned int width, height; char buf[BUFSIZ]; + char* bufp; + int len; + char* fmt1 = "%s Could not get %s Bitmap geometry information for menu entry \"%s\""; + char* def1 = "%s Could not get Bitmap geometry information for menu entry"; + char* fmt2 = "%s %s Bitmap of entry \"%s\" is not one bit deep"; + char* def2 = "%s Bitmap of entry is not one bit deep"; + char* Left = "Left"; + char* Right = "Right"; + char* smeobj = "Xaw SmeBSB Object:"; if (is_left) { if (entry->sme_bsb.left_bitmap != None) { *************** *** 588,603 **** if (!XGetGeometry(XtDisplayOfObject(w), entry->sme_bsb.left_bitmap, &root, &x, &y, &width, &height, &bw, &depth)) { ! (void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".", "Could not", ! "get Left Bitmap geometry information for menu entry ", ! XtName(w)); ! XtAppError(XtWidgetToApplicationContext(w), buf); } if (depth != 1) { ! (void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\"%s.", ! "Left Bitmap of entry ", ! XtName(w), " is not one bit deep."); XtAppError(XtWidgetToApplicationContext(w), buf); } entry->sme_bsb.left_bitmap_width = (Dimension) width; entry->sme_bsb.left_bitmap_height = (Dimension) height; --- 597,626 ---- if (!XGetGeometry(XtDisplayOfObject(w), entry->sme_bsb.left_bitmap, &root, &x, &y, &width, &height, &bw, &depth)) { ! if ((len = strlen (fmt1) + strlen (smeobj) + strlen (Left) + strlen (XtName (w))) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! (void) sprintf (bufp, def1, smeobj); ! } else ! (void) sprintf(bufp, fmt1, smeobj, Left, XtName(w)); ! XtAppError(XtWidgetToApplicationContext(w), bufp); ! if (bufp != buf) XtFree (bufp); } if (depth != 1) { ! if ((len = strlen (fmt2) + strlen (smeobj) + strlen (Left) + strlen (XtName (w))) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! (void) sprintf (bufp, def2, smeobj); ! } else ! (void) sprintf(buf, fmt2, smeobj, Left, XtName(w)); XtAppError(XtWidgetToApplicationContext(w), buf); + if (bufp != buf) XtFree (bufp); } entry->sme_bsb.left_bitmap_width = (Dimension) width; entry->sme_bsb.left_bitmap_height = (Dimension) height; *************** *** 607,622 **** if (!XGetGeometry(XtDisplayOfObject(w), entry->sme_bsb.right_bitmap, &root, &x, &y, &width, &height, &bw, &depth)) { ! (void) sprintf(buf, "Xaw SmeBSB Object: %s %s \"%s\".", "Could not", ! "get Right Bitmap geometry information for menu entry ", ! XtName(w)); ! XtAppError(XtWidgetToApplicationContext(w), buf); } if (depth != 1) { ! (void) sprintf(buf, "Xaw SmeBSB Object: %s \"%s\"%s.", ! "Right Bitmap of entry ", XtName(w), ! " is not one bit deep."); XtAppError(XtWidgetToApplicationContext(w), buf); } entry->sme_bsb.right_bitmap_width = (Dimension) width; entry->sme_bsb.right_bitmap_height = (Dimension) height; --- 630,659 ---- if (!XGetGeometry(XtDisplayOfObject(w), entry->sme_bsb.right_bitmap, &root, &x, &y, &width, &height, &bw, &depth)) { ! if ((len = strlen (fmt1) + strlen (smeobj) + strlen (Right) + strlen (XtName (w))) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! (void) sprintf (bufp, def1, smeobj); ! } else ! (void) sprintf(bufp, fmt1, smeobj, Right, XtName(w)); ! XtAppError(XtWidgetToApplicationContext(w), bufp); ! if (bufp != buf) XtFree (bufp); } if (depth != 1) { ! if ((len = strlen (fmt2) + strlen (smeobj) + strlen (Right) + strlen (XtName (w))) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! (void) sprintf (bufp, def2, smeobj); ! } else ! (void) sprintf(buf, fmt2, smeobj, Right, XtName(w)); XtAppError(XtWidgetToApplicationContext(w), buf); + if (bufp != buf) XtFree (bufp); } entry->sme_bsb.right_bitmap_width = (Dimension) width; entry->sme_bsb.right_bitmap_height = (Dimension) height; *************** *** 624,630 **** } /* Function Name: CreateGCs ! * Description: Creates all gc's for the simple menu widget. * Arguments: w - the simple menu widget. * Returns: none. */ --- 661,667 ---- } /* Function Name: CreateGCs ! * Description: Creates all gcs for the simple menu widget. * Arguments: w - the simple menu widget. * Returns: none. */ *************** *** 676,682 **** } /* Function Name: DestroyGCs ! * Description: Removes all gc's for the simple menu widget. * Arguments: w - the simple menu widget. * Returns: none. */ --- 713,719 ---- } /* Function Name: DestroyGCs ! * Description: Removes all gcs for the simple menu widget. * Arguments: w - the simple menu widget. * Returns: none. */ *** ./lib/Xaw/Text.c@@/PUBLIC-LATEST Fri Feb 6 12:51:55 1998 --- xc/lib/Xaw/Text.c Wed Jun 24 11:46:09 1998 *************** *** 1,4 **** ! /* $TOG: Text.c /main/199 1998/02/06 12:51:59 kaleb $ */ /*********************************************************** --- 1,4 ---- ! /* $TOG: Text.c /main/201 1998/06/24 11:53:44 kaleb $ */ /*********************************************************** *************** *** 172,182 **** }; #undef offset - #define done(address, type) \ - { toVal->size = sizeof(type); toVal->addr = (XPointer) address; } - - - /* ARGSUSED */ static void CvtStringToScrollMode(args, num_args, fromVal, toVal) --- 172,177 ---- *************** *** 188,194 **** static XawTextScrollMode scrollMode; static XrmQuark QScrollNever, QScrollAlways, QScrollWhenNeeded; XrmQuark q; ! char lowerName[BUFSIZ]; static Boolean inited = FALSE; if ( !inited ) { --- 183,189 ---- static XawTextScrollMode scrollMode; static XrmQuark QScrollNever, QScrollAlways, QScrollWhenNeeded; XrmQuark q; ! char lowerName[40]; static Boolean inited = FALSE; if ( !inited ) { *************** *** 198,215 **** inited = TRUE; } ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QScrollNever) scrollMode = XawtextScrollNever; ! else if (q == QScrollWhenNeeded) scrollMode = XawtextScrollWhenNeeded; ! else if (q == QScrollAlways) scrollMode = XawtextScrollAlways; ! else { ! done(NULL, 0); return; } ! done(&scrollMode, XawTextScrollMode); ! return; } /* ARGSUSED */ --- 193,216 ---- inited = TRUE; } ! if (strlen ((char*) fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QScrollNever) scrollMode = XawtextScrollNever; ! else if (q == QScrollWhenNeeded) scrollMode = XawtextScrollWhenNeeded; ! else if (q == QScrollAlways) scrollMode = XawtextScrollAlways; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; ! } ! toVal->size = sizeof scrollMode; ! toVal->addr = (XPointer) &scrollMode; return; } ! toVal->size = 0; ! toVal->addr = NULL; } /* ARGSUSED */ *************** *** 233,250 **** inited = TRUE; } ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QWrapNever) wrapMode = XawtextWrapNever; ! else if (q == QWrapLine) wrapMode = XawtextWrapLine; ! else if (q == QWrapWord) wrapMode = XawtextWrapWord; ! else { ! done(NULL, 0); return; } ! done(&wrapMode, XawTextWrapMode); ! return; } /* ARGSUSED */ --- 234,257 ---- inited = TRUE; } ! if (strlen ((char*) fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QWrapNever) wrapMode = XawtextWrapNever; ! else if (q == QWrapLine) wrapMode = XawtextWrapLine; ! else if (q == QWrapWord) wrapMode = XawtextWrapWord; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; ! } ! toVal->size = sizeof wrapMode; ! toVal->addr = (XPointer) &wrapMode; return; } ! toVal->size = 0; ! toVal->addr = NULL; } /* ARGSUSED */ *************** *** 258,264 **** static XawTextResizeMode resizeMode; static XrmQuark QResizeNever, QResizeWidth, QResizeHeight, QResizeBoth; XrmQuark q; ! char lowerName[BUFSIZ]; static Boolean inited = FALSE; if ( !inited ) { --- 265,271 ---- static XawTextResizeMode resizeMode; static XrmQuark QResizeNever, QResizeWidth, QResizeHeight, QResizeBoth; XrmQuark q; ! char lowerName[40]; static Boolean inited = FALSE; if ( !inited ) { *************** *** 269,291 **** inited = TRUE; } ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QResizeNever) resizeMode = XawtextResizeNever; ! else if (q == QResizeWidth) resizeMode = XawtextResizeWidth; ! else if (q == QResizeHeight) resizeMode = XawtextResizeHeight; ! else if (q == QResizeBoth) resizeMode = XawtextResizeBoth; ! else { ! done(NULL, 0); return; } ! done(&resizeMode, XawTextResizeMode); ! return; } - #undef done - static void ClassInitialize() { --- 276,302 ---- inited = TRUE; } ! if (strlen ((char*) fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QResizeNever) resizeMode = XawtextResizeNever; ! else if (q == QResizeWidth) resizeMode = XawtextResizeWidth; ! else if (q == QResizeHeight) resizeMode = XawtextResizeHeight; ! else if (q == QResizeBoth) resizeMode = XawtextResizeBoth; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; ! } ! toVal->size = sizeof resizeMode; ! toVal->addr = (XPointer) &resizeMode; return; } ! toVal->size = 0; ! toVal->addr = NULL; } static void ClassInitialize() { *************** *** 473,478 **** --- 484,512 ---- ctx->text.hbar = NULL; } + static void warn_msg (w, dir, desc) + Widget w; + char* dir; + char* desc; + { + char* fmt = "Xaw Text Widget \"%s\": %s scrolling not allowed with %s.\n%s scrolling has been DEACTIVATED."; + char error_buf[BUFSIZ]; + char* errorp; + int len; + + if ((len = strlen (fmt) + strlen (w->core.name) + 2 * strlen (dir) + strlen (desc)) < sizeof error_buf) + errorp = error_buf; + else + errorp = XtMalloc (len + 1); + + if (errorp == NULL) { + errorp = error_buf; + strcpy (errorp, "Scrolling has been DEACTIVATED"); + } else + (void) sprintf (errorp, fmt, w->core.name, dir, desc, dir); + XtAppWarning (XtWidgetToApplicationContext (w), errorp); + } + /* ARGSUSED */ static void Initialize(request, new, args, num_args) *************** *** 481,487 **** Cardinal *num_args; /* unused */ { TextWidget ctx = (TextWidget) new; ! char error_buf[BUFSIZ]; ctx->text.lt.lines = 0; ctx->text.lt.info = NULL; --- 515,521 ---- Cardinal *num_args; /* unused */ { TextWidget ctx = (TextWidget) new; ! char* Horizontal = "Horizontal"; ctx->text.lt.lines = 0; ctx->text.lt.info = NULL; *************** *** 518,527 **** if (ctx->text.scroll_vert != XawtextScrollNever) if ( (ctx->text.resize == XawtextResizeHeight) || (ctx->text.resize == XawtextResizeBoth) ) { ! (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name, ! "Vertical scrolling not allowed with height resize.\n", ! "Vertical scrolling has been DEACTIVATED."); ! XtAppWarning(XtWidgetToApplicationContext(new), error_buf); ctx->text.scroll_vert = XawtextScrollNever; } else if (ctx->text.scroll_vert == XawtextScrollAlways) --- 552,558 ---- if (ctx->text.scroll_vert != XawtextScrollNever) if ( (ctx->text.resize == XawtextResizeHeight) || (ctx->text.resize == XawtextResizeBoth) ) { ! warn_msg (ctx, "Vertical", "height resize"); ctx->text.scroll_vert = XawtextScrollNever; } else if (ctx->text.scroll_vert == XawtextScrollAlways) *************** *** 529,546 **** if (ctx->text.scroll_horiz != XawtextScrollNever) if (ctx->text.wrap != XawtextWrapNever) { ! (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name, ! "Horizontal scrolling not allowed with wrapping active.\n", ! "Horizontal scrolling has been DEACTIVATED."); ! XtAppWarning(XtWidgetToApplicationContext(new), error_buf); ctx->text.scroll_horiz = XawtextScrollNever; } else if ( (ctx->text.resize == XawtextResizeWidth) || (ctx->text.resize == XawtextResizeBoth) ) { ! (void) sprintf(error_buf, "Xaw Text Widget %s:\n %s %s.", ctx->core.name, ! "Horizontal scrolling not allowed with width resize.\n", ! "Horizontal scrolling has been DEACTIVATED."); ! XtAppWarning(XtWidgetToApplicationContext(new), error_buf); ctx->text.scroll_horiz = XawtextScrollNever; } else if (ctx->text.scroll_horiz == XawtextScrollAlways) --- 560,571 ---- if (ctx->text.scroll_horiz != XawtextScrollNever) if (ctx->text.wrap != XawtextWrapNever) { ! warn_msg (ctx, Horizontal, "wrapping active"); ctx->text.scroll_horiz = XawtextScrollNever; } else if ( (ctx->text.resize == XawtextResizeWidth) || (ctx->text.resize == XawtextResizeBoth) ) { ! warn_msg (ctx, Horizontal, "width resize"); ctx->text.scroll_horiz = XawtextScrollNever; } else if (ctx->text.scroll_horiz == XawtextScrollAlways) *** ./lib/Xaw/TextPop.c@@/PUBLIC-LATEST Fri Feb 6 12:51:05 1998 --- xc/lib/Xaw/TextPop.c Wed Jun 24 11:46:19 1998 *************** *** 1,4 **** ! /* $TOG: TextPop.c /main/33 1998/02/06 12:51:09 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: TextPop.c /main/34 1998/06/24 11:53:54 kaleb $ */ /* *************** *** 63,77 **** extern int errno; #endif ! #define INSERT_FILE ("Enter Filename:") ! ! #define SEARCH_LABEL_1 ("Use to change fields.") ! #define SEARCH_LABEL_2 ("Use ^q for .") ! #define DISMISS_NAME ("cancel") #define DISMISS_NAME_LEN 6 ! #define FORM_NAME ("form") ! #define LABEL_NAME ("label") ! #define TEXT_NAME ("text") #define R_OFFSET 1 --- 63,76 ---- extern int errno; #endif ! static char* INSERT_FILE = "Enter Filename:"; ! static char* SEARCH_LABEL_1 = "Use to change fields."; ! static char* SEARCH_LABEL_2 = "Use ^q for ."; ! static char* DISMISS_NAME = "cancel"; #define DISMISS_NAME_LEN 6 ! static char* FORM_NAME = "form"; ! static char* LABEL_NAME = "label"; ! static char* TEXT_NAME = "text"; #define R_OFFSET 1 *************** *** 799,805 **** DoSearch(search) struct SearchAndReplace * search; { - char msg[BUFSIZ]; Widget tw = XtParent(search->search_popup); XawTextPosition pos; XawTextScanDirection dir; --- 798,803 ---- *************** *** 823,844 **** /* The Raw string in find.ptr may be WC I can't use here, so I re - call GetString to get a tame version. */ ! if (pos == XawTextSearchError) ! (void) sprintf( msg, "Could not find string ``%s''.", GetString( search->search_text ) ); ! else { ! if (dir == XawsdRight) ! XawTextSetInsertionPoint( tw, pos + text.length); ! else ! XawTextSetInsertionPoint( tw, pos); ! ! XawTextSetSelection( tw, pos, pos + text.length); ! search->selection_changed = FALSE; /* selection is good. */ ! return(TRUE); } ! ! XawTextUnsetSelection(tw); ! SetSearchLabels(search, msg, "", TRUE); ! return(FALSE); } /************************************************************ --- 821,852 ---- /* The Raw string in find.ptr may be WC I can't use here, so I re - call GetString to get a tame version. */ ! if (pos == XawTextSearchError) { ! char msgbuf[BUFSIZ]; ! char* msg; ! char* fmt = "Could not find string \"%s\""; ! int len = strlen (fmt) + strlen (GetString (search->search_text)); ! ! if (len < sizeof msgbuf) msg = msgbuf; ! else msg = XtMalloc (len + 1); ! if (msg == NULL) { ! msg = msgbuf; ! strcpy (msg, "Could not find string."); ! } else ! (void) sprintf (msg, fmt, GetString (search->search_text)); ! XawTextUnsetSelection(tw); ! SetSearchLabels(search, msg, "", TRUE); ! if (msg != msgbuf) XtFree (msg); ! return FALSE; } ! if (dir == XawsdRight) ! XawTextSetInsertionPoint( tw, pos + text.length); ! else ! XawTextSetInsertionPoint( tw, pos); ! ! XawTextSetSelection( tw, pos, pos + text.length); ! search->selection_changed = FALSE; /* selection is good. */ ! return TRUE; } /************************************************************ *************** *** 963,977 **** if ( (new_pos == XawTextSearchError) ) { if (count == 0) { ! char msg[BUFSIZ]; ! /* The Raw string in find.ptr may be WC I can't use here, ! so I call GetString to get a tame version.*/ ! ! (void) sprintf( msg, "%s %s %s", "*** Error: Could not find string ``", ! GetString( search->search_text ), "''. ***"); SetSearchLabels(search, msg, "", TRUE); ! return(FALSE); } else break; --- 971,992 ---- if ( (new_pos == XawTextSearchError) ) { if (count == 0) { ! char msgbuf[BUFSIZ]; ! char* msg; ! int len; ! char* fmt = "*** Error: Could not find string \"%s\" ***"; ! len = strlen (fmt) + strlen (GetString (search->search_text)); ! if (len < sizeof msgbuf) msg = msgbuf; ! else msg = XtMalloc (len + 1); ! if (msg == NULL) { ! msg = msgbuf; ! strcpy (msg, "*** Error: Could not find string. ***"); ! } else ! (void) sprintf (msg, fmt, GetString (search->search_text)); SetSearchLabels(search, msg, "", TRUE); ! if (msg != msgbuf) XtFree (msg); ! return FALSE; } else break; *************** *** 992,1002 **** } if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { ! char msg[BUFSIZ]; ! ! (void) sprintf( msg, "'%s' with '%s'. ***", find.ptr, replace.ptr); SetSearchLabels(search, "*** Error while replacing", msg, TRUE); ! return(FALSE); } if (dir == XawsdRight) --- 1007,1028 ---- } if (XawTextReplace(tw, pos, end_pos, &replace) != XawEditDone) { ! char msgbuf[BUFSIZ]; ! char* msg; ! int len; ! char* fmt = "'%s' with '%s'. ***"; ! ! len = strlen (fmt) + strlen (find.ptr) + strlen (replace.ptr); ! if (len < sizeof msgbuf) msg = msgbuf; ! else msg = XtMalloc (len + 1); ! if (msg == NULL) { ! msg = msgbuf; ! strcpy (msg, "long strings"); ! } else ! (void) sprintf( msg, fmt, find.ptr, replace.ptr); SetSearchLabels(search, "*** Error while replacing", msg, TRUE); ! if (msg != msgbuf) XtFree (msg); ! return FALSE; } if (dir == XawsdRight) *************** *** 1019,1025 **** else XawTextSetSelection( tw, pos, pos + replace.length); ! return(TRUE); } /* Function Name: SetSearchLabels --- 1045,1051 ---- else XawTextSetSelection( tw, pos, pos + replace.length); ! return TRUE; } /* Function Name: SetSearchLabels *************** *** 1146,1159 **** { Widget temp_widget; char buf[BUFSIZ]; ! (void) sprintf(buf, "%s.%s", FORM_NAME, name); ! if ( (temp_widget = XtNameToWidget(shell, buf)) != NULL) { SetResource(temp_widget, res_name, value); ! return(TRUE); } ! return(FALSE); } /* Function Name: SetResource --- 1172,1194 ---- { Widget temp_widget; char buf[BUFSIZ]; + char* bufp; + int len = strlen (FORM_NAME) + strlen (name) + 1; + Boolean ret = FALSE; ! if (len < sizeof buf) bufp = buf; ! else bufp = XtMalloc (len + 1); ! if (bufp == NULL) return FALSE; ! ! (void) sprintf(bufp, "%s.%s", FORM_NAME, name); ! ! if ( (temp_widget = XtNameToWidget(shell, bufp)) != NULL) { SetResource(temp_widget, res_name, value); ! ret = TRUE; } ! if (bufp != buf) XtFree (bufp); ! return ret; } /* Function Name: SetResource *** ./lib/Xaw/TextSrc.c@@/PUBLIC-LATEST Wed Feb 11 14:55:22 1998 --- xc/lib/Xaw/TextSrc.c Mon May 25 08:17:43 1998 *************** *** 1,4 **** ! /* $TOG: TextSrc.c /main/17 1998/02/11 14:55:43 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: TextSrc.c /main/21 1998/05/25 08:17:30 kaleb $ */ /* Copyright 1989, 1994, 1998 The Open Group *************** *** 294,302 **** } - #define done(address, type) \ - { toVal->size = sizeof(type); toVal->addr = (XPointer) address; } - /* ARGSUSED */ static void CvtStringToEditMode(args, num_args, fromVal, toVal) --- 294,299 ---- *************** *** 308,314 **** static XawTextEditType editType; static XrmQuark QRead, QAppend, QEdit; XrmQuark q; ! char lowerName[BUFSIZ]; static Boolean inited = FALSE; if ( !inited ) { --- 305,311 ---- static XawTextEditType editType; static XrmQuark QRead, QAppend, QEdit; XrmQuark q; ! char lowerName[40]; static Boolean inited = FALSE; if ( !inited ) { *************** *** 318,335 **** inited = TRUE; } ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QRead) editType = XawtextRead; ! else if (q == QAppend) editType = XawtextAppend; ! else if (q == QEdit) editType = XawtextEdit; ! else { ! done(NULL, 0); return; } ! done(&editType, XawTextEditType); ! return; } --- 315,338 ---- inited = TRUE; } ! if (strlen ((char*) fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered (lowerName, (char *)fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == QRead) editType = XawtextRead; ! else if (q == QAppend) editType = XawtextAppend; ! else if (q == QEdit) editType = XawtextEdit; ! else { ! toVal->size = 0; ! toVal->addr = NULL; ! return; ! } ! toVal->size = sizeof editType; ! toVal->addr = (XPointer) &editType; return; } ! toVal->size = 0; ! toVal->addr = NULL; } *************** *** 654,663 **** *len_in_out = 0; return (NULL); } ! wstr = wlist[0]; *len_in_out = wcslen(wstr); ! XtFree((XtPointer)wlist); ! return(wstr); } } --- 657,673 ---- *len_in_out = 0; return (NULL); } ! wstr = (wchar_t *) XtMalloc((wcslen(wlist[0]) + 1) * sizeof(wchar_t)); ! if (wstr == (wchar_t *) NULL) { ! XwcFreeStringList(wlist); ! XtErrorMsg("convertError", "multiSourceCreate", "XawError", ! "No Memory", NULL, NULL); ! *len_in_out = 0; ! return (NULL); /* The above function doesn't really return. */ ! } ! wcscpy(wstr, wlist[0]); *len_in_out = wcslen(wstr); ! XwcFreeStringList(wlist); } } *** ./lib/Xdmcp/DAofA8.c@@/PUBLIC-LATEST Fri Feb 6 14:39:20 1998 --- xc/lib/Xdmcp/DAofA8.c Thu Jun 25 16:18:08 1998 *************** *** 1,5 **** /* ! * $TOG: DAofA8.c /main/6 1998/02/06 14:39:25 kaleb $ * * Copyright 1989, 1998 The Open Group --- 1,5 ---- /* ! * $TOG: DAofA8.c /main/7 1998/06/25 16:26:01 kaleb $ * * Copyright 1989, 1998 The Open Group *************** *** 36,42 **** for (i = 0; i < (int)array->length; i++) XdmcpDisposeARRAY8 (&array->data[i]); ! if (array->data) Xfree (array->data); array->length = 0; array->data = NULL; } --- 36,42 ---- for (i = 0; i < (int)array->length; i++) XdmcpDisposeARRAY8 (&array->data[i]); ! if (array->data != NULL) Xfree (array->data); array->length = 0; array->data = NULL; } *** ./lib/Xdmcp/RA16.c@@/PUBLIC-LATEST Fri Feb 6 14:39:54 1998 --- xc/lib/Xdmcp/RA16.c Thu Jun 25 16:18:37 1998 *************** *** 1,5 **** /* ! * $TOG: RA16.c /main/6 1998/02/06 14:39:59 kaleb $ * * Copyright 1989, 1998 The Open Group --- 1,5 ---- /* ! * $TOG: RA16.c /main/7 1998/06/25 16:26:16 kaleb $ * * Copyright 1989, 1998 The Open Group *************** *** 51,56 **** --- 51,57 ---- { Xfree (array->data); array->data = NULL; + array->length = 0; return FALSE; } } *** ./lib/Xdmcp/RA32.c@@/PUBLIC-LATEST Fri Feb 6 14:39:59 1998 --- xc/lib/Xdmcp/RA32.c Thu Jun 25 16:18:42 1998 *************** *** 1,5 **** /* ! * $TOG: RA32.c /main/6 1998/02/06 14:40:04 kaleb $ * * Copyright 1989, 1998 The Open Group --- 1,5 ---- /* ! * $TOG: RA32.c /main/7 1998/06/25 16:26:21 kaleb $ * * Copyright 1989, 1998 The Open Group *************** *** 51,56 **** --- 51,57 ---- { Xfree (array->data); array->data = NULL; + array->length = 0; return FALSE; } } *** ./lib/Xdmcp/RA8.c@@/PUBLIC-LATEST Fri Feb 6 14:40:04 1998 --- xc/lib/Xdmcp/RA8.c Thu Jun 25 16:18:33 1998 *************** *** 1,5 **** /* ! * $TOG: RA8.c /main/6 1998/02/06 14:40:09 kaleb $ * * Copyright 1989, 1998 The Open Group --- 1,5 ---- /* ! * $TOG: RA8.c /main/7 1998/06/25 16:26:12 kaleb $ * * Copyright 1989, 1998 The Open Group *************** *** 51,56 **** --- 51,57 ---- { Xfree (array->data); array->data = NULL; + array->length = 0; return FALSE; } } *** ./lib/Xdmcp/RAofA8.c@@/PUBLIC-LATEST Fri Feb 6 14:40:29 1998 --- xc/lib/Xdmcp/RAofA8.c Thu Jun 25 16:18:28 1998 *************** *** 1,5 **** /* ! * $TOG: RAofA8.c /main/6 1998/02/06 14:40:35 kaleb $ * * Copyright 1989, 1998 The Open Group --- 1,5 ---- /* ! * $TOG: RAofA8.c /main/7 1998/06/25 16:26:07 kaleb $ * * Copyright 1989, 1998 The Open Group *************** *** 51,56 **** --- 51,57 ---- { Xfree (array->data); array->data = NULL; + array->length = 0; return FALSE; } } *** ./lib/Xi/XExtInt.c@@/PUBLIC-LATEST Fri Feb 6 15:02:38 1998 --- xc/lib/Xi/XExtInt.c Thu Apr 30 15:47:30 1998 *************** *** 1,4 **** ! /* $TOG: XExtInt.c /main/33 1998/02/06 15:02:43 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XExtInt.c /main/34 1998/04/30 15:52:09 kaleb $ */ /************************************************************ *************** *** 124,130 **** * */ ! _xibaddevice (dpy, error) Display *dpy; int *error; { --- 124,130 ---- * */ ! void _xibaddevice (dpy, error) Display *dpy; int *error; { *************** *** 132,138 **** *error = info->codes->first_error + XI_BadDevice; } ! _xibadclass (dpy, error) Display *dpy; int *error; { --- 132,138 ---- *error = info->codes->first_error + XI_BadDevice; } ! void _xibadclass (dpy, error) Display *dpy; int *error; { *************** *** 140,146 **** *error = info->codes->first_error + XI_BadClass; } ! _xibadevent (dpy, error) Display *dpy; int *error; { --- 140,146 ---- *error = info->codes->first_error + XI_BadClass; } ! void _xibadevent (dpy, error) Display *dpy; int *error; { *************** *** 148,154 **** *error = info->codes->first_error + XI_BadEvent; } ! _xibadmode (dpy, error) Display *dpy; int *error; { --- 148,154 ---- *error = info->codes->first_error + XI_BadEvent; } ! void _xibadmode (dpy, error) Display *dpy; int *error; { *************** *** 156,162 **** *error = info->codes->first_error + XI_BadMode; } ! _xidevicebusy (dpy, error) Display *dpy; int *error; { --- 156,162 ---- *error = info->codes->first_error + XI_BadMode; } ! void _xidevicebusy (dpy, error) Display *dpy; int *error; { *************** *** 293,300 **** ev->is_hint = ev2->detail; ev->deviceid = ev2->deviceid & DEVICE_BITS; return (DONT_ENQUEUE); - break; } case XI_DeviceKeyPress: case XI_DeviceKeyRelease: { --- 293,300 ---- ev->is_hint = ev2->detail; ev->deviceid = ev2->deviceid & DEVICE_BITS; return (DONT_ENQUEUE); } + break; case XI_DeviceKeyPress: case XI_DeviceKeyRelease: { *************** *** 320,327 **** *re = *save; return (ENQUEUE_EVENT); } - break; } case XI_DeviceButtonPress: case XI_DeviceButtonRelease: { --- 320,327 ---- *re = *save; return (ENQUEUE_EVENT); } } + break; case XI_DeviceButtonPress: case XI_DeviceButtonRelease: { *************** *** 347,354 **** *re = *save; return (ENQUEUE_EVENT); } - break; } case XI_ProximityIn: case XI_ProximityOut: { --- 347,354 ---- *re = *save; return (ENQUEUE_EVENT); } } + break; case XI_ProximityIn: case XI_ProximityOut: { *************** *** 374,381 **** *re = *save; return (ENQUEUE_EVENT); } - break; } case XI_DeviceValuator: { deviceValuator *xev = (deviceValuator *) event; --- 374,381 ---- *re = *save; return (ENQUEUE_EVENT); } } + break; case XI_DeviceValuator: { deviceValuator *xev = (deviceValuator *) event; *************** *** 482,489 **** } *re = *save; return (ENQUEUE_EVENT); - break; } case XI_DeviceFocusIn: case XI_DeviceFocusOut: { --- 482,489 ---- } *re = *save; return (ENQUEUE_EVENT); } + break; case XI_DeviceFocusIn: case XI_DeviceFocusOut: { *************** *** 498,505 **** ev->detail = fev->detail; ev->deviceid = fev->deviceid & DEVICE_BITS; return (ENQUEUE_EVENT); - break; } case XI_DeviceStateNotify: { XDeviceStateNotifyEvent *stev = --- 498,505 ---- ev->detail = fev->detail; ev->deviceid = fev->deviceid & DEVICE_BITS; return (ENQUEUE_EVENT); } + break; case XI_DeviceStateNotify: { XDeviceStateNotifyEvent *stev = *************** *** 555,562 **** stev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } - break; } case XI_DeviceKeystateNotify: { int i; --- 555,562 ---- stev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } } + break; case XI_DeviceKeystateNotify: { int i; *************** *** 585,592 **** kstev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } - break; } case XI_DeviceButtonstateNotify: { int i; --- 585,592 ---- kstev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } } + break; case XI_DeviceButtonstateNotify: { int i; *************** *** 616,623 **** bstev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } - break; } case XI_DeviceMappingNotify: { register XDeviceMappingEvent *ev = (XDeviceMappingEvent *) re; --- 616,623 ---- bstev = (XDeviceStateNotifyEvent *) re; return (ENQUEUE_EVENT); } } + break; case XI_DeviceMappingNotify: { register XDeviceMappingEvent *ev = (XDeviceMappingEvent *) re; *************** *** 632,637 **** --- 632,638 ---- ev->deviceid = ev2->deviceid & DEVICE_BITS; return (ENQUEUE_EVENT); } + break; case XI_ChangeDeviceNotify: { register XChangeDeviceNotifyEvent *ev = *************** *** 645,650 **** --- 646,652 ---- ev->deviceid = ev2->deviceid & DEVICE_BITS; return (ENQUEUE_EVENT); } + break; default: printf ("XInputWireToEvent: UNKNOWN WIRE EVENT! type=%d\n",type); break; *** ./lib/Xi/XGMotion.c@@/PUBLIC-LATEST Fri Feb 6 15:03:38 1998 --- xc/lib/Xi/XGMotion.c Thu Apr 30 15:47:38 1998 *************** *** 1,4 **** ! /* $TOG: XGMotion.c /main/14 1998/02/06 15:03:44 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XGMotion.c /main/15 1998/04/30 15:52:14 kaleb $ */ /************************************************************ *************** *** 129,135 **** return ((XDeviceTimeCoord *) bufp); } ! XFreeDeviceMotionEvents (events) XDeviceTimeCoord *events; { XFree ((char *)events); --- 129,135 ---- return ((XDeviceTimeCoord *) bufp); } ! void XFreeDeviceMotionEvents (events) XDeviceTimeCoord *events; { XFree ((char *)events); *** ./lib/Xi/XGetDCtl.c@@/PUBLIC-LATEST Fri Feb 6 15:03:01 1998 --- xc/lib/Xi/XGetDCtl.c Thu Apr 30 15:47:43 1998 *************** *** 1,4 **** ! /* $TOG: XGetDCtl.c /main/5 1998/02/06 15:03:06 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XGetDCtl.c /main/6 1998/04/30 15:52:19 kaleb $ */ /************************************************************ *************** *** 160,166 **** return (Sav); } ! XFreeDeviceControl (control) XDeviceControl *control; { XFree (control); --- 160,166 ---- return (Sav); } ! void XFreeDeviceControl (control) XDeviceControl *control; { XFree (control); *** ./lib/Xi/XGetFCtl.c@@/PUBLIC-LATEST Fri Feb 6 15:03:06 1998 --- xc/lib/Xi/XGetFCtl.c Thu Apr 30 15:47:47 1998 *************** *** 1,4 **** ! /* $TOG: XGetFCtl.c /main/14 1998/02/06 15:03:11 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XGetFCtl.c /main/15 1998/04/30 15:52:23 kaleb $ */ /************************************************************ *************** *** 260,266 **** return (Sav); } ! XFreeFeedbackList (list) XFeedbackState *list; { XFree ((char *)list); --- 260,266 ---- return (Sav); } ! void XFreeFeedbackList (list) XFeedbackState *list; { XFree ((char *)list); *** ./lib/Xi/XListDev.c@@/PUBLIC-LATEST Fri Feb 6 15:04:11 1998 --- xc/lib/Xi/XListDev.c Thu Apr 30 15:47:51 1998 *************** *** 1,4 **** ! /* $TOG: XListDev.c /main/21 1998/02/06 15:04:17 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XListDev.c /main/22 1998/04/30 15:52:28 kaleb $ */ /************************************************************ *************** *** 243,249 **** * */ ! XFreeDeviceList (list) XDeviceInfo *list; { if (list != NULL) --- 243,249 ---- * */ ! void XFreeDeviceList (list) XDeviceInfo *list; { if (list != NULL) *** ./lib/Xi/XQueryDv.c@@/PUBLIC-LATEST Fri Feb 6 15:04:23 1998 --- xc/lib/Xi/XQueryDv.c Thu Apr 30 15:47:56 1998 *************** *** 1,4 **** ! /* $TOG: XQueryDv.c /main/12 1998/02/06 15:04:28 kaleb $ */ /************************************************************ --- 1,4 ---- ! /* $TOG: XQueryDv.c /main/13 1998/04/30 15:52:32 kaleb $ */ /************************************************************ *************** *** 185,191 **** return (state); } ! XFreeDeviceState (list) XDeviceState *list; { XFree ((char *)list); --- 185,191 ---- return (state); } ! void XFreeDeviceState (list) XDeviceState *list; { XFree ((char *)list); *** ./lib/Xmu/EditresCom.c@@/PUBLIC-LATEST Fri Feb 6 15:43:09 1998 --- xc/lib/Xmu/EditresCom.c Tue Jun 23 11:42:59 1998 *************** *** 1,4 **** ! /* $TOG: EditresCom.c /main/35 1998/02/06 15:43:14 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: EditresCom.c /main/37 1998/06/23 11:50:49 kaleb $ */ /* *************** *** 832,857 **** Cardinal * num_params; { SVErrorInfo * info = &globals.error_info; char buf[BUFSIZ]; ! if ( streq(name, "unknownType") ) ! sprintf(buf, "The `%s' resource is not used by this widget.", ! info->event->name); ! else if ( streq(name, "noColormap") ) ! sprintf(buf, msg, params[0]); ! else if (streq(name, "conversionFailed") || streq(name, "conversionError")) ! { ! if (streq(info->event->value, XtRString)) ! sprintf(buf, ! "Could not convert the string '%s' for the `%s' resource.", ! info->event->value, info->event->name); else ! sprintf(buf, "Could not convert the `%s' resource.", ! info->event->name); } - else - sprintf(buf, "Name: %s, Type: %s, Class: %s, Msg: %s", - name, type, class, msg); /* * Insert this info into the protocol stream, and update the count. --- 832,899 ---- Cardinal * num_params; { SVErrorInfo * info = &globals.error_info; + int len; char buf[BUFSIZ]; + char* bufp; + char* fmt1 = "The `%s' resource is not used by this widget."; ! if ( streq(name, "unknownType") ) { ! if ((len = strlen (fmt1) + strlen (info->event->name)) < sizeof buf) ! bufp = buf; else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! strcpy (bufp, "Resource is not used by this widget."); ! } else ! sprintf(bufp, fmt1, info->event->name); ! } else if ( streq(name, "noColormap") ) { ! if ((len = strlen (msg) + strlen (params[0])) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! strcpy (bufp, "Message too long."); ! } else ! sprintf(bufp, msg, params[0]); ! } else if (streq(name, "conversionFailed") || streq(name, "conversionError")) { ! char* fmt2 = "Could not convert the string '%s' for the `%s' resource."; ! char* fmt3 = "Could not convert the `%s' resource."; ! if (streq(info->event->value, XtRString)) { ! if ((len = strlen (fmt2) + strlen (info->event->value) + strlen (info->event->name)) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! strcpy (bufp, "Could not convert the string for the resource."); ! } else ! sprintf(bufp, fmt2, info->event->value, info->event->name); ! } else { ! if ((len = strlen (fmt3) + strlen (info->event->name)) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! strcpy (bufp, "Could not convert the resource."); ! } else ! sprintf(bufp, fmt3, info->event->name); ! } ! } else { ! char* fmt4 = "Name: %s, Type: %s, Class: %s, Msg: %s"; ! ! if ((len = strlen (fmt4) + strlen (name) + strlen (type) + strlen (class) + strlen (msg)) < sizeof buf) ! bufp = buf; ! else ! bufp = XtMalloc (len + 1); ! if (bufp == NULL) { ! bufp = buf; ! strcpy (bufp, "Message too long."); ! } else ! sprintf(bufp, fmt4, name, type, class, msg); } /* * Insert this info into the protocol stream, and update the count. *************** *** 859,865 **** (*(info->count))++; _XEditResPutWidgetInfo(info->stream, info->entry); ! _XEditResPutString8(info->stream, buf); } /* Function Name: ExecuteSetValues --- 901,908 ---- (*(info->count))++; _XEditResPutWidgetInfo(info->stream, info->entry); ! _XEditResPutString8(info->stream, bufp); ! if (bufp != buf) XtFree (bufp); } /* Function Name: ExecuteSetValues *************** *** 1765,1773 **** XrmValue * from_val, * to_val; XtPointer * converter_data; { ! char ptr[BUFSIZ]; static EditresBlock block; XmuCopyISOLatin1Lowered(ptr, from_val->addr); if (streq(ptr, "none")) --- 1808,1822 ---- XrmValue * from_val, * to_val; XtPointer * converter_data; { ! char ptr[40]; static EditresBlock block; + if (strlen ((char*)from_val->addr) >= sizeof ptr) { + to_val->size = 0; + to_val->addr = NULL; + return FALSE; + } + XmuCopyISOLatin1Lowered(ptr, from_val->addr); if (streq(ptr, "none")) *************** *** 1785,1797 **** "CvtStringToBlock", "unknownValue", "EditresError", "Could not convert string \"%s\" to EditresBlock.", params, &num_params); ! return(FALSE); } if (to_val->addr != NULL) { if (to_val->size < sizeof(EditresBlock)) { to_val->size = sizeof(EditresBlock); ! return(FALSE); } *(EditresBlock *)(to_val->addr) = block; } --- 1834,1846 ---- "CvtStringToBlock", "unknownValue", "EditresError", "Could not convert string \"%s\" to EditresBlock.", params, &num_params); ! return FALSE; } if (to_val->addr != NULL) { if (to_val->size < sizeof(EditresBlock)) { to_val->size = sizeof(EditresBlock); ! return FALSE; } *(EditresBlock *)(to_val->addr) = block; } *************** *** 1798,1805 **** else to_val->addr = (XtPointer) block; ! to_val->size = sizeof(EditresBlock); ! return(TRUE); } #define XtREditresBlock ("EditresBlock") --- 1847,1854 ---- else to_val->addr = (XtPointer) block; ! to_val->size = sizeof block; ! return TRUE; } #define XtREditresBlock ("EditresBlock") *** ./lib/Xmu/LocBitmap.c@@/PUBLIC-LATEST Fri Feb 6 15:44:09 1998 --- xc/lib/Xmu/LocBitmap.c Wed Jun 24 10:10:23 1998 *************** *** 1,4 **** ! /* $TOG: LocBitmap.c /main/20 1998/02/06 15:44:14 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: LocBitmap.c /main/22 1998/06/24 10:18:20 kaleb $ */ /* *************** *** 31,36 **** --- 31,42 ---- #include #include #include + #ifndef X_NOT_STDC_ENV + #include + #else + extern char* malloc(); + extern void free(); + #endif #ifndef X_NOT_POSIX #ifdef _POSIX_SOURCE *************** *** 106,120 **** int *widthp, *heightp, *xhotp, *yhotp; /* RETURN */ #endif { Display *dpy = DisplayOfScreen (screen); Window root = RootWindowOfScreen (screen); Bool try_plain_name = True; XmuCvtCache *cache = _XmuCCLookupDisplay (dpy); char **file_paths = (char **) NULL; ! char filename[PATH_MAX]; unsigned int width, height; int xhot, yhot; ! int i; /* * look in cache for bitmap path --- 112,133 ---- int *widthp, *heightp, *xhotp, *yhotp; /* RETURN */ #endif { + + #ifndef BITMAPDIR + #define BITMAPDIR "/usr/include/X11/bitmaps" + #endif + Display *dpy = DisplayOfScreen (screen); Window root = RootWindowOfScreen (screen); Bool try_plain_name = True; XmuCvtCache *cache = _XmuCCLookupDisplay (dpy); char **file_paths = (char **) NULL; ! char filenamebuf[PATH_MAX]; ! char* filename; ! char* bitmapdir = BITMAPDIR; unsigned int width, height; int xhot, yhot; ! int i, tmp; /* * look in cache for bitmap path *************** *** 144,150 **** file_paths = cache->string_to_bitmap.bitmapFilePath; } - /* * Search order: * 1. name if it begins with / or ./ --- 157,162 ---- *************** *** 153,164 **** * 4. name if didn't begin with / or . */ - #ifndef BITMAPDIR - #define BITMAPDIR "/usr/include/X11/bitmaps" - #endif - for (i = 1; i <= 4; i++) { ! char *fn = filename; Pixmap pixmap; unsigned char *data; --- 165,172 ---- * 4. name if didn't begin with / or . */ for (i = 1; i <= 4; i++) { ! char *fn; Pixmap pixmap; unsigned char *data; *************** *** 170,176 **** --- 178,188 ---- try_plain_name = False; break; case 2: + fn = filename; if (file_paths && *file_paths) { + tmp = strlen (*file_paths) + strlen (name) + 1; + if (tmp < sizeof filenamebuf) filename = filenamebuf; + else filename = malloc (tmp + 1); sprintf (filename, "%s/%s", *file_paths, name); file_paths++; i--; *************** *** 178,184 **** } continue; case 3: ! sprintf (filename, "%s/%s", BITMAPDIR, name); break; case 4: if (!try_plain_name) continue; --- 190,200 ---- } continue; case 3: ! fn = filename; ! tmp = strlen (bitmapdir) + strlen (name) + 1; ! if (tmp < sizeof filenamebuf) filename = filenamebuf; ! else filename = malloc (tmp + 1); ! sprintf (filename, "%s/%s", bitmapdir, name); break; case 4: if (!try_plain_name) continue; *************** *** 195,200 **** --- 211,217 ---- fore, back, depth); XFree ((char *)data); } + if (filename != filenamebuf) free (filename); if (pixmap) { if (widthp) *widthp = (int)width; *** ./lib/Xmu/StrToBS.c@@/PUBLIC-LATEST Fri Feb 6 15:45:21 1998 --- xc/lib/Xmu/StrToBS.c Thu May 14 14:50:59 1998 *************** *** 1,4 **** ! /* $TOG: StrToBS.c /main/6 1998/02/06 15:45:26 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: StrToBS.c /main/7 1998/05/14 14:56:19 kaleb $ */ /* *************** *** 37,43 **** XrmValuePtr fromVal; XrmValuePtr toVal; { ! char lowerString[1024]; XrmQuark q; static int backingStoreType; static XrmQuark XtQEnotUseful, XtQEwhenMapped, XtQEalways, XtQEdefault; --- 37,43 ---- XrmValuePtr fromVal; XrmValuePtr toVal; { ! char lowerString[40]; XrmQuark q; static int backingStoreType; static XrmQuark XtQEnotUseful, XtQEwhenMapped, XtQEalways, XtQEdefault; *************** *** 56,61 **** --- 56,63 ---- XtQEdefault = XrmStringToQuark(lowerString); haveQuarks = 1; } + if (strlen ((char*)fromVal->addr) >= sizeof lowerString) + XtStringConversionWarning((char *) fromVal->addr, "BackingStore"); XmuCopyISOLatin1Lowered (lowerString, (char *) fromVal->addr); q = XrmStringToQuark (lowerString); if (q == XtQEnotUseful) { *** ./lib/Xmu/StrToCurs.c@@/PUBLIC-LATEST Fri Feb 6 15:45:26 1998 --- xc/lib/Xmu/StrToCurs.c Wed Jun 24 14:59:42 1998 *************** *** 1,4 **** ! /* $TOG: StrToCurs.c /main/22 1998/02/06 15:45:31 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: StrToCurs.c /main/23 1998/06/24 15:07:36 kaleb $ */ /* *************** *** 142,147 **** --- 142,148 ---- if (0 == strncmp(FONTSPECIFIER, name, strlen(FONTSPECIFIER))) { char source_name[PATH_MAX], mask_name[PATH_MAX]; + char fmtstr[1024]; int source_char, mask_char, fields; Font source_font, mask_font; XrmValue fromString, toFont; *************** *** 152,158 **** Cardinal num; #endif ! fields = sscanf(name, "FONT %s %d %s %d", source_name, &source_char, mask_name, &mask_char); if (fields < 2) { --- 153,162 ---- Cardinal num; #endif ! sprintf (fmtstr, "FONT %%%ds %%d %%%ds %%d", ! sizeof source_name - 1, sizeof mask_name - 1); ! ! fields = sscanf(name, fmtstr, source_name, &source_char, mask_name, &mask_char); if (fields < 2) { *** ./lib/Xmu/StrToJust.c@@/PUBLIC-LATEST Fri Feb 6 15:45:38 1998 --- xc/lib/Xmu/StrToJust.c Thu May 14 14:51:03 1998 *************** *** 1,4 **** ! /* $TOG: StrToJust.c /main/10 1998/02/06 15:45:44 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: StrToJust.c /main/11 1998/05/14 14:56:23 kaleb $ */ /* *************** *** 41,47 **** static int haveQuarks; XrmQuark q; char *s = (char *) fromVal->addr; ! char lowerName[1000]; if (s == NULL) return; --- 41,47 ---- static int haveQuarks; XrmQuark q; char *s = (char *) fromVal->addr; ! char lowerName[40]; if (s == NULL) return; *************** *** 52,67 **** haveQuarks = 1; } ! XmuCopyISOLatin1Lowered(lowerName, s); ! q = XrmStringToQuark(lowerName); ! toVal->size = sizeof(XtJustify); ! toVal->addr = (XPointer) &e; ! if (q == XrmQEleft) { e = XtJustifyLeft; return; } ! if (q == XrmQEcenter) { e = XtJustifyCenter; return; } ! if (q == XrmQEright) { e = XtJustifyRight; return; } toVal->size = 0; toVal->addr = NULL; --- 52,70 ---- haveQuarks = 1; } ! if (strlen (s) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered(lowerName, s); ! q = XrmStringToQuark(lowerName); ! toVal->size = sizeof(XtJustify); ! toVal->addr = (XPointer) &e; ! ! if (q == XrmQEleft) { e = XtJustifyLeft; return; } ! if (q == XrmQEcenter) { e = XtJustifyCenter; return; } ! if (q == XrmQEright) { e = XtJustifyRight; return; } ! } toVal->size = 0; toVal->addr = NULL; *** ./lib/Xmu/StrToOrnt.c@@/PUBLIC-LATEST Fri Feb 6 15:45:51 1998 --- xc/lib/Xmu/StrToOrnt.c Thu May 14 14:51:06 1998 *************** *** 1,4 **** ! /* $TOG: StrToOrnt.c /main/10 1998/02/06 15:45:56 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: StrToOrnt.c /main/11 1998/05/14 14:56:27 kaleb $ */ /* *************** *** 44,50 **** static XrmQuark XtQEvertical; static int haveQuarks = 0; XrmQuark q; ! char lowerName[1000]; if (!haveQuarks) { XtQEhorizontal = XrmPermStringToQuark(XtEhorizontal); --- 44,50 ---- static XrmQuark XtQEvertical; static int haveQuarks = 0; XrmQuark q; ! char lowerName[40]; if (!haveQuarks) { XtQEhorizontal = XrmPermStringToQuark(XtEhorizontal); *************** *** 51,66 **** XtQEvertical = XrmPermStringToQuark(XtEvertical); haveQuarks = 1; } ! XmuCopyISOLatin1Lowered(lowerName, (char *) fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == XtQEhorizontal) { ! orient = XtorientHorizontal; ! done(&orient, XtOrientation); ! return; } ! if (q == XtQEvertical) { ! orient = XtorientVertical; ! done(&orient, XtOrientation); ! return; ! } } --- 51,71 ---- XtQEvertical = XrmPermStringToQuark(XtEvertical); haveQuarks = 1; } ! ! if (strlen ((char*)fromVal->addr) < sizeof lowerName) { ! XmuCopyISOLatin1Lowered(lowerName, (char *) fromVal->addr); ! q = XrmStringToQuark(lowerName); ! if (q == XtQEhorizontal) { ! orient = XtorientHorizontal; ! done(&orient, XtOrientation); ! return; ! } ! if (q == XtQEvertical) { ! orient = XtorientVertical; ! done(&orient, XtOrientation); ! return; ! } } ! toVal->size = 0; ! toVal->addr = NULL; } *** ./lib/Xmu/WidgetNode.c@@/PUBLIC-LATEST Fri Feb 6 15:46:29 1998 --- xc/lib/Xmu/WidgetNode.c Tue Jun 23 11:43:31 1998 *************** *** 1,4 **** ! /* $TOG: WidgetNode.c /main/6 1998/02/06 15:46:34 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: WidgetNode.c /main/7 1998/06/23 11:51:04 kaleb $ */ /* *************** *** 281,293 **** { int i; XmuWidgetNode *wn; char tmp[1024]; ! XmuCopyISOLatin1Lowered (tmp, name); for (i = 0, wn = nodelist; i < nnodes; i++, wn++) { ! if (strcmp (tmp, wn->lowered_label) == 0 || ! strcmp (tmp, wn->lowered_classname) == 0) ! return wn; } ! return NULL; } --- 281,301 ---- { int i; XmuWidgetNode *wn; + char* tmpp; char tmp[1024]; + XmuWidgetNode* ret = NULL; ! if ((i = strlen (name)) < sizeof tmp) tmpp = tmp; ! else tmpp = XtMalloc (i + 1); ! if (tmpp == NULL) return ret; ! XmuCopyISOLatin1Lowered (tmpp, name); for (i = 0, wn = nodelist; i < nnodes; i++, wn++) { ! if (strcmp (tmpp, wn->lowered_label) == 0 || ! strcmp (tmpp, wn->lowered_classname) == 0) { ! ret = wn; ! break; ! } } ! if (tmpp != tmp) XtFree (tmpp); ! return ret; } *** ./lib/Xt/Imakefile@@/PUBLIC-LATEST Mon Oct 13 12:25:49 1997 --- xc/lib/Xt/Imakefile Mon May 11 14:35:29 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imakefile /main/120 1997/10/13 12:25:39 barstow $ #define DoNormalLib NormalLibXt #define DoSharedLib SharedLibXt #define DoDebugLib DebugLibXt --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/121 1998/05/11 14:35:32 barstow $ #define DoNormalLib NormalLibXt #define DoSharedLib SharedLibXt #define DoDebugLib DebugLibXt *************** *** 17,22 **** --- 17,28 ---- RCM_DEFINES = -DX_NO_RESOURCE_CONFIGURATION_MANAGEMENT #endif + #if XtPopdownConformance + POPDOWN_DEFINES = + #else + POPDOWN_DEFINES = -DX_NO_XT_POPDOWN_CONFORMANCE + #endif + #ifndef MotifBC #define MotifBC NO #endif *************** *** 49,55 **** #if HasPoll POLL_DEFINES = -DUSE_POLL #endif ! DEFINES = AllocateLocalDefines $(ALIGN_DEFINES) $(POLL_DEFINES) XtExtraDefines $(RCM_DEFINES) DB_DEFINES = -DERRORDB=\"$(LIBDIR)/XtErrorDB\" \ -DXTERROR_PREFIX=\"$(XTERRORPREFIX)\" \ --- 55,61 ---- #if HasPoll POLL_DEFINES = -DUSE_POLL #endif ! DEFINES = AllocateLocalDefines $(ALIGN_DEFINES) $(POLL_DEFINES) XtExtraDefines $(RCM_DEFINES) $(POPDOWN_DEFINES) DB_DEFINES = -DERRORDB=\"$(LIBDIR)/XtErrorDB\" \ -DXTERROR_PREFIX=\"$(XTERRORPREFIX)\" \ *** ./lib/Xt/Initialize.c@@/PUBLIC-LATEST Tue May 12 11:14:03 1998 --- xc/lib/Xt/Initialize.c Fri Jun 19 14:20:07 1998 *************** *** 1,4 **** ! /* $TOG: Initialize.c /main/213 1998/05/12 11:19:17 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts --- 1,4 ---- ! /* $TOG: Initialize.c /main/214 1998/06/19 14:27:36 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts *************** *** 167,173 **** uname (&name); len = strlen (name.nodename); if (len >= maxlen) len = maxlen; ! (void) strncpy (buf, name.nodename, len); buf[len-1] = '\0'; #else buf[0] = '\0'; --- 167,173 ---- uname (&name); len = strlen (name.nodename); if (len >= maxlen) len = maxlen; ! (void) strncpy (buf, name.nodename, len-1); buf[len-1] = '\0'; #else buf[0] = '\0'; *************** *** 225,231 **** String ptr = NULL; if ((ptr = getenv("USERNAME"))) { ! (void) strncpy (dest, ptr, len); dest[len-1] = '\0'; } else *dest = '\0'; --- 225,231 ---- String ptr = NULL; if ((ptr = getenv("USERNAME"))) { ! (void) strncpy (dest, ptr, len-1); dest[len-1] = '\0'; } else *dest = '\0'; *************** *** 235,245 **** char* ptr; if ((ptr = getenv("USER"))) { ! (void) strncpy (dest, ptr, len); dest[len-1] = '\0'; } else { if ((pw = _XGetpwuid(getuid(),pwparams)) != NULL) { ! (void) strncpy (dest, pw->pw_name, len); dest[len-1] = '\0'; } else *dest = '\0'; --- 235,245 ---- char* ptr; if ((ptr = getenv("USER"))) { ! (void) strncpy (dest, ptr, len-1); dest[len-1] = '\0'; } else { if ((pw = _XGetpwuid(getuid(),pwparams)) != NULL) { ! (void) strncpy (dest, pw->pw_name, len-1); dest[len-1] = '\0'; } else *dest = '\0'; *************** *** 277,283 **** static char *ptr; if ((ptr = getenv("HOME"))) { ! (void) strncpy (dest, ptr, len); dest[len-1] = '\0'; } else { if (ptr = getenv("USER")) --- 277,283 ---- static char *ptr; if ((ptr = getenv("HOME"))) { ! (void) strncpy (dest, ptr, len-1); dest[len-1] = '\0'; } else { if (ptr = getenv("USER")) *************** *** 285,291 **** else pw = _XGetpwuid(getuid(),pwparams); if (pw != NULL) { ! (void) strncpy (dest, pw->pw_dir, len); dest[len-1] = '\0'; } else *dest = '\0'; --- 285,291 ---- else pw = _XGetpwuid(getuid(),pwparams); if (pw != NULL) { ! (void) strncpy (dest, pw->pw_dir, len-1); dest[len-1] = '\0'; } else *dest = '\0'; *** ./lib/Xt/Intrinsic.c@@/PUBLIC-LATEST Fri Feb 6 13:23:07 1998 --- xc/lib/Xt/Intrinsic.c Wed Jun 17 13:19:24 1998 *************** *** 1,4 **** ! /* $TOG: Intrinsic.c /main/154 1998/02/06 13:23:11 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, --- 1,4 ---- ! /* $TOG: Intrinsic.c /main/158 1998/06/17 13:26:39 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, *************** *** 1195,1201 **** #define ENDCHAR ';' #define WHITEFILL #else ! #if defined(__osf__) || defined(AIXV3) #define STARTCHAR ' ' #define ENDCHAR ' ' #else --- 1195,1201 ---- #define ENDCHAR ';' #define WHITEFILL #else ! #if defined(__osf__) || (defined(AIXV3) && !defined(AIXV4)) #define STARTCHAR ' ' #define ENDCHAR ' ' #else *************** *** 1207,1213 **** #endif #endif #endif - #define MAXLOCALE 64 /* buffer size of locale name */ char *start; char *end; --- 1207,1212 ---- *************** *** 1215,1221 **** #ifdef SKIPCOUNT int n; #endif ! static char buf[MAXLOCALE]; start = lang; #ifdef SKIPCOUNT --- 1214,1220 ---- #ifdef SKIPCOUNT int n; #endif ! static char* buf = NULL; start = lang; #ifdef SKIPCOUNT *************** *** 1230,1250 **** if (start && (start = strchr (start, STARTCHAR))) { start++; #endif ! if (end = strchr (start, ENDCHAR)) { ! len = end - start; ! strncpy(buf, start, len); ! *(buf + len) = '\0'; #ifdef WHITEFILL for (start = buf; start = strchr(start, ' '); ) *start++ = '-'; #endif return buf; #ifdef STARTCHAR - } - #endif } #ifdef WHITEFILL if (strchr(lang, ' ')) { strcpy(buf, lang); for (start = buf; start = strchr(start, ' '); ) *start++ = '-'; --- 1229,1255 ---- if (start && (start = strchr (start, STARTCHAR))) { start++; #endif ! if (end = strchr (start, ENDCHAR)) { ! len = end - start; ! if (buf != NULL) XtFree (buf); ! buf = XtMalloc (len + 1); ! if (buf == NULL) return NULL; ! strncpy(buf, start, len); ! *(buf + len) = '\0'; #ifdef WHITEFILL for (start = buf; start = strchr(start, ' '); ) *start++ = '-'; #endif return buf; + } #ifdef STARTCHAR } + #endif #ifdef WHITEFILL if (strchr(lang, ' ')) { + if (buf != NULL) XtFree (buf); + else buf = XtMalloc (strlen (lang) + 1); + if (buf == NULL) return NULL; strcpy(buf, lang); for (start = buf; start = strchr(start, ' '); ) *start++ = '-'; *************** *** 1268,1274 **** char **rest; char *ch; ! if (pd->language == NULL || pd->language[0] == '\0') { subs[0].substitution = subs[1].substitution = subs[2].substitution = subs[3].substitution = NULL; return; --- 1273,1280 ---- char **rest; char *ch; ! if (pd->language == NULL || ! (pd->language != NULL && pd->language[0] == '\0')) { subs[0].substitution = subs[1].substitution = subs[2].substitution = subs[3].substitution = NULL; return; *************** *** 1276,1282 **** string = ExtractLocaleName(pd->language); ! if (string == NULL || string[0] == '\0') { subs[0].substitution = subs[1].substitution = subs[2].substitution = subs[3].substitution = NULL; return; --- 1282,1289 ---- string = ExtractLocaleName(pd->language); ! if (string == NULL || ! (string != NULL && string[0] == '\0')) { subs[0].substitution = subs[1].substitution = subs[2].substitution = subs[3].substitution = NULL; return; *** ./lib/Xt/NextEvent.c@@/PUBLIC-LATEST Fri Feb 6 13:24:05 1998 --- xc/lib/Xt/NextEvent.c Thu Apr 30 11:52:21 1998 *************** *** 1,4 **** ! /* $TOG: NextEvent.c /main/137 1998/02/06 13:24:09 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, --- 1,4 ---- ! /* $TOG: NextEvent.c /main/138 1998/04/30 11:52:29 barstow $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, *************** *** 614,622 **** * interrupt occured recalculate time value and wait again. */ if (errno == EINTR || errno == EAGAIN) { ! errno = 0; /* errno is not self reseting */ ! ! if (errno == EAGAIN) continue; /* was it interrupted by a signal that we care about? */ if (!ignoreSignals && app->signalQueue != NULL) { --- 614,624 ---- * interrupt occured recalculate time value and wait again. */ if (errno == EINTR || errno == EAGAIN) { ! if (errno == EAGAIN) { ! errno = 0; /* errno is not self reseting */ ! continue; ! } ! errno = 0; /* errno is not self reseting */ /* was it interrupted by a signal that we care about? */ if (!ignoreSignals && app->signalQueue != NULL) { *** ./lib/Xt/Popup.c@@/PUBLIC-LATEST Fri Feb 6 13:24:49 1998 --- xc/lib/Xt/Popup.c Mon May 11 14:35:37 1998 *************** *** 1,4 **** ! /* $TOG: Popup.c /main/27 1998/02/06 13:24:53 kaleb $ */ /*********************************************************** --- 1,4 ---- ! /* $TOG: Popup.c /main/29 1998/05/11 14:35:39 barstow $ */ /*********************************************************** *************** *** 155,160 **** --- 155,161 ---- /* Unmap a shell widget if it is mapped, and remove from grab list */ Widget hookobj; ShellWidget shell_widget = (ShellWidget) widget; + XtGrabKind grab_kind; if (! XtIsShell(widget)) { XtAppErrorMsg(XtWidgetToApplicationContext(widget), *************** *** 163,178 **** (String *)NULL, (Cardinal *)NULL); } ! if (shell_widget->shell.popped_up) { ! XtGrabKind grab_kind = shell_widget->shell.grab_kind; ! XWithdrawWindow(XtDisplay(widget), XtWindow(widget), ! XScreenNumberOfScreen(XtScreen(widget))); ! if (grab_kind != XtGrabNone) { ! XtRemoveGrab(widget); ! } ! shell_widget->shell.popped_up = FALSE; ! XtCallCallbacks(widget, XtNpopdownCallback, (XtPointer)&grab_kind); ! } hookobj = XtHooksOfDisplay(XtDisplay(widget)); if (XtHasCallbacks(hookobj, XtNchangeHook) == XtCallbackHasSome) { --- 164,181 ---- (String *)NULL, (Cardinal *)NULL); } ! #ifndef X_NO_XT_POPDOWN_CONFORMANCE ! if (!shell_widget->shell.popped_up) ! return; ! #endif ! ! grab_kind = shell_widget->shell.grab_kind; ! XWithdrawWindow(XtDisplay(widget), XtWindow(widget), ! XScreenNumberOfScreen(XtScreen(widget))); ! if (grab_kind != XtGrabNone) ! XtRemoveGrab(widget); ! shell_widget->shell.popped_up = FALSE; ! XtCallCallbacks(widget, XtNpopdownCallback, (XtPointer)&grab_kind); hookobj = XtHooksOfDisplay(XtDisplay(widget)); if (XtHasCallbacks(hookobj, XtNchangeHook) == XtCallbackHasSome) { *** ./lib/Xt/Resources.c@@/PUBLIC-LATEST Fri Feb 6 13:25:25 1998 --- xc/lib/Xt/Resources.c Fri Jun 19 11:00:24 1998 *************** *** 1,4 **** ! /* $TOG: Resources.c /main/114 1998/02/06 13:25:30 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, --- 1,4 ---- ! /* $TOG: Resources.c /main/115 1998/06/19 11:08:11 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, *************** *** 564,569 **** --- 564,570 ---- * assert: num_args == 0 if *pNumTypedArgs > 0 */ #define SEARCHLISTLEN 100 + #define MAXRESOURCES 400 XrmValue value; XrmQuark rawType; *************** *** 571,579 **** XrmHashTable stackSearchList[SEARCHLISTLEN]; XrmHashTable *searchList = stackSearchList; unsigned int searchListSize = SEARCHLISTLEN; ! Boolean found[400]; ! int typed[400]; ! XtCacheRef cache_ref[400]; XtCacheRef *cache_ptr, *cache_base; Boolean persistent_resources = True; Boolean found_persistence = False; --- 572,580 ---- XrmHashTable stackSearchList[SEARCHLISTLEN]; XrmHashTable *searchList = stackSearchList; unsigned int searchListSize = SEARCHLISTLEN; ! Boolean found[MAXRESOURCES]; ! int typed[MAXRESOURCES]; ! XtCacheRef cache_ref[MAXRESOURCES]; XtCacheRef *cache_ptr, *cache_base; Boolean persistent_resources = True; Boolean found_persistence = False; *************** *** 590,595 **** --- 591,602 ---- } if (num_resources == 0) { return NULL; + } else if (num_resources >= MAXRESOURCES) { + XtAppWarningMsg(XtWidgetToApplicationContext(widget), + "invalidResourceCount","getResources",XtCXtToolkitError, + "too many resources", + (String *)NULL, (Cardinal *)NULL); + return NULL; } else if (table == NULL) { XtAppWarningMsg(XtWidgetToApplicationContext(widget), "invalidResourceCount","getResources",XtCXtToolkitError, *************** *** 1053,1059 **** if (w->core.constraints != NULL) { cwc = (ConstraintWidgetClass) XtClass(w->core.parent); ! GetResources(w, (char*)w->core.constraints, names, classes, (XrmResourceList *) cwc->constraint_class.resources, cwc->constraint_class.num_resources, quark_args, args, num_args, typed_args, num_typed_args, False); --- 1060,1066 ---- if (w->core.constraints != NULL) { cwc = (ConstraintWidgetClass) XtClass(w->core.parent); ! (void) GetResources(w, (char*)w->core.constraints, names, classes, (XrmResourceList *) cwc->constraint_class.resources, cwc->constraint_class.num_resources, quark_args, args, num_args, typed_args, num_typed_args, False); *** ./lib/Xt/TMstate.c@@/PUBLIC-LATEST Fri Feb 6 13:27:13 1998 --- xc/lib/Xt/TMstate.c Thu Apr 23 10:49:32 1998 *************** *** 1,4 **** ! /* $TOG: TMstate.c /main/153 1998/02/06 13:27:18 kaleb $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, --- 1,4 ---- ! /* $TOG: TMstate.c /main/155 1998/04/23 10:49:36 barstow $ */ /*********************************************************** Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts, *************** *** 599,608 **** if (procs[actions->idx] != NULL) { if (actionHookList) { ActionHook hook; String procName = XrmQuarkToString(stateTree->quarkTbl[actions->idx] ); ! for (hook = actionHookList; hook != NULL; hook = hook->next) { (*hook->proc)(bindWidget, hook->closure, procName, --- 599,615 ---- if (procs[actions->idx] != NULL) { if (actionHookList) { ActionHook hook; + ActionHook next_hook; String procName = XrmQuarkToString(stateTree->quarkTbl[actions->idx] ); ! for (hook = actionHookList; hook != NULL; ) { ! /* ! * Need to cache hook->next because the following action ! * proc may free hook via XtRemoveActionHook making ! * hook->next invalid upon return from the action proc. ! */ ! next_hook = hook->next; (*hook->proc)(bindWidget, hook->closure, procName, *************** *** 610,615 **** --- 617,623 ---- actions->params, &actions->num_params ); + hook = next_hook; } } (*(procs[actions->idx])) *************** *** 703,716 **** TMContext context = NULL; LOCK_PROCESS; if (&contextCache[0] == *contextPtr) context = &contextCache[0]; else if (&contextCache[1] == *contextPtr) context = &contextCache[1]; if (context) context->numMatches = 0; ! else XtFree((char *)*contextPtr); *contextPtr = NULL; UNLOCK_PROCESS; --- 711,730 ---- TMContext context = NULL; LOCK_PROCESS; + if (&contextCache[0] == *contextPtr) context = &contextCache[0]; else if (&contextCache[1] == *contextPtr) context = &contextCache[1]; + if (context) context->numMatches = 0; ! else if (*contextPtr) ! { ! if ((*contextPtr)->matches) ! XtFree ((char *) ((*contextPtr)->matches)); XtFree((char *)*contextPtr); + } *contextPtr = NULL; UNLOCK_PROCESS; *** ./lib/Xtst/XRecord.c@@/PUBLIC-LATEST Fri Feb 6 15:58:28 1998 --- xc/lib/Xtst/XRecord.c Fri May 1 10:33:13 1998 *************** *** 1,5 **** /* ! $TOG: XRecord.c /main/6 1998/02/06 15:58:34 kaleb $ XRecord.c - client-side library for RECORD extension --- 1,5 ---- /* ! $TOG: XRecord.c /main/7 1998/05/01 10:37:53 kaleb $ XRecord.c - client-side library for RECORD extension *************** *** 765,771 **** case X_Reply: /* reply */ EXTRACT_CARD32(rep->clientSwapped, reply->buf+current_index+4, datum_bytes); ! datum_bytes = datum_bytes+8 << 2; break; default: /* error or event */ datum_bytes = 32; --- 765,771 ---- case X_Reply: /* reply */ EXTRACT_CARD32(rep->clientSwapped, reply->buf+current_index+4, datum_bytes); ! datum_bytes = (datum_bytes+8) << 2; break; default: /* error or event */ datum_bytes = 32; *************** *** 798,804 **** case XRecordClientStarted: EXTRACT_CARD16(rep->clientSwapped, reply->buf+current_index+6, datum_bytes); ! datum_bytes = datum_bytes+2 << 2; break; case XRecordClientDied: if (rep->elementHeader&XRecordFromClientSequence) { --- 798,804 ---- case XRecordClientStarted: EXTRACT_CARD16(rep->clientSwapped, reply->buf+current_index+6, datum_bytes); ! datum_bytes = (datum_bytes+2) << 2; break; case XRecordClientDied: if (rep->elementHeader&XRecordFromClientSequence) { *************** *** 924,929 **** --- 924,930 ---- register record_async_state *state = (record_async_state *)adata; struct reply_buffer *reply; enum parser_return status; + extern void _XGetAsyncData(); if (dpy->last_request_read != state->enable_seq) { *************** *** 959,966 **** reply = NULL; } ! status = parse_reply_call_callback(dpy, state->info, rep, reply, ! state->callback, state->closure); if (status != Continue) { --- 960,968 ---- reply = NULL; } ! status = parse_reply_call_callback(dpy, state->info, ! (xRecordEnableContextReply*) rep, ! reply, state->callback, state->closure); if (status != Continue) { *** ./lib/font/Imakefile@@/PUBLIC-LATEST Tue Nov 11 14:48:52 1997 --- xc/lib/font/Imakefile Tue Jun 16 15:22:55 1998 *************** *** 1,21 **** ! XCOMM $TOG: Imakefile /main/13 1997/11/11 14:48:55 msr $ #include #define IHaveSubdirs - #if BuildLowMem - - SUBDIRS = bitmap fontfile fc util - OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o util/?*.o - DONES = bitmap/DONE fontfile/DONE fc/DONE util/DONE - - #else - SUBDIRS = bitmap fontfile fc Speedo Type1 util OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o Speedo/?*.o Type1/?*.o util/?*.o DONES = bitmap/DONE fontfile/DONE fc/DONE Speedo/DONE Type1/DONE util/DONE - - #endif #undef _LinkBuildLibrary #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) --- 1,11 ---- ! XCOMM $TOG: Imakefile /main/14 1998/06/16 15:23:15 msr $ #include #define IHaveSubdirs SUBDIRS = bitmap fontfile fc Speedo Type1 util OBJS = bitmap/?*.o fontfile/?*.o fc/?*.o Speedo/?*.o Type1/?*.o util/?*.o DONES = bitmap/DONE fontfile/DONE fc/DONE Speedo/DONE Type1/DONE util/DONE #undef _LinkBuildLibrary #define _LinkBuildLibrary(lib) LinkBuildLibrary(lib) *** ./lib/font/Speedo/do_char.c@@/PUBLIC-LATEST Tue Oct 24 11:26:25 1995 --- xc/lib/font/Speedo/do_char.c Thu May 7 14:39:23 1998 *************** *** 1,4 **** ! /* $XConsortium: do_char.c /main/5 1995/10/24 11:22:28 gildea $ */ /* --- 1,4 ---- ! /* $TOG: do_char.c /main/7 1998/05/07 14:44:22 kaleb $ */ /* *************** *** 747,753 **** do { pointer = pointer_sav; /* Point to next DOCH or END instruction */ ! while (format = NEXT_BYTE(pointer)) /* DOCH instruction? */ { init_tcb(); /* Initialize transformation control block */ x_posn = sp_get_posn_arg(&pointer, format); --- 747,753 ---- do { pointer = pointer_sav; /* Point to next DOCH or END instruction */ ! while ((format = NEXT_BYTE(pointer))) /* DOCH instruction? */ { init_tcb(); /* Initialize transformation control block */ x_posn = sp_get_posn_arg(&pointer, format); *** ./lib/font/Speedo/out_bl2d.c@@/PUBLIC-LATEST Mon Feb 7 10:01:15 1994 --- xc/lib/font/Speedo/out_bl2d.c Thu May 7 14:38:37 1998 *************** *** 1,4 **** ! /* $XConsortium: out_bl2d.c,v 1.5 94/02/07 10:01:15 gildea Exp $ */ /* --- 1,4 ---- ! /* $TOG: out_bl2d.c /main/7 1998/05/07 14:43:36 kaleb $ */ /* *************** *** 623,630 **** fix15 local_bmap_xmax; fix15 first_y, last_y; fix15 j,k; - fix15 xmin, xmax; - boolean clipleft, clipright; #if INCL_CLIPPING if ((sp_globals.specs.flags & CLIP_LEFT) != 0) --- 623,628 ---- *************** *** 681,687 **** sp_intercepts.cdr[i] = sp_intercepts.cdr[from]; sp_intercepts.cdr[from] = j; } ! skip_xint: i = k; } } } --- 679,685 ---- sp_intercepts.cdr[i] = sp_intercepts.cdr[from]; sp_intercepts.cdr[from] = j; } ! i = k; } } } *** ./lib/font/Speedo/out_blk.c@@/PUBLIC-LATEST Mon Feb 7 10:01:11 1994 --- xc/lib/font/Speedo/out_blk.c Thu May 7 14:37:10 1998 *************** *** 1,4 **** ! /* $XConsortium: out_blk.c,v 1.4 94/02/07 10:01:11 gildea Exp $ */ /* --- 1,4 ---- ! /* $TOG: out_blk.c /main/6 1998/05/07 14:42:10 kaleb $ */ /* *************** *** 599,606 **** register fix15 y; register fix15 scan_line; fix15 first_y, last_y; - fix15 xmin, xmax; - boolean clipleft, clipright; #if DEBUG printf("\nIntercept lists:\n"); --- 599,604 ---- *** ./lib/font/Speedo/out_scrn.c@@/PUBLIC-LATEST Thu Feb 10 14:15:39 1994 --- xc/lib/font/Speedo/out_scrn.c Thu May 7 14:35:51 1998 *************** *** 1,4 **** ! /* $XConsortium: out_scrn.c,v 1.5 94/02/10 14:15:39 gildea Exp $ */ /* --- 1,4 ---- ! /* $TOG: out_scrn.c /main/7 1998/05/07 14:40:50 kaleb $ */ /* *************** *** 767,774 **** register fix15 scan_line; fix15 first_y, last_y; fix15 xsave; - fix15 xmin, xmax; - boolean clipleft, clipright; fix15 diff; --- 767,772 ---- *** ./lib/font/Speedo/set_spcs.c@@/PUBLIC-LATEST Thu Feb 10 10:18:23 1994 --- xc/lib/font/Speedo/set_spcs.c Thu May 7 15:09:26 1998 *************** *** 1,4 **** ! /* $XConsortium: set_spcs.c,v 1.6 94/02/10 10:18:23 gildea Exp $ */ /* --- 1,4 ---- ! /* $TOG: set_spcs.c /main/8 1998/05/07 15:14:25 kaleb $ */ /* *************** *** 74,80 **** * Called by host software to set character generation specifications */ { - ufix8 FONTFAR *pointer; /* Pointer to font data */ fix31 offcd; /* Offset to start of character directory */ fix31 ofcns; /* Offset to start of constraint data */ fix31 cd_size; /* Size of character directory */ --- 74,79 ---- *** ./lib/font/Speedo/set_trns.c@@/PUBLIC-LATEST Thu Feb 10 11:05:59 1994 --- xc/lib/font/Speedo/set_trns.c Thu May 7 15:08:54 1998 *************** *** 1,4 **** ! /* $XConsortium: set_trns.c,v 1.6 94/02/10 11:05:59 gildea Exp $ */ /* --- 1,4 ---- ! /* $TOG: set_trns.c /main/8 1998/05/07 15:13:53 kaleb $ */ /* *************** *** 348,354 **** for (l = 2; l > 0; l--) /* Skip 2 arguments */ { format1 >>= 2; ! if (size = format1 & 0x03) pointer += size - 1; } } --- 348,354 ---- for (l = 2; l > 0; l--) /* Skip 2 arguments */ { format1 >>= 2; ! if ((size = format1 & 0x03)) pointer += size - 1; } } *************** *** 378,384 **** format1 = format; for (l = 3; l > 0; l--) /* Skip over 3 arguments */ { ! if (size = format1 & 0x03) pointer += size - 1; format1 >>= 2; } --- 378,384 ---- format1 = format; for (l = 3; l > 0; l--) /* Skip over 3 arguments */ { ! if ((size = format1 & 0x03)) pointer += size - 1; format1 >>= 2; } *** ./lib/font/Speedo/spfont.c@@/PUBLIC-LATEST Mon Feb 9 10:50:52 1998 --- xc/lib/font/Speedo/spfont.c Thu May 7 14:40:22 1998 *************** *** 1,4 **** ! /* $TOG: spfont.c /main/25 1998/02/09 10:51:07 kaleb $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation --- 1,4 ---- ! /* $TOG: spfont.c /main/26 1998/05/07 14:45:21 kaleb $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation *************** *** 79,86 **** static int sp_get_metrics(); static int sp_load_font(); - static CharInfoRec junkDefault; - static int sp_get_glyphs(pFont, count, chars, charEncoding, glyphCount, glyphs) FontPtr pFont; --- 79,84 ---- *************** *** 232,238 **** int ret; specs_t specs; int xx8, xy8, yx8, yy8; - double sxmult; /* find a master (create it if necessary) */ spmf = (SpeedoMasterFontPtr) entry->u.scalable.extra->private; --- 230,235 ---- *** ./lib/font/Speedo/spfuncs.c@@/PUBLIC-LATEST Mon Feb 9 10:50:57 1998 --- xc/lib/font/Speedo/spfuncs.c Thu May 7 14:43:02 1998 *************** *** 1,4 **** ! /* $TOG: spfuncs.c /main/14 1998/02/09 10:51:11 kaleb $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation --- 1,4 ---- ! /* $TOG: spfuncs.c /main/15 1998/05/07 14:48:01 kaleb $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation *************** *** 51,56 **** --- 51,57 ---- #include "spint.h" /* ARGSUSED */ + int SpeedoOpenScalable (fpe, pFont, flags, entry, fileName, vals, format, fmask, non_cachable_font) FontPathElementPtr fpe; *************** *** 117,122 **** --- 118,124 ---- } /* ARGSUSED */ + int SpeedoGetInfoScaleable(fpe, pFontInfo, entry, fontName, fileName, vals) FontPathElementPtr fpe; FontInfoPtr pFontInfo; *************** *** 146,151 **** --- 148,154 ---- , CAP_MATRIX | CAP_CHARSUBSETTING }; + void SpeedoRegisterFontFileFunctions() { sp_make_standard_props(); *** ./lib/font/Speedo/spinfo.c@@/PUBLIC-LATEST Mon Feb 9 10:51:07 1998 --- xc/lib/font/Speedo/spinfo.c Thu May 7 14:41:43 1998 *************** *** 1,4 **** ! /* $TOG: spinfo.c /main/18 1998/02/09 10:51:21 kaleb $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation --- 1,4 ---- ! /* $TOG: spinfo.c /main/20 1998/05/07 14:46:42 kaleb $ */ /* * Copyright 1990, 1991 Network Computing Devices; * Portions Copyright 1987 by Digital Equipment Corporation *************** *** 65,84 **** } fontProp; static fontProp fontNamePropTable[] = { ! "FOUNDRY", 0, atom, ! "FAMILY_NAME", 0, atom, ! "WEIGHT_NAME", 0, atom, ! "SLANT", 0, atom, ! "SETWIDTH_NAME", 0, atom, ! "ADD_STYLE_NAME", 0, atom, ! "PIXEL_SIZE", 0, pixel_size, ! "POINT_SIZE", 0, point_size, ! "RESOLUTION_X", 0, resolution_x, ! "RESOLUTION_Y", 0, resolution_y, ! "SPACING", 0, atom, ! "AVERAGE_WIDTH", 0, average_width, ! "CHARSET_REGISTRY", 0, atom, ! "CHARSET_ENCODING", 0, truncate_atom, }; /* Warning: following array is closely related to the sequence of --- 65,84 ---- } fontProp; static fontProp fontNamePropTable[] = { ! { "FOUNDRY", 0, atom }, ! { "FAMILY_NAME", 0, atom }, ! { "WEIGHT_NAME", 0, atom }, ! { "SLANT", 0, atom }, ! { "SETWIDTH_NAME", 0, atom }, ! { "ADD_STYLE_NAME", 0, atom }, ! { "PIXEL_SIZE", 0, pixel_size }, ! { "POINT_SIZE", 0, point_size }, ! { "RESOLUTION_X", 0, resolution_x }, ! { "RESOLUTION_Y", 0, resolution_y }, ! { "SPACING", 0, atom }, ! { "AVERAGE_WIDTH", 0, average_width }, ! { "CHARSET_REGISTRY", 0, atom }, ! { "CHARSET_ENCODING", 0, truncate_atom } }; /* Warning: following array is closely related to the sequence of *************** *** 85,97 **** defines after it. */ static fontProp extraProps[] = { ! "FONT", 0, 0, ! "COPYRIGHT", 0, 0, ! "RAW_PIXEL_SIZE", 0, 0, ! "RAW_POINT_SIZE", 0, 0, ! "RAW_ASCENT", 0, 0, ! "RAW_DESCENT", 0, 0, ! "RAW_AVERAGE_WIDTH", 0, 0, }; /* this is a bit kludgy */ --- 85,97 ---- defines after it. */ static fontProp extraProps[] = { ! { "FONT", 0, }, ! { "COPYRIGHT", 0, }, ! { "RAW_PIXEL_SIZE", 0, }, ! { "RAW_POINT_SIZE", 0, }, ! { "RAW_ASCENT", 0, }, ! { "RAW_DESCENT", 0, }, ! { "RAW_AVERAGE_WIDTH", 0, } }; /* this is a bit kludgy */ *************** *** 108,113 **** --- 108,115 ---- #define NEXTRAPROPS (sizeof(extraProps) / sizeof(fontProp)) #define NPROPS (NNAMEPROPS + NEXTRAPROPS) + + extern Atom MakeAtom(); void sp_make_standard_props() *** ./lib/font/Type1/objects.c@@/PUBLIC-LATEST Wed Mar 23 14:28:05 1994 --- xc/lib/font/Type1/objects.c Tue Jun 16 13:50:08 1998 *************** *** 1,4 **** ! /* $XConsortium: objects.c,v 1.11 94/03/23 14:28:05 gildea Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 --- 1,4 ---- ! /* $TOG: objects.c /main/14 1998/06/16 13:50:14 barstow $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 *************** *** 73,79 **** #include "strokes.h" #include "cluts.h" static char *TypeFmt(); - static ObjectPostMortem(); /* :h3.The "pointer" Macro - Define a Generic Pointer --- 73,78 ---- *************** *** 928,933 **** --- 927,953 ---- } } /* + :h4.ObjectPostMortem() - Prints as Much as We Can About a Bad Object + + This is a subroutine of TypeErr() and ArgErr(). + */ + + /*ARGSUSED*/ + static void + ObjectPostMortem(obj) /* non-ANSI avoids overly strict type checking */ + register struct xobject *obj; + { + extern struct XYspace *USER; + + Pragmatics("Debug", 10); + IfTrace2(TRUE,"Bad object is of %s type %z\n", TypeFmt(obj->type), obj); + + IfTrace0((obj == (struct xobject *) USER), + "Suspect that InitImager() was omitted.\n"); + Pragmatics("Debug", 0); + } + + /* :h3.TypeErr() - Handles "Invalid Object Type" Errors */ *************** *** 937,948 **** int expect; /* type expected */ struct xobject *ret; /* object to return to caller */ { ! static char typemsg[80]; if (MustCrash) LineIOTrace = TRUE; ! sprintf(typemsg, "Wrong object type in %s; expected %s.\n", name, TypeFmt(expect), TypeFmt(obj->type)); IfTrace0(TRUE,typemsg); --- 957,974 ---- int expect; /* type expected */ struct xobject *ret; /* object to return to caller */ { ! /* ! * This buffer must be large enough to hold 'name' plus ! * two of the largest strings that can be returned by TypeFmt. ! * The largest value of 'name' is currently 9 ("ClosePath") ! * and the longest strings in TypeFmt are 30 characters. ! */ ! static char typemsg[115]; if (MustCrash) LineIOTrace = TRUE; ! sprintf(typemsg, "Wrong object type in %s. Expected %s; was %s.\n", name, TypeFmt(expect), TypeFmt(obj->type)); IfTrace0(TRUE,typemsg); *************** *** 1005,1030 **** } return(r); } - /* - :h4.ObjectPostMortem() - Prints as Much as We Can About a Bad Object - - This is a subroutine of TypeErr() and ArgErr(). - */ - - /*ARGSUSED*/ - static ObjectPostMortem(obj) /* non-ANSI avoids overly strict type checking */ - register struct xobject *obj; - { - extern struct XYspace *USER; - - Pragmatics("Debug", 10); - IfTrace2(TRUE,"Bad object is of %s type %z\n", TypeFmt(obj->type), obj); - - IfTrace0((obj == (struct xobject *) USER), - "Suspect that InitImager() was omitted.\n"); - Pragmatics("Debug", 0); - } - /* :h3.ArgErr() - Invalid Argument Passed to a Routine --- 1031,1036 ---- *** ./lib/font/Type1/paths.c@@/PUBLIC-LATEST Thu Oct 10 11:18:40 1991 --- xc/lib/font/Type1/paths.c Fri May 1 16:43:26 1998 *************** *** 1,4 **** ! /* $XConsortium: paths.c,v 1.4 91/10/10 11:18:40 rws Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 --- 1,4 ---- ! /* $TOG: paths.c /main/6 1998/05/01 16:41:54 kaleb $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 *************** *** 50,56 **** #include "pictures.h" /* understands about handles */ #include "strokes.h" /* understands how to coerce stroke paths */ #include "trig.h" - static UnClose(); /* :h3.Routines Available to the TYPE1IMAGER User --- 50,55 ---- *************** *** 852,858 **** --- 851,871 ---- return(r); } + static void + UnClose(p0) + register struct segment *p0; + { + register struct segment *p; + for (p=p0; p->link->link != NULL; p=p->link) { ; } + + if (!LASTCLOSED(p->link->flag)) + abort("UnClose: no LASTCLOSED"); + + Free(SplitPath(p0, p)); + p0->flag &= ~ISCLOSED(ON); + } + /* :h3.ReverseSubPaths() - Reverse the Direction of Sub-paths Within a Path *************** *** 915,934 **** } return(r); - } - - static UnClose(p0) - register struct segment *p0; - { - register struct segment *p; - - for (p=p0; p->link->link != NULL; p=p->link) { ; } - - if (!LASTCLOSED(p->link->flag)) - abort("UnClose: no LASTCLOSED"); - - Free(SplitPath(p0, p)); - p0->flag &= ~ISCLOSED(ON); } /* --- 928,933 ---- *** ./lib/font/Type1/regions.c@@/PUBLIC-LATEST Sun Feb 6 16:22:21 1994 --- xc/lib/font/Type1/regions.c Fri May 1 16:43:29 1998 *************** *** 1,4 **** ! /* $XConsortium: regions.c,v 1.6 94/02/06 16:22:21 gildea Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 --- 1,4 ---- ! /* $TOG: regions.c /main/8 1998/05/01 16:41:57 kaleb $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 *************** *** 50,56 **** #include "fonts.h" #include "hints.h" #include "strokes.h" /* to pick up 'DoStroke' */ - static Unwind(); static void newfilledge(); static struct edgelist *splitedge(); static void vertjoin(); --- 50,55 ---- *************** *** 58,65 **** static int crosses(); static void edgemin(); static void edgemax(); - static discard(); - static edgecheck(); static struct edgelist *NewEdge(); static struct edgelist *swathxsort(); /* 'SortSwath' function */ --- 57,62 ---- *************** *** 332,339 **** --- 329,431 ---- IfTrace1((RegionDebug),"result=%x\n", r); return(r); } + + /* + :h3 id=discard.discard() - Discard All Edges Between Two Edges + At first glance it would seem that we could discard an edgelist + structure merely by unlinking it from the list and freeing it. You are + wrong, region-breath! For performance, the X values associated with an + edge are allocated contiguously with it. So, we free the X values when + we free a structure. However, once an edge has been split, we are no + longer sure which control block actually is part of the memory block + that contains the edges. Rather than trying to decide, we play it safe + and never free part of a region. + + So, to mark a 'edgelist' structure as discarded, we move it to the end + of the list and set ymin=ymax. + */ + + static void + discard(left, right) + register struct edgelist *left,*right; /* all edges between here exclusive */ + /* should be discarded */ + { + register struct edgelist *beg,*end,*p; + + IfTrace2((RegionDebug > 0),"discard: l=%x, r=%x\n", left, right); + + beg = left->link; + if (beg == right) + return; + + for (p = beg; p != right; p = p->link) { + if (p->link == NULL && right != NULL) + abort("discard(): ran off end"); + IfTrace1((RegionDebug > 0),"discarding %x\n", p); + p->ymin = p->ymax = 32767; + end = p; + } + /* + * now put the chain beg/end at the end of right, if it is not + * already there: + */ + if (right != NULL) { + left->link = right; + while (right->link != NULL) + right = right->link; + right->link = beg; + } + end->link = NULL; + } + /* + :h4.Unwind() - Discards Edges That Fail the Winding Rule Test + + The winding rule says that upward going edges should be paired with + downward going edges only, and vice versa. So, if two upward edges + or two downward edges are nominally left/right pairs, Unwind() should + discard the second one. Everything should balance; we should discard + an even number of edges; of course, we abort if we don't. + */ + static void + Unwind(area) + register struct edgelist *area; /* input area modified in place */ + { + register struct edgelist *last,*next; /* struct before and after current one */ + register int y; /* ymin of current swath */ + register int count,newcount; /* winding count registers */ + + IfTrace1((RegionDebug>0),"...Unwind(%z)\n", area); + + while (VALIDEDGE(area)) { + + count = 0; + y = area->ymin; + + do { + next = area->link; + + if (ISDOWN(area->flag)) + newcount = count + 1; + else + newcount = count - 1; + + if (count == 0 || newcount == 0) + last = area; + else + discard(last, next); + + count = newcount; + area = next; + + } while (area != NULL && area->ymin == y); + + if (count != 0) + abort("Unwind: uneven edges"); + } + } + /* :h2.Building Regions :h3.Interior() - Iterate Through a Path, Building a Region *************** *** 578,628 **** return(R); } /* - :h4.Unwind() - Discards Edges That Fail the Winding Rule Test - - The winding rule says that upward going edges should be paired with - downward going edges only, and vice versa. So, if two upward edges - or two downward edges are nominally left/right pairs, Unwind() should - discard the second one. Everything should balance; we should discard - an even number of edges; of course, we abort if we don't. - */ - static Unwind(area) - register struct edgelist *area; /* input area modified in place */ - { - register struct edgelist *last,*next; /* struct before and after current one */ - register int y; /* ymin of current swath */ - register int count,newcount; /* winding count registers */ - - IfTrace1((RegionDebug>0),"...Unwind(%z)\n", area); - - while (VALIDEDGE(area)) { - - count = 0; - y = area->ymin; - - do { - next = area->link; - - if (ISDOWN(area->flag)) - newcount = count + 1; - else - newcount = count - 1; - - if (count == 0 || newcount == 0) - last = area; - else - discard(last, next); - - count = newcount; - area = next; - - } while (area != NULL && area->ymin == y); - - if (count != 0) - abort("Unwind: uneven edges"); - } - } - /* :h3."workedge" Array This is a statically allocated array where edges are built --- 670,675 ---- *************** *** 1328,1381 **** if (*e1 < *e2) *e1 = *e2; } - /* - :h3 id=discard.discard() - Discard All Edges Between Two Edges - At first glance it would seem that we could discard an edgelist - structure merely by unlinking it from the list and freeing it. You are - wrong, region-breath! For performance, the X values associated with an - edge are allocated contiguously with it. So, we free the X values when - we free a structure. However, once an edge has been split, we are no - longer sure which control block actually is part of the memory block - that contains the edges. Rather than trying to decide, we play it safe - and never free part of a region. - - So, to mark a 'edgelist' structure as discarded, we move it to the end - of the list and set ymin=ymax. - */ - - static discard(left, right) - register struct edgelist *left,*right; /* all edges between here exclusive */ - /* should be discarded */ - { - register struct edgelist *beg,*end,*p; - - IfTrace2((RegionDebug > 0),"discard: l=%x, r=%x\n", left, right); - - beg = left->link; - if (beg == right) - return; - - for (p = beg; p != right; p = p->link) { - if (p->link == NULL && right != NULL) - abort("discard(): ran off end"); - IfTrace1((RegionDebug > 0),"discarding %x\n", p); - p->ymin = p->ymax = 32767; - end = p; - } - /* - * now put the chain beg/end at the end of right, if it is not - * already there: - */ - if (right != NULL) { - left->link = right; - while (right->link != NULL) - right = right->link; - right->link = beg; - } - end->link = NULL; - } - /* :h2.Changing the Representation of Regions --- 1375,1381 ---- *************** *** 1386,1392 **** */ ! void MoveEdges(R, dx, dy) register struct region *R; /* region to modify */ register fractpel dx,dy; /* delta X and Y to move edge list by */ { --- 1386,1393 ---- */ ! void ! MoveEdges(R, dx, dy) register struct region *R; /* region to modify */ register fractpel dx,dy; /* delta X and Y to move edge list by */ { *************** *** 1462,1468 **** /* */ ! static OptimizeRegion(R) struct region *R; /* region to optimize */ { register pel *xP; /* pel pointer for inner loop */ --- 1463,1470 ---- /* */ ! static void ! OptimizeRegion(R) struct region *R; /* region to optimize */ { register pel *xP; /* pel pointer for inner loop */ *************** *** 1666,1672 **** --- 1668,1694 ---- /* :h3.DumpEdges() - Display Run End Lists (Edge Lists) */ + + /* + :h3.edgecheck() - For Debug, Verify that an Edge Obeys the Rules + */ + /*ARGSUSED*/ + static void + edgecheck(edge, oldmin, oldmax) + struct edgelist *edge; + int oldmin,oldmax; + { + if (edge->type != EDGETYPE) + abort("EDGE ERROR: non EDGETYPE in list"); + /* + The following check is not valid if the region is jumbled so I took it + out: + */ + /* if (edge->ymin < oldmax && edge->ymin != oldmin) + abort("EDGE ERROR: overlapping swaths"); */ + } + static pel RegionDebugYMin = MINPEL; static pel RegionDebugYMax = MAXPEL; *************** *** 1725,1745 **** } } - /* - :h3.edgecheck() - For Debug, Verify that an Edge Obeys the Rules - */ - - /*ARGSUSED*/ - static edgecheck(edge, oldmin, oldmax) - struct edgelist *edge; - int oldmin,oldmax; - { - if (edge->type != EDGETYPE) - abort("EDGE ERROR: non EDGETYPE in list"); - /* - The following check is not valid if the region is jumbled so I took it - out: - */ - /* if (edge->ymin < oldmax && edge->ymin != oldmin) - abort("EDGE ERROR: overlapping swaths"); */ - } --- 1747,1749 ---- *** ./lib/font/Type1/scanfont.c@@/PUBLIC-LATEST Mon Jun 9 13:29:35 1997 --- xc/lib/font/Type1/scanfont.c Fri May 8 08:45:43 1998 *************** *** 1,4 **** ! /* $TOG: scanfont.c /main/11 1997/06/09 13:27:16 barstow $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * --- 1,4 ---- ! /* $TOG: scanfont.c /main/12 1998/05/08 08:45:46 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * *************** *** 654,660 **** if (N > vm_free_bytes()) { return(SCAN_OUT_OF_MEMORY); } ! I = fread(tokenStartP,1,N,inputP->data.fileP); if ( I != N ) return(SCAN_FILE_EOF); return(SCAN_OK); } --- 654,660 ---- if (N > vm_free_bytes()) { return(SCAN_OUT_OF_MEMORY); } ! I = T1Read(tokenStartP,1,N,inputP->data.fileP); if ( I != N ) return(SCAN_FILE_EOF); return(SCAN_OK); } *************** *** 1376,1390 **** filterFile.data.fileP = NULL; inputP = &inputFile; ! if (fileP = fopen(filename,filetype)) { /* get the first byte of file */ ! V = getc(fileP); /* if file starts with x'80' then skip next 5 bytes */ if ( V == 0X80 ) { ! for (i=0;i<5;i++) V = getc(fileP); starthex80 = TRUE; } ! else ungetc(V,fileP); objFormatFile(inputP,fileP); } else { --- 1376,1390 ---- filterFile.data.fileP = NULL; inputP = &inputFile; ! if (fileP = T1Open(filename,filetype)) { /* get the first byte of file */ ! V = _XT1getc(fileP); /* if file starts with x'80' then skip next 5 bytes */ if ( V == 0X80 ) { ! for (i=0;i<5;i++) V = _XT1getc(fileP); starthex80 = TRUE; } ! else T1Ungetc(V,fileP); objFormatFile(inputP,fileP); } else { *************** *** 1427,1433 **** if (0== strncmp(tokenStartP,"CharStrings",11) ) { rc = BuildCharStrings(FontP); if ( (rc == SCAN_OK) ||(rc == SCAN_END) ) { ! fclose(inputP->data.fileP); /* Build the Blues Structure */ rc = GetType1Blues(FontP); /* whatever the return code, return it */ --- 1427,1433 ---- if (0== strncmp(tokenStartP,"CharStrings",11) ) { rc = BuildCharStrings(FontP); if ( (rc == SCAN_OK) ||(rc == SCAN_END) ) { ! T1Close(inputP->data.fileP); /* Build the Blues Structure */ rc = GetType1Blues(FontP); /* whatever the return code, return it */ *************** *** 1465,1479 **** if (0 == strncmp(tokenStartP,"eexec",5) ) { /* if file started with x'80', check next 5 bytes */ if (starthex80) { ! V = getc(fileP); if ( V == 0X80 ) { ! for (i=0;i<5;i++) V = getc(fileP); } ! else ungetc(V,fileP); } filterFile.data.fileP = T1eexec(inputP->data.fileP); if (filterFile.data.fileP == NULL) { ! fclose(inputFile.data.fileP); return(SCAN_FILE_OPEN_ERROR); } inputP = &filterFile; --- 1465,1479 ---- if (0 == strncmp(tokenStartP,"eexec",5) ) { /* if file started with x'80', check next 5 bytes */ if (starthex80) { ! V = _XT1getc(fileP); if ( V == 0X80 ) { ! for (i=0;i<5;i++) V = _XT1getc(fileP); } ! else T1Ungetc(V,fileP); } filterFile.data.fileP = T1eexec(inputP->data.fileP); if (filterFile.data.fileP == NULL) { ! T1Close(inputFile.data.fileP); return(SCAN_FILE_OPEN_ERROR); } inputP = &filterFile; *************** *** 1485,1491 **** } while (rc ==0); ! fclose(inputP->data.fileP); if (tokenTooLong) return(SCAN_OUT_OF_MEMORY); return(rc); } --- 1485,1491 ---- } while (rc ==0); ! T1Close(inputP->data.fileP); if (tokenTooLong) return(SCAN_OUT_OF_MEMORY); return(rc); } *** ./lib/font/Type1/t1funcs.c@@/PUBLIC-LATEST Mon Feb 9 10:53:27 1998 --- xc/lib/font/Type1/t1funcs.c Fri May 1 16:43:32 1998 *************** *** 1,4 **** ! /* $TOG: t1funcs.c /main/24 1998/02/09 10:53:41 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * --- 1,4 ---- ! /* $TOG: t1funcs.c /main/25 1998/05/01 16:42:00 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * *************** *** 655,660 **** --- 655,661 ---- }; + void Type1RegisterFontFileFunctions() { int i; *** ./lib/font/Type1/t1info.c@@/PUBLIC-LATEST Mon Feb 9 10:53:41 1998 --- xc/lib/font/Type1/t1info.c Fri May 1 16:43:34 1998 *************** *** 1,4 **** ! /* $TOG: t1info.c /main/21 1998/02/09 10:53:55 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * --- 1,4 ---- ! /* $TOG: t1info.c /main/22 1998/05/01 16:42:02 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * *************** *** 101,133 **** } fontProp; static fontProp fontNamePropTable[] = { /* Example: */ ! "FOUNDRY", 0, atom, /* adobe */ ! "FAMILY_NAME", 0, atom, /* times roman */ ! "WEIGHT_NAME", 0, atom, /* bold */ ! "SLANT", 0, atom, /* i */ ! "SETWIDTH_NAME", 0, atom, /* normal */ ! "ADD_STYLE_NAME", 0, atom, /* */ ! "PIXEL_SIZE", 0, pixel_size, /* 18 */ ! "POINT_SIZE", 0, point_size, /* 180 */ ! "RESOLUTION_X", 0, resolution_x, /* 72 */ ! "RESOLUTION_Y", 0, resolution_y, /* 72 */ ! "SPACING", 0, atom, /* p */ ! "AVERAGE_WIDTH", 0, average_width, /* 0 */ ! "CHARSET_REGISTRY", 0, atom, /* ISO8859 */ ! "CHARSET_ENCODING", 0, truncate_atom, /* 1 */ }; /* NOTICE: Following array is closely related to the sequence of defines following it. */ static fontProp extraProps[] = { ! "FONT", 0, 0, ! "COPYRIGHT", 0, 0, ! "RAW_PIXEL_SIZE", 0, 0, ! "RAW_POINT_SIZE", 0, 0, ! "RAW_ASCENT", 0, 0, ! "RAW_DESCENT", 0, 0, ! "RAW_AVERAGE_WIDTH", 0, 0, ! "FACE_NAME", 0, 0, }; /* this is a bit kludgy */ --- 101,133 ---- } fontProp; static fontProp fontNamePropTable[] = { /* Example: */ ! { "FOUNDRY", 0, atom }, /* adobe */ ! { "FAMILY_NAME", 0, atom }, /* times roman */ ! { "WEIGHT_NAME", 0, atom }, /* bold */ ! { "SLANT", 0, atom }, /* i */ ! { "SETWIDTH_NAME", 0, atom }, /* normal */ ! { "ADD_STYLE_NAME", 0, atom }, /* */ ! { "PIXEL_SIZE", 0, pixel_size }, /* 18 */ ! { "POINT_SIZE", 0, point_size }, /* 180 */ ! { "RESOLUTION_X", 0, resolution_x }, /* 72 */ ! { "RESOLUTION_Y", 0, resolution_y }, /* 72 */ ! { "SPACING", 0, atom }, /* p */ ! { "AVERAGE_WIDTH", 0, average_width }, /* 0 */ ! { "CHARSET_REGISTRY", 0, atom }, /* ISO8859 */ ! { "CHARSET_ENCODING", 0, truncate_atom } /* 1 */ }; /* NOTICE: Following array is closely related to the sequence of defines following it. */ static fontProp extraProps[] = { ! { "FONT", 0, }, ! { "COPYRIGHT", 0, }, ! { "RAW_PIXEL_SIZE", 0, }, ! { "RAW_POINT_SIZE", 0, }, ! { "RAW_ASCENT", 0, }, ! { "RAW_DESCENT", 0, }, ! { "RAW_AVERAGE_WIDTH", 0, }, ! { "FACE_NAME", 0, } }; /* this is a bit kludgy */ *** ./lib/font/Type1/t1io.c@@/PUBLIC-LATEST Fri Jun 9 22:29:35 1995 --- xc/lib/font/Type1/t1io.c Fri May 8 08:45:51 1998 *************** *** 1,4 **** ! /* $XConsortium: t1io.c,v 1.10 95/06/09 22:29:35 gildea Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * --- 1,4 ---- ! /* $TOG: t1io.c /main/12 1998/05/08 08:45:53 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * *************** *** 193,203 **** of the Adobe Type 1 Font Format book.) */ /* Skip over any initial white space chars */ ! while (HighHexP[c=getc(f)] == HWHITE_SPACE) ; /* If ASCII, the next 7 chars are guaranteed consecutive */ randomP[0] = c; /* store first non white space char */ ! fread((pointer)(randomP+1), 1, 3, f); /* read 3 more, for a total of 4 */ /* store first four chars */ for (i=0,p=randomP; i<4; i++) { /* Check 4 valid ASCIIEncode chars */ if (HighHexP[*p++] > LAST_HDIGIT) { /* non-ASCII byte */ --- 193,203 ---- of the Adobe Type 1 Font Format book.) */ /* Skip over any initial white space chars */ ! while (HighHexP[c=_XT1getc(f)] == HWHITE_SPACE) ; /* If ASCII, the next 7 chars are guaranteed consecutive */ randomP[0] = c; /* store first non white space char */ ! T1Read((pointer)(randomP+1), 1, 3, f); /* read 3 more, for a total of 4 */ /* store first four chars */ for (i=0,p=randomP; i<4; i++) { /* Check 4 valid ASCIIEncode chars */ if (HighHexP[*p++] > LAST_HDIGIT) { /* non-ASCII byte */ *************** *** 206,212 **** } } if (asc) { /* ASCII form, convert first eight bytes to binary */ ! fread((pointer)(randomP+4), 1, 4, f); /* Need four more */ for (i=0,p=randomP; i<4; i++) { /* Convert */ H = HighHexP[*p++]; randomP[i] = H | LowHexP[*p++]; --- 206,212 ---- } } if (asc) { /* ASCII form, convert first eight bytes to binary */ ! T1Read((pointer)(randomP+4), 1, 4, f); /* Need four more */ for (i=0,p=randomP; i<4; i++) { /* Convert */ H = HighHexP[*p++]; randomP[i] = H | LowHexP[*p++]; *************** *** 221,227 **** /* Decrypt the remaining buffered bytes */ f->b_cnt = T1Decrypt(f->b_ptr, f->b_cnt); Decrypt = 1; ! return (feof(f))?NULL:f; } /* end eexec */ /* -------------------------------------------------------------- */ --- 221,227 ---- /* Decrypt the remaining buffered bytes */ f->b_cnt = T1Decrypt(f->b_ptr, f->b_cnt); Decrypt = 1; ! return (T1Feof(f))?NULL:f; } /* end eexec */ /* -------------------------------------------------------------- */ *** ./lib/font/Type1/t1malloc.c@@/PUBLIC-LATEST Fri Sep 10 10:48:21 1993 --- xc/lib/font/Type1/t1malloc.c Thu May 7 15:26:25 1998 *************** *** 1,4 **** ! /* $XConsortium: t1malloc.c,v 1.5 93/09/10 10:48:21 rws Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 --- 1,4 ---- ! /* $TOG: t1malloc.c /main/8 1998/05/07 15:31:25 kaleb $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 *************** *** 39,48 **** #include "objects.h" /* get #define for abort() */ ! static combine(); ! static freeuncombinable(); ! static unhook(); ! static dumpchain(); /* :h3.Define NULL --- 39,49 ---- #include "objects.h" /* get #define for abort() */ ! static void combine(); ! static void freeuncombinable(); ! static void unhook(); ! static void dumpchain(); ! /* :h3.Define NULL *************** *** 240,252 **** if (++uncombined > MAXUNCOMBINED) { combine(); if (mallocdebug) { ! printf("xiFree(%08x) with combine, ", addr); dumpchain(); } } else { if (mallocdebug) { ! printf("xiFree(%08x), ", addr); dumpchain(); } } --- 241,253 ---- if (++uncombined > MAXUNCOMBINED) { combine(); if (mallocdebug) { ! printf("xiFree(%p) with combine, ", addr); dumpchain(); } } else { if (mallocdebug) { ! printf("xiFree(%p), ", addr); dumpchain(); } } *************** *** 262,268 **** 'firstcombined'). */ ! static combine() { register struct freeblock *p; /* block we will try to combine */ register long *addr; /* identical to 'p' for 'long' access */ --- 263,270 ---- 'firstcombined'). */ ! static void ! combine() { register struct freeblock *p; /* block we will try to combine */ register long *addr; /* identical to 'p' for 'long' access */ *************** *** 334,340 **** no neighbors. */ ! static freeuncombinable(addr, size) register long *addr; /* address of the block to be freed */ register long size; /* size of block in words */ { --- 336,343 ---- no neighbors. */ ! static void ! freeuncombinable(addr, size) register long *addr; /* address of the block to be freed */ register long size; /* size of block in words */ { *************** *** 368,374 **** have to worry about the end cases.) */ ! static unhook(p) register struct freeblock *p; /* block to unhook */ { p->back->fore = p->fore; --- 371,378 ---- have to worry about the end cases.) */ ! static void ! unhook(p) register struct freeblock *p; /* block to unhook */ { p->back->fore = p->fore; *************** *** 450,456 **** unhook(p); uncombined--; if (mallocdebug) { ! printf("fast xiMalloc(%d) = %08x, ", size, p); dumpchain(); } AvailableWords += size; /* decreases AvailableWords */ --- 454,460 ---- unhook(p); uncombined--; if (mallocdebug) { ! printf("fast xiMalloc(%d) = %p, ", size, p); dumpchain(); } AvailableWords += size; /* decreases AvailableWords */ *************** *** 610,616 **** :h3.dumpchain() - Print the Chain of Free Blocks */ ! static dumpchain() { register struct freeblock *p; /* current free block */ register long size; /* size of block */ --- 614,621 ---- :h3.dumpchain() - Print the Chain of Free Blocks */ ! static void ! dumpchain() { register struct freeblock *p; /* current free block */ register long size; /* size of block */ *************** *** 624,630 **** if (--i < 0) abort("too many uncombined areas"); size = p->size; ! printf(". . . area @ %08x, size = %ld\n", p, -size); if (size >= 0 || size != ((int *) p)[-1 - size]) abort("dumpchain: bad size"); if (p->back != back) --- 629,635 ---- if (--i < 0) abort("too many uncombined areas"); size = p->size; ! printf(". . . area @ %p, size = %ld\n", p, -size); if (size >= 0 || size != ((int *) p)[-1 - size]) abort("dumpchain: bad size"); if (p->back != back) *************** *** 634,640 **** printf("DUMPING COMBINED FREE LIST:\n"); for (; p != &lastfree; p = p->fore) { size = p->size; ! printf(". . . area @ %08x, size = %d\n", p, size); if (size <= 0 || size != ((int *) p)[size - 1]) abort("dumpchain: bad size"); if (p->back != back) --- 639,645 ---- printf("DUMPING COMBINED FREE LIST:\n"); for (; p != &lastfree; p = p->fore) { size = p->size; ! printf(". . . area @ %p, size = %d\n", p, size); if (size <= 0 || size != ((int *) p)[size - 1]) abort("dumpchain: bad size"); if (p->back != back) *************** *** 649,655 **** :h3.reportarea() - Display a Contiguous Set of Memory Blocks */ ! static reportarea(area) register long *area; /* start of blocks (from addmemory) */ { register long size; /* size of current block */ --- 654,661 ---- :h3.reportarea() - Display a Contiguous Set of Memory Blocks */ ! static void ! reportarea(area) register long *area; /* start of blocks (from addmemory) */ { register long size; /* size of current block */ *************** *** 708,714 **** :h3.MemReport() - Display All of Memory */ ! MemReport() { register int i; --- 714,720 ---- :h3.MemReport() - Display All of Memory */ ! void MemReport() { register int i; *************** *** 722,728 **** :h3.MemBytesAvail - Display Number of Bytes Now Available */ ! MemBytesAvail() { printf("There are now %d bytes available\n", AvailableWords * sizeof(long) ); --- 728,734 ---- :h3.MemBytesAvail - Display Number of Bytes Now Available */ ! void MemBytesAvail() { printf("There are now %d bytes available\n", AvailableWords * sizeof(long) ); *** ./lib/font/Type1/t1stdio.h@@/PUBLIC-LATEST Thu Oct 10 11:19:49 1991 --- xc/lib/font/Type1/t1stdio.h Fri May 8 08:45:56 1998 *************** *** 1,4 **** ! /* $XConsortium: t1stdio.h,v 1.4 91/10/10 11:19:49 rws Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * --- 1,4 ---- ! /* $TOG: t1stdio.h /main/6 1998/05/08 08:45:57 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * *************** *** 54,60 **** #define EOF (-1) /* end of file */ #define F_BUFSIZ (512) ! #define getc(f) \ ( \ ( ((f)->b_cnt > 0) && ((f)->flags == 0) ) ? \ ( (f)->b_cnt--, (unsigned int)*( (f)->b_ptr++ ) ) : \ --- 54,60 ---- #define EOF (-1) /* end of file */ #define F_BUFSIZ (512) ! #define _XT1getc(f) \ ( \ ( ((f)->b_cnt > 0) && ((f)->flags == 0) ) ? \ ( (f)->b_cnt--, (unsigned int)*( (f)->b_ptr++ ) ) : \ *************** *** 61,73 **** T1Getc(f) \ ) extern FILE *T1Open(), *T1eexec(); ! extern int T1Close(), T1ungetc(), T1Read(); - #define fclose(f) T1Close(f) - #define fopen(name,mode) T1Open(name,mode) - #define ungetc(c,f) T1Ungetc(c,f) - #define fgetc(f) T1Getc(f) - #define fread(bufP,size,n,f) T1Read(bufP,size,n,f) - #define feof(f) (((f)->flags & FIOEOF) && ((f)->b_cnt==0)) - #define ferror(f) (((f)->flags & FIOERROR)?(f)->error:0) --- 61,68 ---- T1Getc(f) \ ) + #define T1Feof(f) (((f)->flags & FIOEOF) && ((f)->b_cnt==0)) + extern FILE *T1Open(), *T1eexec(); ! extern int T1Close(), T1Ungetc(), T1Read(); *** ./lib/font/Type1/token.c@@/PUBLIC-LATEST Fri Feb 4 17:07:17 1994 --- xc/lib/font/Type1/token.c Fri May 8 08:46:00 1998 *************** *** 1,4 **** ! /* $XConsortium: token.c,v 1.3 94/02/04 17:07:17 gildea Exp $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * --- 1,4 ---- ! /* $TOG: token.c /main/5 1998/05/08 08:46:01 kaleb $ */ /* Copyright International Business Machines,Corp. 1991 * All Rights Reserved * *************** *** 132,138 **** /* Get next character from the input -- * */ ! #define next_ch() (getc(inputFileP)) /* Push a character back into the input -- * --- 132,138 ---- /* Get next character from the input -- * */ ! #define next_ch() (_XT1getc(inputFileP)) /* Push a character back into the input -- * *************** *** 144,150 **** * required to return anything in particular, and callers should * not rely on the returned value. */ ! #define back_ch(ch) (ungetc(ch, inputFileP)) /* Push a character back into the input if it was not white space. * If it is a carriage return (\r) then check next char for --- 144,150 ---- * required to return anything in particular, and callers should * not rely on the returned value. */ ! #define back_ch(ch) (T1Ungetc(ch, inputFileP)) /* Push a character back into the input if it was not white space. * If it is a carriage return (\r) then check next char for *** ./lib/font/Type1/type1.c@@/PUBLIC-LATEST Mon Feb 7 15:30:22 1994 --- xc/lib/font/Type1/type1.c Fri May 1 16:43:37 1998 *************** *** 1,4 **** ! /* $XConsortium: type1.c,v 1.7 94/02/07 15:30:22 gildea Exp $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 --- 1,4 ---- ! /* $TOG: type1.c /main/9 1998/05/01 16:42:05 kaleb $ */ /* Copyright International Business Machines, Corp. 1991 * All Rights Reserved * Copyright Lexmark International, Inc. 1991 *************** *** 160,181 **** /************************/ static double Div(); static double PSFakePop(); ! static DoCommand(); ! static Escape(); ! static HStem(); ! static VStem(); ! static RLineTo(); ! static RRCurveTo(); ! static DoClosePath(); ! static CallSubr(); ! static Return(); ! static EndChar(); ! static RMoveTo(); ! static DotSection(); ! static Seac(); ! static Sbw(); ! static CallOtherSubr(); ! static SetCurrentPoint(); /*****************************************/ /* statics for Flex procedures (FlxProc) */ --- 160,181 ---- /************************/ static double Div(); static double PSFakePop(); ! static void DoCommand(); ! static void Escape(); ! static void HStem(); ! static void VStem(); ! static void RLineTo(); ! static void RRCurveTo(); ! static void DoClosePath(); ! static void CallSubr(); ! static void Return(); ! static void EndChar(); ! static void RMoveTo(); ! static void DotSection(); ! static void Seac(); ! static void Sbw(); ! static void CallOtherSubr(); ! static void SetCurrentPoint(); /*****************************************/ /* statics for Flex procedures (FlxProc) */ *************** *** 196,202 **** /******************************************/ /* Fill in the alignment zone structures. */ /******************************************/ ! static ComputeAlignmentZones() { int i; double dummy, bluezonepixels, familyzonepixels; --- 196,203 ---- /******************************************/ /* Fill in the alignment zone structures. */ /******************************************/ ! static void ! ComputeAlignmentZones() { int i; double dummy, bluezonepixels, familyzonepixels; *************** *** 274,280 **** static double wsoffsetX, wsoffsetY; /* White space offset - for VSTEM3,HSTEM3 */ static int wsset; /* Flag for whether we've set wsoffsetX,Y */ ! static InitStems() /* Initialize the STEM hint data structures */ { InDotSection = FALSE; currstartstem = numstems = 0; --- 275,282 ---- static double wsoffsetX, wsoffsetY; /* White space offset - for VSTEM3,HSTEM3 */ static int wsset; /* Flag for whether we've set wsoffsetX,Y */ ! static void ! InitStems() /* Initialize the STEM hint data structures */ { InDotSection = FALSE; currstartstem = numstems = 0; *************** *** 281,287 **** oldvert = oldhor = -1; } ! static FinitStems() /* Terminate the STEM hint data structures */ { int i; --- 283,290 ---- oldvert = oldhor = -1; } ! static void ! FinitStems() /* Terminate the STEM hint data structures */ { int i; *************** *** 297,304 **** /* Compute the dislocation that a stemhint should cause for points */ /* inside the stem. */ /*******************************************************************/ ! static ComputeStem(stemno) ! int stemno; { int verticalondevice, idealwidth; double stemstart, stemwidth; --- 300,308 ---- /* Compute the dislocation that a stemhint should cause for points */ /* inside the stem. */ /*******************************************************************/ ! static void ! ComputeStem(stemno) ! int stemno; { int verticalondevice, idealwidth; double stemstart, stemwidth; *************** *** 692,703 **** static double PSFakeStack[MAXPSFAKESTACK]; static int PSFakeTop; ! static ClearStack() { Top = -1; } ! static Push(Num) double Num; { if (++Top < MAXSTACK) Stack[Top] = Num; --- 696,709 ---- static double PSFakeStack[MAXPSFAKESTACK]; static int PSFakeTop; ! static void ! ClearStack() { Top = -1; } ! static void ! Push(Num) double Num; { if (++Top < MAXSTACK) Stack[Top] = Num; *************** *** 704,715 **** else Error0("Push: Stack full\n"); } ! static ClearCallStack() { CallTop = -1; } ! static PushCall(CurrStrP, CurrIndex, CurrKey) psobj *CurrStrP; int CurrIndex; unsigned short CurrKey; --- 710,723 ---- else Error0("Push: Stack full\n"); } ! static void ! ClearCallStack() { CallTop = -1; } ! static void ! PushCall(CurrStrP, CurrIndex, CurrKey) psobj *CurrStrP; int CurrIndex; unsigned short CurrKey; *************** *** 722,728 **** else Error0("PushCall: Stack full\n"); } ! static PopCall(CurrStrPP, CurrIndexP, CurrKeyP) psobj **CurrStrPP; int *CurrIndexP; unsigned short *CurrKeyP; --- 730,737 ---- else Error0("PushCall: Stack full\n"); } ! static void ! PopCall(CurrStrPP, CurrIndexP, CurrKeyP) psobj **CurrStrPP; int *CurrIndexP; unsigned short *CurrKeyP; *************** *** 735,747 **** else Error0("PopCall: Stack empty\n"); } ! static ClearPSFakeStack() { PSFakeTop = -1; } /* PSFakePush: Pushes a number onto the fake PostScript stack */ ! static PSFakePush(Num) double Num; { if (++PSFakeTop < MAXPSFAKESTACK) PSFakeStack[PSFakeTop] = Num; --- 744,758 ---- else Error0("PopCall: Stack empty\n"); } ! static void ! ClearPSFakeStack() { PSFakeTop = -1; } /* PSFakePush: Pushes a number onto the fake PostScript stack */ ! static void ! PSFakePush(Num) double Num; { if (++PSFakeTop < MAXPSFAKESTACK) PSFakeStack[PSFakeTop] = Num; *************** *** 749,755 **** } /* PSFakePop: Removes a number from the top of the fake PostScript stack */ ! static double PSFakePop () { if (PSFakeTop >= 0) return(PSFakeStack[PSFakeTop--]); else Error0Ret("PSFakePop : Stack empty\n", 0.0); --- 760,767 ---- } /* PSFakePop: Removes a number from the top of the fake PostScript stack */ ! static double ! PSFakePop () { if (PSFakeTop >= 0) return(PSFakeStack[PSFakeTop--]); else Error0Ret("PSFakePop : Stack empty\n", 0.0); *************** *** 862,868 **** Error0("StartDecrypt: Premature end of CharString\n"); } ! static Decode(Code) int Code; { int Code1, Code2, Code3, Code4; --- 874,881 ---- Error0("StartDecrypt: Premature end of CharString\n"); } ! static void ! Decode(Code) int Code; { int Code1, Code2, Code3, Code4; *************** *** 892,898 **** } /* Interpret a command code */ ! static DoCommand(Code) int Code; { switch(Code) { --- 905,912 ---- } /* Interpret a command code */ ! static void ! DoCommand(Code) int Code; { switch(Code) { *************** *** 1010,1016 **** } } ! static Escape(Code) int Code; { int i, Num; --- 1024,1031 ---- } } ! static void ! Escape(Code) int Code; { int i, Num; *************** *** 1105,1111 **** /* Declares the vertical range of a horizontal stem zone */ /* between coordinates y and y + dy */ /* y is relative to the left sidebearing point */ ! static HStem(y, dy) double y, dy; { IfTrace2((FontDebug), "Hstem %f %f\n", &y, &dy); --- 1120,1127 ---- /* Declares the vertical range of a horizontal stem zone */ /* between coordinates y and y + dy */ /* y is relative to the left sidebearing point */ ! static void ! HStem(y, dy) double y, dy; { IfTrace2((FontDebug), "Hstem %f %f\n", &y, &dy); *************** *** 1126,1132 **** /* Declares the horizontal range of a vertical stem zone */ /* between coordinates x and x + dx */ /* x is relative to the left sidebearing point */ ! static VStem(x, dx) double x, dx; { IfTrace2((FontDebug), "Vstem %f %f\n", &x, &dx); --- 1142,1149 ---- /* Declares the horizontal range of a vertical stem zone */ /* between coordinates x and x + dx */ /* x is relative to the left sidebearing point */ ! static void ! VStem(x, dx) double x, dx; { IfTrace2((FontDebug), "Vstem %f %f\n", &x, &dx); *************** *** 1145,1151 **** /* |- dx dy RLINETO |- */ /* Behaves like RLINETO in PostScript */ ! static RLineTo(dx, dy) double dx, dy; { struct segment *B; --- 1162,1169 ---- /* |- dx dy RLINETO |- */ /* Behaves like RLINETO in PostScript */ ! static void ! RLineTo(dx, dy) double dx, dy; { struct segment *B; *************** *** 1168,1174 **** /* Relative RCURVETO, equivalent to dx1 dy1 */ /* (dx1+dx2) (dy1+dy2) (dx1+dx2+dx3) */ /* (dy1+dy2+dy3) RCURVETO in PostScript */ ! static RRCurveTo(dx1, dy1, dx2, dy2, dx3, dy3) double dx1, dy1, dx2, dy2, dx3, dy3; { struct segment *B, *C, *D; --- 1186,1193 ---- /* Relative RCURVETO, equivalent to dx1 dy1 */ /* (dx1+dx2) (dy1+dy2) (dx1+dx2+dx3) */ /* (dy1+dy2+dy3) RCURVETO in PostScript */ ! static void ! RRCurveTo(dx1, dy1, dx2, dy2, dx3, dy3) double dx1, dy1, dx2, dy2, dx3, dy3; { struct segment *B, *C, *D; *************** *** 1201,1207 **** /* - CLOSEPATH |- */ /* Closes a subpath WITHOUT repositioning the */ /* current point */ ! static DoClosePath() { struct segment *CurrentPoint; --- 1220,1227 ---- /* - CLOSEPATH |- */ /* Closes a subpath WITHOUT repositioning the */ /* current point */ ! static void ! DoClosePath() { struct segment *CurrentPoint; *************** *** 1214,1220 **** /* subr# CALLSUBR - */ /* Calls a CharString subroutine with index */ /* subr# from the Subrs array */ ! static CallSubr(subrno) int subrno; { IfTrace1((FontDebug), "CallSubr %d\n", subrno); --- 1234,1241 ---- /* subr# CALLSUBR - */ /* Calls a CharString subroutine with index */ /* subr# from the Subrs array */ ! static void ! CallSubr(subrno) int subrno; { IfTrace1((FontDebug), "CallSubr %d\n", subrno); *************** *** 1228,1234 **** /* - RETURN - */ /* Returns from a Subrs array CharString */ /* subroutine called with CALLSUBR */ ! static Return() { IfTrace0((FontDebug), "Return\n"); PopCall(&CharStringP, &strindex, &r); --- 1249,1256 ---- /* - RETURN - */ /* Returns from a Subrs array CharString */ /* subroutine called with CALLSUBR */ ! static void ! Return() { IfTrace0((FontDebug), "Return\n"); PopCall(&CharStringP, &strindex, &r); *************** *** 1242,1248 **** /* HSBW or SBW. It then calls a special version of FILL */ /* or STROKE depending on the value of PaintType in the */ /* font dictionary */ ! static EndChar() { IfTrace0((FontDebug), "EndChar\n"); --- 1264,1271 ---- /* HSBW or SBW. It then calls a special version of FILL */ /* or STROKE depending on the value of PaintType in the */ /* font dictionary */ ! static void ! EndChar() { IfTrace0((FontDebug), "EndChar\n"); *************** *** 1259,1265 **** /* |- dx dy RMOVETO |- */ /* Behaves like RMOVETO in PostScript */ ! static RMoveTo(dx,dy) double dx,dy; { struct segment *B; --- 1282,1289 ---- /* |- dx dy RMOVETO |- */ /* Behaves like RMOVETO in PostScript */ ! static void ! RMoveTo(dx,dy) double dx,dy; { struct segment *B; *************** *** 1281,1287 **** /* - DOTSECTION |- */ /* Brackets an outline section for the dots in */ /* letters such as "i", "j", and "!". */ ! static DotSection() { IfTrace0((FontDebug), "DotSection\n"); InDotSection = !InDotSection; --- 1305,1312 ---- /* - DOTSECTION |- */ /* Brackets an outline section for the dots in */ /* letters such as "i", "j", and "!". */ ! static void ! DotSection() { IfTrace0((FontDebug), "DotSection\n"); InDotSection = !InDotSection; *************** *** 1289,1295 **** /* |- asb adx ady bchar achar SEAC |- */ /* Standard Encoding Accented Character. */ ! static Seac(asb, adx, ady, bchar, achar) double asb, adx, ady; unsigned char bchar, achar; { --- 1314,1321 ---- /* |- asb adx ady bchar achar SEAC |- */ /* Standard Encoding Accented Character. */ ! static void ! Seac(asb, adx, ady, bchar, achar) double asb, adx, ady; unsigned char bchar, achar; { *************** *** 1353,1359 **** /* |- sbx sby wx wy SBW |- */ /* Set the left sidebearing point to (sbx,sby), */ /* set the character width vector to (wx,wy). */ ! static Sbw(sbx, sby, wx, wy) double sbx, sby, wx, wy; { IfTrace4((FontDebug), "SBW %f %f %f %f\n", &sbx, &sby, &wx, &wy); --- 1379,1386 ---- /* |- sbx sby wx wy SBW |- */ /* Set the left sidebearing point to (sbx,sby), */ /* set the character width vector to (wx,wy). */ ! static void ! Sbw(sbx, sby, wx, wy) double sbx, sby, wx, wy; { IfTrace4((FontDebug), "SBW %f %f %f %f\n", &sbx, &sby, &wx, &wy); *************** *** 1458,1465 **** /* Calling sequence: 'idmin epX epY 3 0 callothersubr' */ /* Computes Flex values, and renders the Flex path, */ /* and returns (leaves) ending coordinates on stack */ ! static void FlxProc(c1x2, c1y2, c3x0, c3y0, c3x1, c3y1, c3x2, c3y2, ! c4x0, c4y0, c4x1, c4y1, c4x2, c4y2, epY, epX, idmin) double c1x2, c1y2; double c3x0, c3y0, c3x1, c3y1, c3x2, c3y2; double c4x0, c4y0, c4x1, c4y1, c4x2, c4y2; --- 1485,1493 ---- /* Calling sequence: 'idmin epX epY 3 0 callothersubr' */ /* Computes Flex values, and renders the Flex path, */ /* and returns (leaves) ending coordinates on stack */ ! static void ! FlxProc(c1x2, c1y2, c3x0, c3y0, c3x1, c3y1, c3x2, c3y2, ! c4x0, c4y0, c4x1, c4y1, c4x2, c4y2, epY, epX, idmin) double c1x2, c1y2; double c3x0, c3y0, c3x1, c3y1, c3x2, c3y2; double c4x0, c4y0, c4x1, c4y1, c4x2, c4y2; *************** *** 1483,1488 **** --- 1511,1518 ---- double cx, cy; double ex, ey; + c1x0 = c1y0 = c1x1 = c1y1 = c2x0 = c2y0 = c2x1 = c2y1 = c2x2 = c2y2 = 0.0; + Destroy(path); path = FlxOldPath; /* Restore previous path (stored in FlxProc1) */ *************** *** 1666,1672 **** /* arg1 ... argn n othersubr# CALLOTHERSUBR - */ /* Make calls on the PostScript interpreter (or call equivalent C code) */ /* NOTE: The n arguments have been pushed on the fake PostScript stack */ ! static CallOtherSubr(othersubrno) int othersubrno; { IfTrace1((FontDebug), "CallOtherSubr %d\n", othersubrno); --- 1696,1703 ---- /* arg1 ... argn n othersubr# CALLOTHERSUBR - */ /* Make calls on the PostScript interpreter (or call equivalent C code) */ /* NOTE: The n arguments have been pushed on the fake PostScript stack */ ! static void ! CallOtherSubr(othersubrno) int othersubrno; { IfTrace1((FontDebug), "CallOtherSubr %d\n", othersubrno); *************** *** 1701,1707 **** /* Sets the current point to (x,y) in absolute */ /* character space coordinates without per- */ /* forming a CharString MOVETO command */ ! static SetCurrentPoint(x, y) double x, y; { IfTrace2((FontDebug), "SetCurrentPoint %f %f\n", &x, &y); --- 1732,1739 ---- /* Sets the current point to (x,y) in absolute */ /* character space coordinates without per- */ /* forming a CharString MOVETO command */ ! static void ! SetCurrentPoint(x, y) double x, y; { IfTrace2((FontDebug), "SetCurrentPoint %f %f\n", &x, &y); *** ./lib/font/bitmap/bdfint.h@@/PUBLIC-LATEST Mon Feb 9 10:45:59 1998 --- xc/lib/font/bitmap/bdfint.h Fri May 1 16:43:39 1998 *************** *** 1,4 **** ! /* $TOG: bdfint.h /main/4 1998/02/09 10:46:16 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: bdfint.h /main/5 1998/05/01 16:42:08 kaleb $ */ /* *************** *** 65,71 **** extern unsigned char *bdfGetLine(); ! extern void bdfError(); extern void bdfWarning(); extern Atom bdfForceMakeAtom(); extern Atom bdfGetPropertyValue(); --- 65,75 ---- extern unsigned char *bdfGetLine(); ! extern void bdfError( ! #if NeedVarargsPrototypes ! char* message, ... ! #endif ! ); extern void bdfWarning(); extern Atom bdfForceMakeAtom(); extern Atom bdfGetPropertyValue(); *** ./lib/font/bitmap/bdfread.c@@/PUBLIC-LATEST Mon Feb 9 10:46:08 1998 --- xc/lib/font/bitmap/bdfread.c Fri May 1 16:47:38 1998 *************** *** 1,4 **** ! /* $TOG: bdfread.c /main/23 1998/02/09 10:46:22 kaleb $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. --- 1,4 ---- ! /* $TOG: bdfread.c /main/26 1998/05/01 16:46:08 kaleb $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. *************** *** 59,65 **** extern int bitmapGetGlyphs(), bitmapGetMetrics(); extern int bitmapGetBitmaps(), bitmapGetExtents(); - void bdfUnloadFont(); static Bool bdfPadToTerminal(); extern int bdfFileLineNum; --- 59,64 ---- *************** *** 215,221 **** --- 214,245 ---- /***====================================================================***/ + static void + bdfFreeFontBits(pFont) + FontPtr pFont; + { + BitmapFontPtr bitmapFont; + BitmapExtraPtr bitmapExtra; + int i; + bitmapFont = (BitmapFontPtr) pFont->fontPrivate; + bitmapExtra = (BitmapExtraPtr) bitmapFont->bitmapExtra; + xfree(bitmapFont->ink_metrics); + xfree(bitmapFont->encoding); + for (i = 0; i < bitmapFont->num_chars; i++) + xfree(bitmapFont->metrics[i].bits); + xfree(bitmapFont->metrics); + if (bitmapExtra) + { + xfree (bitmapExtra->glyphNames); + xfree (bitmapExtra->sWidths); + xfree (bitmapExtra); + } + xfree(pFont->info.props); + xfree(bitmapFont); + } + + static Bool bdfReadCharacters(file, pFont, pState, bit, byte, glyph, scan) FontFilePtr file; *************** *** 271,276 **** --- 295,301 ---- sizeof(CharInfoRec)); goto BAILOUT; } + bzero((char *)ci, nchars * sizeof(CharInfoRec)); bitmapFont->metrics = ci; if (bitmapExtra) { *************** *** 565,571 **** line = bdfGetLine(file, lineBuf, BDFLINELEN); if (!line || !bdfIsPrefix(line, "STARTPROPERTIES")) { ! bdfError(file, "missing 'STARTPROPERTIES'\n"); return (FALSE); } if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) { --- 590,596 ---- line = bdfGetLine(file, lineBuf, BDFLINELEN); if (!line || !bdfIsPrefix(line, "STARTPROPERTIES")) { ! bdfError("missing 'STARTPROPERTIES'\n"); return (FALSE); } if (sscanf((char *) line, "STARTPROPERTIES %d", &nProps) != 1) { *************** *** 589,594 **** --- 614,621 ---- sizeof(FontPropRec)); goto BAILOUT; } + bzero((char *)props, (nProps + BDF_GENPROPS) * sizeof(FontPropRec)); + nextProp = 0; props_left = nProps; while (props_left-- > 0) { *************** *** 742,747 **** --- 769,783 ---- /***====================================================================***/ + static void + bdfUnloadFont(pFont) + FontPtr pFont; + { + bdfFreeFontBits (pFont); + xfree (pFont->devPrivates); + xfree(pFont); + } + int bdfReadFont(pFont, file, bit, byte, glyph, scan) FontPtr pFont; *************** *** 767,772 **** --- 803,809 ---- bitmapFont = (BitmapFontPtr) xalloc(sizeof(BitmapFontRec)); if (!bitmapFont) goto BAILOUT; + bzero((char *)bitmapFont, sizeof(BitmapFontRec)); pFont->fontPrivate = (pointer) bitmapFont; bitmapFont->metrics = 0; *************** *** 774,780 **** --- 811,822 ---- bitmapFont->bitmaps = 0; bitmapFont->encoding = 0; bitmapFont->pDefault = NULL; + bitmapFont->bitmapExtra = (BitmapExtraPtr) xalloc(sizeof(BitmapExtraRec)); + if (!bitmapFont->bitmapExtra) + goto BAILOUT; + bzero((char *)bitmapFont->bitmapExtra, sizeof(BitmapExtraRec)); + bitmapFont->bitmapExtra->glyphNames = 0; bitmapFont->bitmapExtra->sWidths = 0; *************** *** 845,874 **** return AllocError; } - bdfFreeFontBits(pFont) - FontPtr pFont; - { - BitmapFontPtr bitmapFont; - BitmapExtraPtr bitmapExtra; - int i; - - bitmapFont = (BitmapFontPtr) pFont->fontPrivate; - bitmapExtra = (BitmapExtraPtr) bitmapFont->bitmapExtra; - xfree(bitmapFont->ink_metrics); - xfree(bitmapFont->encoding); - for (i = 0; i < bitmapFont->num_chars; i++) - xfree(bitmapFont->metrics[i].bits); - xfree(bitmapFont->metrics); - if (bitmapExtra) - { - xfree (bitmapExtra->glyphNames); - xfree (bitmapExtra->sWidths); - xfree (bitmapExtra); - } - xfree(pFont->info.props); - xfree(bitmapFont); - } - int bdfReadFontInfo(pFontInfo, file) FontInfoPtr pFontInfo; --- 887,892 ---- *************** *** 877,882 **** --- 895,902 ---- FontRec font; int ret; + bzero(&font, sizeof (FontRec)); + ret = bdfReadFont(&font, file, MSBFirst, LSBFirst, 1, 1); if (ret == Successful) { *pFontInfo = font.info; *************** *** 888,902 **** return ret; } - void - bdfUnloadFont(pFont) - FontPtr pFont; - { - bdfFreeFontBits (pFont); - xfree (pFont->devPrivates); - xfree(pFont); - } - static Bool bdfPadToTerminal(pFont) FontPtr pFont; --- 908,913 ---- *************** *** 910,915 **** --- 921,928 ---- h; bitmapFont = (BitmapFontPtr) pFont->fontPrivate; + + bzero(&new, sizeof(CharInfoRec)); new.metrics.ascent = pFont->info.fontAscent; new.metrics.descent = pFont->info.fontDescent; new.metrics.leftSideBearing = 0; *************** *** 916,921 **** --- 929,935 ---- new.metrics.rightSideBearing = pFont->info.minbounds.characterWidth; new.metrics.characterWidth = new.metrics.rightSideBearing; new_size = BYTES_FOR_GLYPH(&new, pFont->glyph); + for (i = 0; i < bitmapFont->num_chars; i++) { new.bits = (char *) xalloc(new_size); if (!new.bits) *** ./lib/font/bitmap/bdfutils.c@@/PUBLIC-LATEST Mon Feb 9 10:46:13 1998 --- xc/lib/font/bitmap/bdfutils.c Fri May 1 17:52:47 1998 *************** *** 1,4 **** ! /* $TOG: bdfutils.c /main/12 1998/02/09 10:46:27 kaleb $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. --- 1,4 ---- ! /* $TOG: bdfutils.c /main/14 1998/05/01 17:52:09 kaleb $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. *************** *** 54,59 **** --- 54,64 ---- /* use bitmap structure */ #include "bitmap.h" #include "bdfint.h" + #if NeedVarargsPrototypes + #include + #else + #include + #endif int bdfFileLineNum; *************** *** 61,77 **** /* VARARGS1 */ void ! bdfError(message, a0, a1, a2, a3, a4, a5) ! char *message; ! pointer a0, ! a1, ! a2, ! a3, ! a4, ! a5; { fprintf(stderr, "BDF Error on line %d: ", bdfFileLineNum); ! fprintf(stderr, message, a0, a1, a2, a3, a4, a5); } /***====================================================================***/ --- 66,90 ---- /* VARARGS1 */ void ! #if NeedVarargsPrototypes ! bdfError(char* message, ...) ! #else ! bdfError (message, va_alist) ! char* message; ! va_dcl ! #endif { + va_list args; + + #if NeedVarargsPrototypes + va_start (args, message); + #else + va_start (args); + #endif + fprintf(stderr, "BDF Error on line %d: ", bdfFileLineNum); ! vfprintf(stderr, message, args); ! va_end (args); } /***====================================================================***/ *** ./lib/font/bitmap/bitmapfunc.c@@/PUBLIC-LATEST Mon Feb 9 10:46:17 1998 --- xc/lib/font/bitmap/bitmapfunc.c Thu May 7 15:18:27 1998 *************** *** 1,4 **** ! /* $TOG: bitmapfunc.c /main/11 1998/02/09 10:46:32 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: bitmapfunc.c /main/14 1998/05/07 15:23:26 kaleb $ */ /* *************** *** 48,69 **** * these two arrays must be in the same order */ static BitmapFileFunctionsRec readers[] = { ! pcfReadFont, pcfReadFontInfo, ! pcfReadFont, pcfReadFontInfo, #ifdef X_GZIP_FONT_COMPRESSION ! pcfReadFont, pcfReadFontInfo, #endif ! snfReadFont, snfReadFontInfo, ! snfReadFont, snfReadFontInfo, #ifdef X_GZIP_FONT_COMPRESSION ! snfReadFont, snfReadFontInfo, #endif ! bdfReadFont, bdfReadFontInfo, ! bdfReadFont, bdfReadFontInfo, #ifdef X_GZIP_FONT_COMPRESSION ! bdfReadFont, bdfReadFontInfo, #endif ! pmfReadFont, pcfReadFontInfo, }; --- 48,69 ---- * these two arrays must be in the same order */ static BitmapFileFunctionsRec readers[] = { ! { pcfReadFont, pcfReadFontInfo} , ! { pcfReadFont, pcfReadFontInfo} , #ifdef X_GZIP_FONT_COMPRESSION ! { pcfReadFont, pcfReadFontInfo} , #endif ! { snfReadFont, snfReadFontInfo} , ! { snfReadFont, snfReadFontInfo} , #ifdef X_GZIP_FONT_COMPRESSION ! { snfReadFont, snfReadFontInfo} , #endif ! { bdfReadFont, bdfReadFontInfo} , ! { bdfReadFont, bdfReadFontInfo} , #ifdef X_GZIP_FONT_COMPRESSION ! { bdfReadFont, bdfReadFontInfo} , #endif ! { pmfReadFont, pcfReadFontInfo} , }; *************** *** 70,124 **** #define CAPABILITIES (CAP_MATRIX | CAP_CHARSUBSETTING) static FontRendererRec renderers[] = { ! ".pcf", 4, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, ! ".pcf.Z", 6, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, #ifdef X_GZIP_FONT_COMPRESSION ! ".pcf.gz", 7, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, #endif ! ".snf", 4, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, ! ".snf.Z", 6, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, #ifdef X_GZIP_FONT_COMPRESSION ! ".snf.gz", 7, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, #endif ! ".bdf", 4, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, ! ".bdf.Z", 6, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, #ifdef X_GZIP_FONT_COMPRESSION ! ".bdf.gz", 7, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES, #endif ! ".pmf", 4, ! BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }; ! BitmapOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask, non_cachable_font) FontPathElementPtr fpe; FontPtr *ppFont; --- 70,114 ---- #define CAPABILITIES (CAP_MATRIX | CAP_CHARSUBSETTING) static FontRendererRec renderers[] = { ! { ".pcf", 4, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, ! { ".pcf.Z", 6, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, #ifdef X_GZIP_FONT_COMPRESSION ! { ".pcf.gz", 7, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, #endif ! { ".snf", 4, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, ! { ".snf.Z", 6, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, #ifdef X_GZIP_FONT_COMPRESSION ! { ".snf.gz", 7, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, #endif ! { ".bdf", 4, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, ! { ".bdf.Z", 6, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, #ifdef X_GZIP_FONT_COMPRESSION ! { ".bdf.gz", 7, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES }, #endif ! { ".pmf", 4, BitmapOpenBitmap, BitmapOpenScalable, BitmapGetInfoBitmap, BitmapGetInfoScalable, 0, ! CAPABILITIES } }; ! int BitmapOpenBitmap (fpe, ppFont, flags, entry, fileName, format, fmask, non_cachable_font) FontPathElementPtr fpe; FontPtr *ppFont; *************** *** 148,153 **** --- 138,144 ---- FontFileClose (file); return AllocError; } + bzero((char *)pFont, sizeof(FontRec)); /* set up default values */ FontDefaultFormat(&bit, &byte, &glyph, &scan); /* get any changes made from above */ *************** *** 168,174 **** return ret; } ! BitmapGetInfoBitmap (fpe, pFontInfo, entry, fileName) FontPathElementPtr fpe; FontInfoPtr pFontInfo; FontEntryPtr entry; --- 159,165 ---- return ret; } ! int BitmapGetInfoBitmap (fpe, pFontInfo, entry, fileName) FontPathElementPtr fpe; FontInfoPtr pFontInfo; FontEntryPtr entry; *************** *** 193,199 **** #define numRenderers (sizeof renderers / sizeof renderers[0]) ! BitmapRegisterFontFileFunctions () { int i; --- 184,190 ---- #define numRenderers (sizeof renderers / sizeof renderers[0]) ! void BitmapRegisterFontFileFunctions () { int i; *************** *** 206,212 **** * the font info reader, and the bitmap scaling routine. All users * of this routine must be kept in step with the renderer array. */ ! BitmapGetRenderIndex(renderer) FontRendererPtr renderer; { return renderer - renderers; --- 197,203 ---- * the font info reader, and the bitmap scaling routine. All users * of this routine must be kept in step with the renderer array. */ ! int BitmapGetRenderIndex(renderer) FontRendererPtr renderer; { return renderer - renderers; *** ./lib/font/bitmap/bitscale.c@@/PUBLIC-LATEST Mon Feb 9 10:46:30 1998 --- xc/lib/font/bitmap/bitscale.c Thu May 7 15:22:05 1998 *************** *** 1,4 **** ! /* $TOG: bitscale.c /main/32 1998/02/09 10:46:45 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: bitscale.c /main/36 1998/05/07 15:27:04 kaleb $ */ /* *************** *** 93,118 **** static unsigned long fontGeneration = 0; /* initialization flag */ static fontProp fontNamePropTable[] = { ! "FOUNDRY", 0, atom, ! "FAMILY_NAME", 0, atom, ! "WEIGHT_NAME", 0, atom, ! "SLANT", 0, atom, ! "SETWIDTH_NAME", 0, atom, ! "ADD_STYLE_NAME", 0, atom, ! "PIXEL_SIZE", 0, pixel_size, ! "POINT_SIZE", 0, point_size, ! "RESOLUTION_X", 0, resolution_x, ! "RESOLUTION_Y", 0, resolution_y, ! "SPACING", 0, atom, ! "AVERAGE_WIDTH", 0, average_width, ! "CHARSET_REGISTRY", 0, atom, ! "CHARSET_ENCODING", 0, truncate_atom, ! "FONT", 0, fontname, ! "RAW_ASCENT", 0, raw_ascent, ! "RAW_DESCENT", 0, raw_descent, ! "RAW_PIXEL_SIZE", 0, raw_pixelsize, ! "RAW_POINT_SIZE", 0, raw_pointsize, ! "RAW_AVERAGE_WIDTH", 0, raw_average_width }; #define TRANSFORM_POINT(matrix, x, y, dest) \ --- 93,118 ---- static unsigned long fontGeneration = 0; /* initialization flag */ static fontProp fontNamePropTable[] = { ! { "FOUNDRY", 0, atom }, ! { "FAMILY_NAME", 0, atom }, ! { "WEIGHT_NAME", 0, atom }, ! { "SLANT", 0, atom }, ! { "SETWIDTH_NAME", 0, atom }, ! { "ADD_STYLE_NAME", 0, atom }, ! { "PIXEL_SIZE", 0, pixel_size }, ! { "POINT_SIZE", 0, point_size }, ! { "RESOLUTION_X", 0, resolution_x }, ! { "RESOLUTION_Y", 0, resolution_y }, ! { "SPACING", 0, atom }, ! { "AVERAGE_WIDTH", 0, average_width }, ! { "CHARSET_REGISTRY", 0, atom }, ! { "CHARSET_ENCODING", 0, truncate_atom }, ! { "FONT", 0, fontname }, ! { "RAW_ASCENT", 0, raw_ascent }, ! { "RAW_DESCENT", 0, raw_descent }, ! { "RAW_PIXEL_SIZE", 0, raw_pixelsize }, ! { "RAW_POINT_SIZE", 0, raw_pointsize }, ! { "RAW_AVERAGE_WIDTH", 0, raw_average_width } }; #define TRANSFORM_POINT(matrix, x, y, dest) \ *************** *** 132,189 **** is important. */ static fontProp fontPropTable[] = { ! "MIN_SPACE", 0, scaledX, ! "NORM_SPACE", 0, scaledX, ! "MAX_SPACE", 0, scaledX, ! "END_SPACE", 0, scaledX, ! "AVG_CAPITAL_WIDTH", 0, scaledX, ! "AVG_LOWERCASE_WIDTH", 0, scaledX, ! "QUAD_WIDTH", 0, scaledX, ! "FIGURE_WIDTH", 0, scaledX, ! "SUPERSCRIPT_X", 0, scaledX, ! "SUPERSCRIPT_Y", 0, scaledY, ! "SUBSCRIPT_X", 0, scaledX, ! "SUBSCRIPT_Y", 0, scaledY, ! "SUPERSCRIPT_SIZE", 0, scaledY, ! "SUBSCRIPT_SIZE", 0, scaledY, ! "SMALL_CAP_SIZE", 0, scaledY, ! "UNDERLINE_POSITION", 0, scaledY, ! "UNDERLINE_THICKNESS", 0, scaledY, ! "STRIKEOUT_ASCENT", 0, scaledY, ! "STRIKEOUT_DESCENT", 0, scaledY, ! "CAP_HEIGHT", 0, scaledY, ! "X_HEIGHT", 0, scaledY, ! "ITALIC_ANGLE", 0, unscaled, ! "RELATIVE_SETWIDTH", 0, unscaled, ! "RELATIVE_WEIGHT", 0, unscaled, ! "WEIGHT", 0, unscaled, ! "DESTINATION", 0, unscaled, ! "PCL_FONT_NAME", 0, unscaled, ! "_ADOBE_POSTSCRIPT_FONTNAME", 0, unscaled }; static fontProp rawFontPropTable[] = { ! "RAW_MIN_SPACE", 0, 0, ! "RAW_NORM_SPACE", 0, 0, ! "RAW_MAX_SPACE", 0, 0, ! "RAW_END_SPACE", 0, 0, ! "RAW_AVG_CAPITAL_WIDTH", 0, 0, ! "RAW_AVG_LOWERCASE_WIDTH", 0, 0, ! "RAW_QUAD_WIDTH", 0, 0, ! "RAW_FIGURE_WIDTH", 0, 0, ! "RAW_SUPERSCRIPT_X", 0, 0, ! "RAW_SUPERSCRIPT_Y", 0, 0, ! "RAW_SUBSCRIPT_X", 0, 0, ! "RAW_SUBSCRIPT_Y", 0, 0, ! "RAW_SUPERSCRIPT_SIZE", 0, 0, ! "RAW_SUBSCRIPT_SIZE", 0, 0, ! "RAW_SMALL_CAP_SIZE", 0, 0, ! "RAW_UNDERLINE_POSITION", 0, 0, ! "RAW_UNDERLINE_THICKNESS", 0, 0, ! "RAW_STRIKEOUT_ASCENT", 0, 0, ! "RAW_STRIKEOUT_DESCENT", 0, 0, ! "RAW_CAP_HEIGHT", 0, 0, ! "RAW_X_HEIGHT", 0, 0, }; static void --- 132,192 ---- is important. */ static fontProp fontPropTable[] = { ! { "MIN_SPACE", 0, scaledX }, ! { "NORM_SPACE", 0, scaledX }, ! { "MAX_SPACE", 0, scaledX }, ! { "END_SPACE", 0, scaledX }, ! { "AVG_CAPITAL_WIDTH", 0, scaledX }, ! { "AVG_LOWERCASE_WIDTH", 0, scaledX }, ! { "QUAD_WIDTH", 0, scaledX }, ! { "FIGURE_WIDTH", 0, scaledX }, ! { "SUPERSCRIPT_X", 0, scaledX }, ! { "SUPERSCRIPT_Y", 0, scaledY }, ! { "SUBSCRIPT_X", 0, scaledX }, ! { "SUBSCRIPT_Y", 0, scaledY }, ! { "SUPERSCRIPT_SIZE", 0, scaledY }, ! { "SUBSCRIPT_SIZE", 0, scaledY }, ! { "SMALL_CAP_SIZE", 0, scaledY }, ! { "UNDERLINE_POSITION", 0, scaledY }, ! { "UNDERLINE_THICKNESS", 0, scaledY }, ! { "STRIKEOUT_ASCENT", 0, scaledY }, ! { "STRIKEOUT_DESCENT", 0, scaledY }, ! { "CAP_HEIGHT", 0, scaledY }, ! { "X_HEIGHT", 0, scaledY }, ! { "ITALIC_ANGLE", 0, unscaled }, ! { "RELATIVE_SETWIDTH", 0, unscaled }, ! { "RELATIVE_WEIGHT", 0, unscaled }, ! { "WEIGHT", 0, unscaled }, ! { "DESTINATION", 0, unscaled }, ! { "PCL_FONT_NAME", 0, unscaled }, ! { "_ADOBE_POSTSCRIPT_FONTNAME", 0, unscaled } }; + /* sleazy way to shut up the compiler */ + #define zerohack (enum scaleType)0 + static fontProp rawFontPropTable[] = { ! { "RAW_MIN_SPACE", 0, }, ! { "RAW_NORM_SPACE", 0, }, ! { "RAW_MAX_SPACE", 0, }, ! { "RAW_END_SPACE", 0, }, ! { "RAW_AVG_CAPITAL_WIDTH", 0, }, ! { "RAW_AVG_LOWERCASE_WIDTH", 0, }, ! { "RAW_QUAD_WIDTH", 0, }, ! { "RAW_FIGURE_WIDTH", 0, }, ! { "RAW_SUPERSCRIPT_X", 0, }, ! { "RAW_SUPERSCRIPT_Y", 0, }, ! { "RAW_SUBSCRIPT_X", 0, }, ! { "RAW_SUBSCRIPT_Y", 0, }, ! { "RAW_SUPERSCRIPT_SIZE", 0, }, ! { "RAW_SUBSCRIPT_SIZE", 0, }, ! { "RAW_SMALL_CAP_SIZE", 0, }, ! { "RAW_UNDERLINE_POSITION", 0, }, ! { "RAW_UNDERLINE_THICKNESS", 0, }, ! { "RAW_STRIKEOUT_ASCENT", 0, }, ! { "RAW_STRIKEOUT_DESCENT", 0, }, ! { "RAW_CAP_HEIGHT", 0, }, ! { "RAW_X_HEIGHT", 0, } }; static void *************** *** 361,366 **** --- 364,370 ---- best_score = 0; best_unscaled = 0; best_unscaled_score = -1; + best_dx_amount = best_dy_amount = HUGE_VAL; memcpy (zeroChars, entry->name.name, entry->name.length); zeroChars[entry->name.length] = '\0'; zeroName.name = zeroChars; *************** *** 415,421 **** extra = zero->u.scalable.extra; for (i = 0; i < extra->numScaled; i++) { - FontScalableRec tmpvals; scaled = &extra->scaled[i]; if (!scaled->bitmap) continue; --- 419,424 ---- *************** *** 769,775 **** double dx, dy, *inv_xform, *xmult, *ymult; register double *xform; { ! double det, sintheta, costheta, tanphi; double pixel = get_matrix_vertical_component(vals->pixel_matrix); double pixelset = get_matrix_horizontal_component(vals->pixel_matrix); --- 772,778 ---- double dx, dy, *inv_xform, *xmult, *ymult; register double *xform; { ! double det; double pixel = get_matrix_vertical_component(vals->pixel_matrix); double pixelset = get_matrix_horizontal_component(vals->pixel_matrix); *************** *** 847,853 **** CharInfoPtr pci, opci; int nchars; /* how many characters in the font */ - int *scratch; int i; int glyph; int firstCol, lastCol, firstRow, lastRow; --- 850,855 ---- *************** *** 1003,1009 **** pci = bitmapFont->metrics; for (i = 0; i < nchars; i++) { ! if (opci = obitmapFont->encoding[inkindex2 = OLDINDEX(i)]) { double newlsb, newrsb, newdesc, newasc, point[2]; --- 1005,1011 ---- pci = bitmapFont->metrics; for (i = 0; i < nchars; i++) { ! if ((opci = obitmapFont->encoding[inkindex2 = OLDINDEX(i)])) { double newlsb, newrsb, newdesc, newasc, point[2]; *************** *** 1103,1109 **** pci = bitmapFont->metrics; for (i = 0; i < nchars; i++) { - CharInfoRec temppci; if ((pci = bitmapFont->encoding[i]) && (opci = obitmapFont->encoding[OLDINDEX(i)])) { --- 1105,1110 ---- *************** *** 1188,1215 **** return NULL; } - static int - lcm(a, b) /* least common multiple */ - int a, - b; - { - register int m; - register int larger, - smaller; - - if (a > b) { - m = larger = a; - smaller = b; - } else { - m = larger = b; - smaller = a; - } - - while (m % smaller) - m += larger; - return m; - } - static void ScaleBitmap(pFont, opci, pci, inv_xform, widthMult, heightMult) FontPtr pFont; --- 1189,1194 ---- *************** *** 1596,1602 **** glyph = pf->glyph; for (i = 0; i < nchars; i++) { ! if (pci = bitmapFont->encoding[i]) bytestoalloc += BYTES_FOR_GLYPH(pci, glyph); } --- 1575,1581 ---- glyph = pf->glyph; for (i = 0; i < nchars; i++) { ! if ((pci = bitmapFont->encoding[i])) bytestoalloc += BYTES_FOR_GLYPH(pci, glyph); } *************** *** 1675,1681 **** glyph = pf->glyph; for (i = 0; i < nchars; i++) { ! if (pci = bitmapFont->encoding[i]) bytestoalloc = MAX(bytestoalloc,BYTES_FOR_GLYPH(pci, glyph)); } --- 1654,1660 ---- glyph = pf->glyph; for (i = 0; i < nchars; i++) { ! if ((pci = bitmapFont->encoding[i])) bytestoalloc = MAX(bytestoalloc,BYTES_FOR_GLYPH(pci, glyph)); } *************** *** 1756,1761 **** --- 1735,1741 ---- #endif /* ARGSUSED */ + int BitmapOpenScalable (fpe, pFont, flags, entry, fileName, vals, format, fmask, non_cachable_font) FontPathElementPtr fpe; *************** *** 1858,1863 **** --- 1838,1844 ---- return Successful; } + int BitmapGetInfoScalable (fpe, pFontInfo, entry, fontName, fileName, vals) FontPathElementPtr fpe; FontInfoPtr pFontInfo; *** ./lib/font/bitmap/fontink.c@@/PUBLIC-LATEST Mon Feb 9 10:46:37 1998 --- xc/lib/font/bitmap/fontink.c Fri May 1 16:43:53 1998 *************** *** 1,4 **** ! /* $TOG: fontink.c /main/5 1998/02/09 10:46:51 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontink.c /main/6 1998/05/01 16:42:21 kaleb $ */ /* *************** *** 38,43 **** --- 38,44 ---- 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, }; + void FontCharInkMetrics(pFont, pCI, pInk) FontPtr pFont; CharInfoPtr pCI; *************** *** 151,156 **** --- 152,158 ---- #define Min(a,b) ((a)<(b)?(a):(b)) #define Max(a,b) ((a)>(b)?(a):(b)) + void FontCharReshape(pFont, pSrc, pDst) FontPtr pFont; CharInfoPtr pSrc, *************** *** 209,213 **** out_line += out_bytes; } } - return; } --- 211,214 ---- *** ./lib/font/bitmap/pcfread.c@@/PUBLIC-LATEST Mon Feb 9 10:46:41 1998 --- xc/lib/font/bitmap/pcfread.c Thu May 7 15:15:44 1998 *************** *** 1,4 **** ! /* $TOG: pcfread.c /main/19 1998/02/09 10:46:55 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: pcfread.c /main/21 1998/05/07 15:20:43 kaleb $ */ /* *************** *** 131,137 **** * metrics */ ! static pcfGetMetric(file, format, metric) FontFilePtr file; CARD32 format; --- 131,137 ---- * metrics */ ! static void pcfGetMetric(file, format, metric) FontFilePtr file; CARD32 format; *************** *** 145,151 **** metric->attributes = pcfGetINT16(file, format); } ! static pcfGetCompressedMetric(file, format, metric) FontFilePtr file; CARD32 format; --- 145,151 ---- metric->attributes = pcfGetINT16(file, format); } ! static void pcfGetCompressedMetric(file, format, metric) FontFilePtr file; CARD32 format; *************** *** 702,708 **** CharInfoPtr *encoding = 0; int nencoding; int encodingOffset; - CARD32 bitmapSizes[GLYPHPADOPTIONS]; Bool hasBDFAccelerators; CharInfoPtr pci; --- 702,707 ---- *** ./lib/font/bitmap/pcfwrite.c@@/PUBLIC-LATEST Mon Feb 9 10:46:45 1998 --- xc/lib/font/bitmap/pcfwrite.c Fri May 1 16:43:58 1998 *************** *** 1,4 **** ! /* $TOG: pcfwrite.c /main/7 1998/02/09 10:47:00 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: pcfwrite.c /main/8 1998/05/01 16:42:26 kaleb $ */ /* *************** *** 102,108 **** return FontFilePutc(c, file); } ! static pcfWriteTOC(file, table, count) FontFilePtr file; PCFTablePtr table; --- 102,108 ---- return FontFilePutc(c, file); } ! static void pcfWriteTOC(file, table, count) FontFilePtr file; PCFTablePtr table; *************** *** 123,129 **** } } ! static pcfPutCompressedMetric(file, format, metric) FontFilePtr file; CARD32 format; --- 123,129 ---- } } ! static void pcfPutCompressedMetric(file, format, metric) FontFilePtr file; CARD32 format; *************** *** 136,142 **** pcfPutINT8(file, format, metric->descent + 0x80); } ! static pcfPutMetric(file, format, metric) FontFilePtr file; CARD32 format; --- 136,142 ---- pcfPutINT8(file, format, metric->descent + 0x80); } ! static void pcfPutMetric(file, format, metric) FontFilePtr file; CARD32 format; *************** *** 150,156 **** pcfPutINT16(file, format, metric->attributes); } ! static pcfPutBitmap(file, format, pCI) FontFilePtr file; CARD32 format; --- 150,156 ---- pcfPutINT16(file, format, metric->attributes); } ! static void pcfPutBitmap(file, format, pCI) FontFilePtr file; CARD32 format; *************** *** 166,172 **** FontFilePutc(*bits++, file); } ! static pcfPutAccel(file, format, pFontInfo) FontFilePtr file; CARD32 format; --- 166,172 ---- FontFilePutc(*bits++, file); } ! static void pcfPutAccel(file, format, pFontInfo) FontFilePtr file; CARD32 format; *************** *** 216,221 **** --- 216,222 ---- return NameForAtom(a); } + int pcfWriteFont(pFont, file) FontPtr pFont; FontFilePtr file; *** ./lib/font/bitmap/snfread.c@@/PUBLIC-LATEST Mon Feb 9 10:46:54 1998 --- xc/lib/font/bitmap/snfread.c Fri May 1 16:44:01 1998 *************** *** 1,4 **** ! /* $TOG: snfread.c /main/18 1998/02/09 10:47:08 kaleb $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. --- 1,4 ---- ! /* $TOG: snfread.c /main/19 1998/05/01 16:42:29 kaleb $ */ /************************************************************************ Copyright 1989 by Digital Equipment Corporation, Maynard, Massachusetts. *************** *** 91,97 **** return Successful; } ! static snfCopyInfo(snfInfo, pFontInfo) snfFontInfoPtr snfInfo; FontInfoPtr pFontInfo; --- 91,97 ---- return Successful; } ! static void snfCopyInfo(snfInfo, pFontInfo) snfFontInfoPtr snfInfo; FontInfoPtr pFontInfo; *************** *** 175,180 **** --- 175,206 ---- return Successful; } + static int snf_set; + static int snf_bit, snf_byte, snf_glyph, snf_scan; + + void + SnfSetFormat (bit, byte, glyph, scan) + int bit, byte, glyph, scan; + { + snf_bit = bit; + snf_byte = byte; + snf_glyph = glyph; + snf_scan = scan; + snf_set = 1; + } + + void + SnfGetFormat (bit, byte, glyph, scan) + int *bit, *byte, *glyph, *scan; + { + if (!snf_set) + FontDefaultFormat (&snf_bit, &snf_byte, &snf_glyph, &snf_scan); + *bit = snf_bit; + *byte = snf_byte; + *glyph = snf_glyph; + *scan = snf_scan; + } + int snfReadFont(pFont, file, bit, byte, glyph, scan) FontPtr pFont; *************** *** 460,485 **** xfree (pFont); } - static int snf_set; - static int snf_bit, snf_byte, snf_glyph, snf_scan; - - SnfSetFormat (bit, byte, glyph, scan) - int bit, byte, glyph, scan; - { - snf_bit = bit; - snf_byte = byte; - snf_glyph = glyph; - snf_scan = scan; - snf_set = 1; - } - - SnfGetFormat (bit, byte, glyph, scan) - int *bit, *byte, *glyph, *scan; - { - if (!snf_set) - FontDefaultFormat (&snf_bit, &snf_byte, &snf_glyph, &snf_scan); - *bit = snf_bit; - *byte = snf_byte; - *glyph = snf_glyph; - *scan = snf_scan; - } --- 486,488 ---- *** ./lib/font/fc/fsconvert.c@@/PUBLIC-LATEST Mon Feb 14 17:47:35 1994 --- xc/lib/font/fc/fsconvert.c Thu May 7 14:47:43 1998 *************** *** 1,4 **** ! /* $XConsortium: fsconvert.c,v 1.17 94/02/14 17:47:35 gildea Exp $ */ /* * Copyright 1990 Network Computing Devices * --- 1,4 ---- ! /* $TOG: fsconvert.c /main/20 1998/05/07 14:52:42 kaleb $ */ /* * Copyright 1990 Network Computing Devices * *************** *** 70,76 **** pfi->lastCol = pfi->lastRow; pfi->lastRow = n; pfi->defaultCh = (pfi->defaultCh >> 8) & 0xff ! + (pfi->defaultCh & 0xff) << 8; } if (FontCouldBeTerminal (pfi)) --- 70,76 ---- pfi->lastCol = pfi->lastRow; pfi->lastRow = n; pfi->defaultCh = (pfi->defaultCh >> 8) & 0xff ! + ((pfi->defaultCh & 0xff) << 8); } if (FontCouldBeTerminal (pfi)) *************** *** 310,316 **** { if (row1 == row2 && ((col1 & 0xf) && col1 > firstcol || ! (col2 & 0xf) != 0xf) && col2 < lastcol) { /* If we're loading from a single row, expand range of glyphs loaded to a multiple of --- 310,316 ---- { if (row1 == row2 && ((col1 & 0xf) && col1 > firstcol || ! (col2 & 0xf) != 0xf) && (col2 < lastcol)) { /* If we're loading from a single row, expand range of glyphs loaded to a multiple of *************** *** 347,352 **** --- 347,353 ---- performed by fs_build_range(); for use if the associated LoadGlyphs requests needs to be cancelled. */ + void _fs_clean_aborted_loadglyphs(pfont, num_expected_ranges, expected_ranges) FontPtr pfont; int num_expected_ranges; *************** *** 579,587 **** unsigned int r; CharInfoPtr encoding; CharInfoPtr pDefault; - FSFontDataPtr fsd = (FSFontDataPtr) pFont->fpePrivate; int itemSize; - int err = Successful; fsdata = (FSFontPtr) pFont->fontPrivate; encoding = fsdata->inkMetrics; --- 580,586 ---- *** ./lib/font/fc/fserve.c@@/PUBLIC-LATEST Mon Feb 9 10:47:12 1998 --- xc/lib/font/fc/fserve.c Fri May 1 16:44:08 1998 *************** *** 1,4 **** ! /* $TOG: fserve.c /main/51 1998/02/09 10:47:26 kaleb $ */ /* Copyright 1990, 1998 The Open Group --- 1,4 ---- ! /* $TOG: fserve.c /main/52 1998/05/01 16:42:36 kaleb $ */ /* Copyright 1990, 1998 The Open Group *************** *** 1996,2001 **** --- 1996,2004 ---- Suspended) { fd_set TempSelectMask; + + FD_ZERO (&TempSelectMask); + if (_fs_wait_for_readable(conn) == -1) { /* We lost our connection. Don't wait to reestablish it; *** ./lib/font/fc/fsio.c@@/PUBLIC-LATEST Wed Apr 5 19:58:13 1995 --- xc/lib/font/fc/fsio.c Thu May 7 15:10:52 1998 *************** *** 1,4 **** ! /* $XConsortium: fsio.c,v 1.37 95/04/05 19:58:13 kaleb Exp $ */ /* * Copyright 1990 Network Computing Devices * --- 1,4 ---- ! /* $TOG: fsio.c /main/41 1998/05/07 15:15:52 kaleb $ */ /* * Copyright 1990 Network Computing Devices * *************** *** 206,212 **** alts = 0; /* parse alternate list */ ! if (nalts = rep.num_alternates) { setuplength = rep.alternate_len << 2; alts = (FSFpeAltPtr) xalloc(nalts * sizeof(FSFpeAltRec) + setuplength); --- 206,212 ---- alts = 0; /* parse alternate list */ ! if ((nalts = rep.num_alternates)) { setuplength = rep.alternate_len << 2; alts = (FSFpeAltPtr) xalloc(nalts * sizeof(FSFpeAltRec) + setuplength); *************** *** 339,344 **** --- 339,345 ---- * expects everything to be here. *not* to be called when reading huge * numbers of replies, but rather to get each chunk */ + int _fs_read(conn, data, size) FSFpePtr conn; char *data; *************** *** 381,386 **** --- 382,388 ---- return 0; } + int _fs_write(conn, data, size) FSFpePtr conn; char *data; *************** *** 425,430 **** --- 427,433 ---- return 0; } + int _fs_read_pad(conn, data, len) FSFpePtr conn; char *data; *************** *** 442,447 **** --- 445,451 ---- return 0; } + int _fs_write_pad(conn, data, len) FSFpePtr conn; char *data; *************** *** 533,542 **** _fs_any_bit_set(mask) fd_set* mask; { ! XFD_ANYSET(mask); } ! int _fs_or_bits(dst, m1, m2) fd_set* dst; fd_set* m1; --- 537,546 ---- _fs_any_bit_set(mask) fd_set* mask; { ! return XFD_ANYSET(mask); } ! void _fs_or_bits(dst, m1, m2) fd_set* dst; fd_set* m1; *************** *** 561,566 **** --- 565,571 ---- #endif } + int _fs_drain_bytes(conn, len) FSFpePtr conn; int len; *************** *** 579,584 **** --- 584,590 ---- return 0; } + void _fs_drain_bytes_pad(conn, len) FSFpePtr conn; int len; *************** *** 591,596 **** --- 597,603 ---- } } + void _fs_eat_rest_of_error(conn, err) FSFpePtr conn; fsError *err; *** ./lib/font/fontfile/bitsource.c@@/PUBLIC-LATEST Mon Feb 9 10:47:36 1998 --- xc/lib/font/fontfile/bitsource.c Thu May 7 14:55:07 1998 *************** *** 1,4 **** ! /* $TOG: bitsource.c /main/10 1998/02/09 10:47:50 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: bitsource.c /main/11 1998/05/07 15:00:06 kaleb $ */ /* *************** *** 97,102 **** --- 97,103 ---- FontFileBitmapSources.fpe = 0; } + int FontFileMatchBitmapSource (fpe, pFont, flags, entry, zeroPat, vals, format, fmask, noSpecificSize) FontPathElementPtr fpe; FontPtr *pFont; *** ./lib/font/fontfile/bufio.c@@/PUBLIC-LATEST Mon Feb 9 10:47:40 1998 --- xc/lib/font/fontfile/bufio.c Thu May 7 13:39:13 1998 *************** *** 1,4 **** ! /* $TOG: bufio.c /main/9 1998/02/09 10:47:54 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: bufio.c /main/12 1998/05/07 13:44:12 kaleb $ */ /* *************** *** 126,132 **** return BufFileCreate ((char *) fd, BufFileRawFill, BufFileRawSkip, BufFileRawClose); } ! static BufFileRawFlush (c, f) int c; BufFilePtr f; --- 126,132 ---- return BufFileCreate ((char *) fd, BufFileRawFill, BufFileRawSkip, BufFileRawClose); } ! static int BufFileRawFlush (c, f) int c; BufFilePtr f; *************** *** 155,160 **** --- 155,161 ---- return f; } + int BufFileRead (f, b, n) BufFilePtr f; char *b; *************** *** 171,176 **** --- 172,178 ---- return n - cnt - 1; } + int BufFileWrite (f, b, n) BufFilePtr f; char *b; *************** *** 190,207 **** BufFilePtr f; { if (f->bufp != f->buffer) ! (*f->io) (BUFFILEEOF, f); } int BufFileClose (f, doClose) BufFilePtr f; { ! (void) (*f->close) (f, doClose); xfree (f); } ! int BufFileFree (f) BufFilePtr f; { --- 192,213 ---- BufFilePtr f; { if (f->bufp != f->buffer) ! return (*f->io) (BUFFILEEOF, f); ! return 0; } int BufFileClose (f, doClose) BufFilePtr f; + int doClose; { ! int ret; ! ret = (*f->close) (f, doClose); xfree (f); + return ret; } ! void BufFileFree (f) BufFilePtr f; { *** ./lib/font/fontfile/decompress.c@@/PUBLIC-LATEST Mon Feb 9 10:47:44 1998 --- xc/lib/font/fontfile/decompress.c Fri Apr 24 09:26:54 1998 *************** *** 1,4 **** ! /* $TOG: decompress.c /main/7 1998/02/09 10:47:58 kaleb $ */ /* * Copyright 1985, 1986 The Regents of the University of California. * All rights reserved. --- 1,4 ---- ! /* $TOG: decompress.c /main/9 1998/04/24 09:26:33 barstow $ */ /* * Copyright 1985, 1986 The Regents of the University of California. * All rights reserved. *************** *** 174,179 **** --- 174,180 ---- file->offset = 0; file->size = 0; file->stackp = file->de_stack; + bzero(file->buf, BITS); file->finchar = file->oldcode = getcode (file); if (file->oldcode != -1) *file->stackp++ = file->finchar; *** ./lib/font/fontfile/dirfile.c@@/PUBLIC-LATEST Mon Feb 9 10:47:52 1998 --- xc/lib/font/fontfile/dirfile.c Thu Jun 25 16:49:43 1998 *************** *** 1,7 **** ! #ifndef lint ! static char *rid= ! "$TOG: dirfile.c /main/13 1998/02/09 10:48:06 kaleb $"; ! #endif /* lint */ /* --- 1,4 ---- ! /* $TOG: dirfile.c /main/15 1998/06/25 16:57:32 kaleb $ */ /* *************** *** 51,64 **** char *directory; FontDirectoryPtr *pdir; { ! char file_name[MAXFONTNAMELEN]; char font_name[MAXFONTNAMELEN]; ! char dir_file[MAXFONTNAMELEN]; FILE *file; int count, i, status; struct stat statb; FontDirectoryPtr dir = NullFontDirectory; --- 48,62 ---- char *directory; FontDirectoryPtr *pdir; { ! char file_name[MAXFONTFILENAMELEN]; char font_name[MAXFONTNAMELEN]; ! char dir_file[MAXFONTFILENAMELEN]; FILE *file; int count, i, status; struct stat statb; + static char format[24] = ""; FontDirectoryPtr dir = NullFontDirectory; *************** *** 81,87 **** return BadFontPath; } dir->dir_mtime = statb.st_mtime; ! while ((count = fscanf(file, "%s %[^\n]\n", file_name, font_name)) != EOF) { if (count != 2) { FontFileFreeDir (dir); fclose(file); --- 79,88 ---- return BadFontPath; } dir->dir_mtime = statb.st_mtime; ! if (format[0] == '\0') ! sprintf(format, "%%%ds %%%d[^\n]\n", ! MAXFONTFILENAMELEN-1, MAXFONTNAMELEN-1); ! while ((count = fscanf(file, format, file_name, font_name)) != EOF) { if (count != 2) { FontFileFreeDir (dir); fclose(file); *** ./lib/font/fontfile/ffcheck.c@@/PUBLIC-LATEST Mon Feb 9 10:47:57 1998 --- xc/lib/font/fontfile/ffcheck.c Thu May 7 14:54:16 1998 *************** *** 1,4 **** ! /* $TOG: ffcheck.c /main/3 1998/02/09 10:48:11 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: ffcheck.c /main/7 1998/05/07 14:59:15 kaleb $ */ /* *************** *** 65,70 **** --- 65,71 ---- return BadFontName; } + int FontFileCheckListFonts (client, fpe, pat, len, max, names) pointer client; FontPathElementPtr fpe; *************** *** 78,83 **** --- 79,85 ---- return BadFontName; } + int FontFileCheckStartListFontsWithInfo(client, fpe, pat, len, max, privatep) pointer client; FontPathElementPtr fpe; *************** *** 92,97 **** --- 94,100 ---- return BadFontName; } + int FontFileCheckListNextFontWithInfo(client, fpe, namep, namelenp, pFontInfo, numFonts, private) pointer client; *************** *** 108,113 **** --- 111,117 ---- return BadFontName; } + int FontFileCheckStartListFontsAndAliases(client, fpe, pat, len, max, privatep) pointer client; FontPathElementPtr fpe; *************** *** 143,148 **** --- 147,153 ---- typedef int (*IntFunc) (); static int font_file_check_type; + void FontFileCheckRegisterFpeFunctions () { BitmapRegisterFontFileFunctions (); *************** *** 156,162 **** #endif /* ifndef LOWMEMFTPT */ ! RegisterFPEFunctions(FontFileNameCheck, FontFileInitFPE, FontFileFreeFPE, FontFileResetFPE, --- 161,167 ---- #endif /* ifndef LOWMEMFTPT */ ! font_file_check_type = RegisterFPEFunctions(FontFileNameCheck, FontFileInitFPE, FontFileFreeFPE, FontFileResetFPE, *** ./lib/font/fontfile/fileio.c@@/PUBLIC-LATEST Mon Feb 9 10:48:02 1998 --- xc/lib/font/fontfile/fileio.c Fri May 1 16:44:27 1998 *************** *** 1,4 **** ! /* $TOG: fileio.c /main/6 1998/02/09 10:48:16 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fileio.c /main/7 1998/05/01 16:42:56 kaleb $ */ /* *************** *** 70,78 **** return (FontFilePtr) raw; } FontFileClose (f) FontFilePtr f; { ! BufFileClose ((BufFilePtr) f, TRUE); } --- 70,79 ---- return (FontFilePtr) raw; } + int FontFileClose (f) FontFilePtr f; { ! return BufFileClose ((BufFilePtr) f, TRUE); } *** ./lib/font/fontfile/fontdir.c@@/PUBLIC-LATEST Mon Feb 9 10:48:11 1998 --- xc/lib/font/fontfile/fontdir.c Thu Jun 25 16:46:11 1998 *************** *** 1,4 **** ! /* $TOG: fontdir.c /main/26 1998/02/09 10:48:25 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontdir.c /main/29 1998/06/25 16:53:52 kaleb $ */ /* *************** *** 48,53 **** --- 48,54 ---- return TRUE; } + void FontFileFreeEntry (entry) FontEntryPtr entry; { *************** *** 81,86 **** --- 82,88 ---- } } + void FontFileFreeTable (table) FontTablePtr table; { *************** *** 129,134 **** --- 131,137 ---- return dir; } + void FontFileFreeDir (dir) FontDirectoryPtr dir; { *************** *** 169,177 **** --- 172,184 ---- } static int + #ifdef NeedFunctionPrototypes + FontFileNameCompare(const void* a, const void* b) + #else FontFileNameCompare(a, b) char *a, *b; + #endif { FontEntryPtr a_name = (FontEntryPtr) a, b_name = (FontEntryPtr) b; *************** *** 179,184 **** --- 186,192 ---- return strcmp(a_name->name.name, b_name->name.name); } + void FontFileSortTable (table) FontTablePtr table; { *************** *** 189,194 **** --- 197,203 ---- } } + void FontFileSortDir(dir) FontDirectoryPtr dir; { *************** *** 236,242 **** nDashes = pat->ndashes; firstWild = 0; t = name; ! while (c = *t++) { if (isWild(c)) { if (!firstWild) firstWild = t - 1; --- 245,251 ---- nDashes = pat->ndashes; firstWild = 0; t = name; ! while ((c = *t++)) { if (isWild(c)) { if (!firstWild) firstWild = t - 1; *************** *** 284,290 **** } } ! static PatternMatch(pat, patdashes, string, stringdashes) char *pat; char *string; --- 293,299 ---- } } ! static int PatternMatch(pat, patdashes, string, stringdashes) char *pat; char *string; *************** *** 427,432 **** --- 436,442 ---- return FontFileFindNameInScalableDir(table, pat, (FontScalablePtr)0); } + int FontFileFindNamesInScalableDir(table, pat, max, names, vals, alias_behavior, newmax) FontTablePtr table; *** ./lib/font/fontfile/fontfile.c@@/PUBLIC-LATEST Mon Feb 9 10:48:15 1998 --- xc/lib/font/fontfile/fontfile.c Thu May 7 14:59:47 1998 *************** *** 1,4 **** ! /* $TOG: fontfile.c /main/31 1998/02/09 10:48:29 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontfile.c /main/33 1998/05/07 15:04:47 kaleb $ */ /* *************** *** 238,244 **** FontScalableEntryPtr scalable; FontScaledPtr scaled; FontBitmapEntryPtr bitmap; - FontBCEntryPtr bc; int ret; Bool noSpecificSize; int nranges; --- 238,243 ---- *************** *** 267,273 **** if (entry) { - int len; switch (entry->type) { case FONT_ENTRY_BITMAP: bitmap = &entry->u.bitmap; --- 266,271 ---- *************** *** 458,463 **** --- 456,462 ---- } /* ARGSUSED */ + void FontFileCloseFont (fpe, pFont) FontPathElementPtr fpe; FontPtr pFont; *************** *** 464,470 **** { FontEntryPtr entry; ! if (entry = (FontEntryPtr) pFont->fpePrivate) { switch (entry->type) { case FONT_ENTRY_SCALABLE: FontFileRemoveScaledInstance (entry, pFont); --- 463,469 ---- { FontEntryPtr entry; ! if ((entry = (FontEntryPtr) pFont->fpePrivate)) { switch (entry->type) { case FONT_ENTRY_SCALABLE: FontFileRemoveScaledInstance (entry, pFont); *************** *** 521,526 **** --- 520,526 ---- (FontPtr)0); } + int FontFileGetInfoBitmap (fpe, pFontInfo, entry) FontPathElementPtr fpe; FontInfoPtr pFontInfo; *************** *** 544,550 **** nranges, max) FontNamesPtr names; FontNamesPtr scaleNames; ! FontNamePtr *nameptr; char *zeroChars; FontScalablePtr vals; fsRange *ranges; --- 544,550 ---- nranges, max) FontNamesPtr names; FontNamesPtr scaleNames; ! FontNamePtr nameptr; char *zeroChars; FontScalablePtr vals; fsRange *ranges; *************** *** 678,684 **** FontNameRec zeroName; FontNamesPtr scaleNames; FontScalableRec vals; - int i; fsRange *ranges; int nranges; int result = BadFontName; --- 678,683 ---- *************** *** 775,780 **** --- 774,780 ---- int current; } LFWIDataRec, *LFWIDataPtr; + int FontFileListFonts (client, fpe, pat, len, max, names) pointer client; FontPathElementPtr fpe; *************** *** 786,791 **** --- 786,792 ---- return _FontFileListFonts (client, fpe, pat, len, max, names, 0); } + int FontFileStartListFontsWithInfo(client, fpe, pat, len, max, privatep) pointer client; FontPathElementPtr fpe; *************** *** 929,935 **** tmpName.length = namelen; } /* Match non XLFD pattern */ ! if (entry = FontFileFindNameInDir (&dir->nonScalable, &tmpName)) { switch (entry->type) { case FONT_ENTRY_BITMAP: --- 930,936 ---- tmpName.length = namelen; } /* Match non XLFD pattern */ ! if ((entry = FontFileFindNameInDir (&dir->nonScalable, &tmpName))) { switch (entry->type) { case FONT_ENTRY_BITMAP: *************** *** 973,978 **** --- 974,980 ---- return ret; } + int FontFileListNextFontWithInfo(client, fpe, namep, namelenp, pFontInfo, numFonts, private) pointer client; *************** *** 1092,1097 **** --- 1094,1100 ---- typedef int (*IntFunc) (); static int font_file_type; + void FontFileRegisterLocalFpeFunctions () { font_file_type = RegisterFPEFunctions(FontFileNameCheck, *** ./lib/font/fontfile/fontscale.c@@/PUBLIC-LATEST Mon Feb 9 10:48:20 1998 --- xc/lib/font/fontfile/fontscale.c Thu May 7 14:56:59 1998 *************** *** 1,4 **** ! /* $TOG: fontscale.c /main/16 1998/02/09 10:48:35 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontscale.c /main/17 1998/05/07 15:01:58 kaleb $ */ /* *************** *** 70,75 **** --- 70,76 ---- /* Must call this after the directory is sorted */ + void FontFileSwitchStringsToBitmapPointers (dir) FontDirectoryPtr dir; { *** ./lib/font/fontfile/printerfont.c@@/PUBLIC-LATEST Mon Feb 9 10:48:30 1998 --- xc/lib/font/fontfile/printerfont.c Thu May 7 15:11:57 1998 *************** *** 1,4 **** ! /* $TOG: printerfont.c /main/2 1998/02/09 10:48:44 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: printerfont.c /main/4 1998/05/07 15:16:56 kaleb $ */ /* *************** *** 108,113 **** --- 108,114 ---- return BadFontName; } + int PrinterFontListFonts (client, fpe, pat, len, max, names) pointer client; FontPathElementPtr fpe; *************** *** 121,126 **** --- 122,128 ---- return BadFontName; } + int PrinterFontStartListFontsWithInfo(client, fpe, pat, len, max, privatep) pointer client; FontPathElementPtr fpe; *************** *** 135,140 **** --- 137,143 ---- return BadFontName; } + int PrinterFontListNextFontWithInfo(client, fpe, namep, namelenp, pFontInfo, numFonts, private) pointer client; *************** *** 151,156 **** --- 154,160 ---- return BadFontName; } + int PrinterFontStartListFontsAndAliases(client, fpe, pat, len, max, privatep) pointer client; FontPathElementPtr fpe; *************** *** 186,191 **** --- 190,196 ---- typedef int (*IntFunc) (); static int printer_font_type; + void PrinterFontRegisterFpeFunctions () { /* what is the use of printer font type? */ *** ./lib/font/fontfile/register.c@@/PUBLIC-LATEST Mon Feb 9 10:48:34 1998 --- xc/lib/font/fontfile/register.c Fri May 1 16:45:02 1998 *************** *** 1,4 **** ! /* $TOG: register.c /main/5 1998/02/09 10:48:49 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: register.c /main/6 1998/05/01 16:43:32 kaleb $ */ /* *************** *** 28,33 **** --- 28,34 ---- * end up dragging in code from all the renderers, which is not small. */ + void FontFileRegisterFpeFunctions() { BitmapRegisterFontFileFunctions (); *** ./lib/font/include/bufio.h@@/PUBLIC-LATEST Mon Feb 9 10:48:47 1998 --- xc/lib/font/include/bufio.h Thu May 7 13:39:08 1998 *************** *** 1,4 **** ! /* $TOG: bufio.h /main/6 1998/02/09 10:49:01 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: bufio.h /main/8 1998/05/07 13:44:07 kaleb $ */ /* *************** *** 46,59 **** char *private; } BufFileRec, *BufFilePtr; ! extern BufFilePtr BufFileCreate (); ! extern BufFilePtr BufFileOpenRead (), BufFileOpenWrite (); ! extern BufFilePtr BufFilePushCompressed (); #ifdef X_GZIP_FONT_COMPRESSION ! extern BufFilePtr BufFilePushZIP (); #endif ! extern int BufFileClose (); ! extern int BufFileFlush (); #define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : (*(f)->io) (f)) #define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = (c) : (*(f)->io) (c,f)) #define BufFileSkip(f,c) ((*(f)->skip) (f, c)) --- 46,111 ---- char *private; } BufFileRec, *BufFilePtr; ! extern BufFilePtr BufFileCreate ( ! #if NeedFunctionPrototypes ! char*, ! int (*)(), ! int (*)(), ! int (*)() ! #endif ! ); ! extern BufFilePtr BufFileOpenRead ( ! #if NeedFunctionPrototypes ! int ! #endif ! ); ! ! extern BufFilePtr BufFileOpenWrite ( ! #if NeedFunctionPrototypes ! int ! #endif ! ); ! ! extern BufFilePtr BufFilePushCompressed ( ! #if NeedFunctionPrototypes ! BufFilePtr ! #endif ! ); #ifdef X_GZIP_FONT_COMPRESSION ! extern BufFilePtr BufFilePushZIP ( ! #if NeedFunctionPrototypes ! BufFilePtr #endif ! ); ! #endif ! extern int BufFileClose ( ! #if NeedFunctionPrototypes ! BufFilePtr, ! int ! #endif ! ); ! extern int BufFileFlush ( ! #if NeedFunctionPrototypes ! BufFilePtr ! #endif ! ); ! ! extern int BufFileRead ( ! #if NeedFunctionPrototypes ! BufFilePtr, ! char*, ! int ! #endif ! ); ! ! extern int BufFileWrite ( ! #if NeedFunctionPrototypes ! BufFilePtr, ! char*, ! int ! #endif ! ); ! #define BufFileGet(f) ((f)->left-- ? *(f)->bufp++ : (*(f)->io) (f)) #define BufFilePut(c,f) (--(f)->left ? *(f)->bufp++ = (c) : (*(f)->io) (c,f)) #define BufFileSkip(f,c) ((*(f)->skip) (f, c)) *** ./lib/font/include/fontmisc.h@@/PUBLIC-LATEST Mon Feb 9 10:49:03 1998 --- xc/lib/font/include/fontmisc.h Thu May 7 14:07:57 1998 *************** *** 1,4 **** ! /* $TOG: fontmisc.h /main/8 1998/02/09 10:49:18 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontmisc.h /main/11 1998/05/07 14:12:58 kaleb $ */ /* *************** *** 31,36 **** --- 31,49 ---- #include + #ifndef X_NOT_STDC_ENV + #include + #else + extern int rand(); + #endif + #include + + #ifndef X_NOT_POSIX + #include + #else + extern int close(); + #endif + typedef unsigned char *pointer; typedef int Bool; *************** *** 67,71 **** --- 80,120 ---- #define lowbit(x) ((x) & (~(x) + 1)) #define assert(x) + + extern void + BitOrderInvert( + #if NeedFunctionPrototypes + register unsigned char *, + register int + #endif + ); + + extern void + TwoByteSwap( + #if NeedFunctionPrototypes + register unsigned char *, + register int + #endif + ); + + extern void + FourByteSwap( + #if NeedFunctionPrototypes + register unsigned char *, + register int + #endif + ); + + extern int + RepadBitmap ( + #if NeedFunctionPrototypes + char*, + char*, + unsigned, + unsigned, + int, + int + #endif + ); #endif /* _FONTMISC_H_ */ *** ./lib/font/util/atom.c@@/PUBLIC-LATEST Mon Feb 9 10:54:53 1998 --- xc/lib/font/util/atom.c Mon May 11 12:18:56 1998 *************** *** 1,4 **** ! /* $TOG: atom.c /main/5 1998/02/09 10:55:07 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: atom.c /main/8 1998/05/11 12:24:07 kaleb $ */ /* *************** *** 47,53 **** static int reverseMapSize; static Atom lastAtom; ! static Hash(string, len) char *string; { --- 47,53 ---- static int reverseMapSize; static Atom lastAtom; ! static int Hash(string, len) char *string; { *************** *** 61,67 **** return h; } ! static ResizeHashTable () { int newHashSize; --- 61,67 ---- return h; } ! static int ResizeHashTable () { int newHashSize; *************** *** 107,115 **** return TRUE; } ! static ResizeReverseMap () { if (reverseMapSize == 0) reverseMapSize = 1000; else --- 107,116 ---- return TRUE; } ! static int ResizeReverseMap () { + int ret = TRUE; if (reverseMapSize == 0) reverseMapSize = 1000; else *************** *** 116,125 **** reverseMapSize *= 2; reverseMap = (AtomListPtr *) xrealloc (reverseMap, reverseMapSize * sizeof (AtomListPtr)); if (!reverseMap) ! return FALSE; } ! static NameEqual (a, b, l) char *a, *b; { --- 117,127 ---- reverseMapSize *= 2; reverseMap = (AtomListPtr *) xrealloc (reverseMap, reverseMapSize * sizeof (AtomListPtr)); if (!reverseMap) ! ret = FALSE; ! return ret; } ! static int NameEqual (a, b, l) char *a, *b; { *************** *** 192,204 **** } hashTable[h] = a; hashUsed++; ! if (reverseMapSize <= a->atom) ! ResizeReverseMap(); reverseMap[a->atom] = a; return a->atom; } ! ValidAtom(atom) Atom atom; { return (atom != None) && (atom <= lastAtom); --- 194,208 ---- } hashTable[h] = a; hashUsed++; ! if (reverseMapSize <= a->atom) { ! if (!ResizeReverseMap()) ! return None; ! } reverseMap[a->atom] = a; return a->atom; } ! int ValidAtom(atom) Atom atom; { return (atom != None) && (atom <= lastAtom); *** ./lib/font/util/fontaccel.c@@/PUBLIC-LATEST Mon Feb 9 10:54:57 1998 --- xc/lib/font/util/fontaccel.c Thu May 7 13:52:33 1998 *************** *** 1,4 **** ! /* $TOG: fontaccel.c /main/5 1998/02/09 10:55:11 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontaccel.c /main/6 1998/05/07 13:57:34 kaleb $ */ /* *************** *** 31,37 **** #include "fontmisc.h" #include "fontstruct.h" ! FontComputeInfoAccelerators(pFontInfo) FontInfoPtr pFontInfo; { pFontInfo->noOverlap = FALSE; --- 31,37 ---- #include "fontmisc.h" #include "fontstruct.h" ! void FontComputeInfoAccelerators(pFontInfo) FontInfoPtr pFontInfo; { pFontInfo->noOverlap = FALSE; *************** *** 76,82 **** pFontInfo->inkInside = FALSE; } ! FontCouldBeTerminal(pFontInfo) FontInfoPtr pFontInfo; { if ((pFontInfo->minbounds.leftSideBearing >= 0) && --- 76,82 ---- pFontInfo->inkInside = FALSE; } ! int FontCouldBeTerminal(pFontInfo) FontInfoPtr pFontInfo; { if ((pFontInfo->minbounds.leftSideBearing >= 0) && *** ./lib/font/util/fontutil.c@@/PUBLIC-LATEST Mon Feb 9 10:55:06 1998 --- xc/lib/font/util/fontutil.c Thu May 7 14:22:42 1998 *************** *** 1,4 **** ! /* $TOG: fontutil.c /main/12 1998/02/09 10:55:20 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontutil.c /main/14 1998/05/07 14:27:41 kaleb $ */ /* *************** *** 164,174 **** defc[0] = pFont->info.defaultCh >> 8; defc[1] = pFont->info.defaultCh; (*pFont->get_metrics) (pFont, 1, defc, encoding, &t, &defaultChar); ! if (IsNonExistentChar (defaultChar)) defaultChar = 0; for (i = 0; i < n; i++) { ! if (IsNonExistentChar (charinfo[i])) { if (!defaultChar) continue; --- 164,174 ---- defc[0] = pFont->info.defaultCh >> 8; defc[1] = pFont->info.defaultCh; (*pFont->get_metrics) (pFont, 1, defc, encoding, &t, &defaultChar); ! if ((IsNonExistentChar (defaultChar))) defaultChar = 0; for (i = 0; i < n; i++) { ! if ((IsNonExistentChar (charinfo[i]))) { if (!defaultChar) continue; *************** *** 179,185 **** } cm = pFont->info.constantMetrics; pFont->info.constantMetrics = FALSE; ! QueryGlyphExtents(pFont, charinfo + firstReal, n - firstReal, info); pFont->info.constantMetrics = cm; xfree(charinfo); return TRUE; --- 179,186 ---- } cm = pFont->info.constantMetrics; pFont->info.constantMetrics = FALSE; ! QueryGlyphExtents(pFont, (CharInfoPtr*) charinfo + firstReal, ! n - firstReal, info); pFont->info.constantMetrics = cm; xfree(charinfo); return TRUE; *************** *** 381,388 **** } for (ptr2 = ptr; ptr2 < endptr; ptr2++) { ! if (ptr2->min_char_low == 0 && ! ptr2->min_char_high == 0 || ptrmax >= mincharp(ptr2) - 1) { if (!charset_subset && ptr->min_char_high != ptr2->min_char_high) --- 382,388 ---- } for (ptr2 = ptr; ptr2 < endptr; ptr2++) { ! if ((ptr2->min_char_low == 0 && ptr2->min_char_high == 0) || ptrmax >= mincharp(ptr2) - 1) { if (!charset_subset && ptr->min_char_high != ptr2->min_char_high) *** ./lib/font/util/fontxlfd.c@@/PUBLIC-LATEST Mon Feb 9 10:55:10 1998 --- xc/lib/font/util/fontxlfd.c Thu May 7 14:20:21 1998 *************** *** 1,4 **** ! /* $TOG: fontxlfd.c /main/21 1998/02/09 10:55:25 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: fontxlfd.c /main/22 1998/05/07 14:25:20 kaleb $ */ /* *************** *** 76,82 **** double *result; { char buffer[80], *p1, *p2; - int count; #ifndef NO_LOCALE /* Figure out what symbols apply in this locale */ --- 76,81 ---- *************** *** 263,269 **** else { int value; ! if (ptr = GetInt(ptr, &value)) { vals->values_supplied &= ~which; if (value > 0) --- 262,268 ---- else { int value; ! if ((ptr = GetInt(ptr, &value))) { vals->values_supplied &= ~which; if (value > 0) *************** *** 344,350 **** if (subst != FONT_XLFD_REPLACE_VALUE) *vals = tmpvals; ! if (!(*(ptr = fname) == '-' || *ptr++ == '*' && *ptr == '-') || /* fndry */ !(ptr = strchr(ptr + 1, '-')) || /* family_name */ !(ptr1 = ptr = strchr(ptr + 1, '-')) || /* weight_name */ !(ptr = strchr(ptr + 1, '-')) || /* slant */ --- 343,349 ---- if (subst != FONT_XLFD_REPLACE_VALUE) *vals = tmpvals; ! if (!(*(ptr = fname) == '-' || (*ptr++ == '*' && *ptr == '-')) || /* fndry */ !(ptr = strchr(ptr + 1, '-')) || /* family_name */ !(ptr1 = ptr = strchr(ptr + 1, '-')) || /* weight_name */ !(ptr = strchr(ptr + 1, '-')) || /* slant */ *************** *** 537,542 **** --- 536,542 ---- unsigned long l; char *p1, *p2; fsRange *result = (fsRange *)0; + extern int add_range(); name = strchr(name, '-'); for (n = 1; name && n < 14; n++) *** ./lib/font/util/miscutil.c@@/PUBLIC-LATEST Mon Feb 9 10:55:19 1998 --- xc/lib/font/util/miscutil.c Fri May 1 16:45:22 1998 *************** *** 1,4 **** ! /* $TOG: miscutil.c /main/5 1998/02/09 10:55:33 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: miscutil.c /main/6 1998/05/01 16:43:52 kaleb $ */ /* *************** *** 55,61 **** return (unsigned long *) realloc ((char *) n, m); } ! Xfree (n) unsigned long *n; { if (n) --- 55,61 ---- return (unsigned long *) realloc ((char *) n, m); } ! void Xfree (n) unsigned long *n; { if (n) *************** *** 62,68 **** free ((char *) n); } ! CopyISOLatin1Lowered (dst, src, len) char *dst, *src; int len; { --- 62,68 ---- free ((char *) n); } ! void CopyISOLatin1Lowered (dst, src, len) char *dst, *src; int len; { *************** *** 84,89 **** *dest = '\0'; } ! register_fpe_functions () { } --- 84,89 ---- *dest = '\0'; } ! void register_fpe_functions () { } *** ./lib/font/util/patcache.c@@/PUBLIC-LATEST Mon Feb 9 10:55:23 1998 --- xc/lib/font/util/patcache.c Thu May 7 13:49:55 1998 *************** *** 1,4 **** ! /* $TOG: patcache.c /main/9 1998/02/09 10:55:37 kaleb $ */ /* --- 1,4 ---- ! /* $TOG: patcache.c /main/11 1998/05/07 13:54:55 kaleb $ */ /* *************** *** 56,61 **** --- 56,83 ---- FontPatternCacheEntryPtr free; } FontPatternCacheRec; + /* Empty cache (for rehash) */ + void + EmptyFontPatternCache (cache) + FontPatternCachePtr cache; + { + int i; + + for (i = 0; i < NBUCKETS; i++) + cache->buckets[i] = 0; + for (i = 0; i < NENTRIES; i++) + { + cache->entries[i].next = &cache->entries[i+1]; + cache->entries[i].prev = 0; + cache->entries[i].pFont = 0; + xfree (cache->entries[i].pattern); + cache->entries[i].pattern = 0; + cache->entries[i].patlen = 0; + } + cache->free = &cache->entries[0]; + cache->entries[NENTRIES - 1].next = 0; + } + /* Create and initialize cache */ FontPatternCachePtr MakeFontPatternCache () *************** *** 87,93 **** } /* compute id for string */ ! static Hash (string, len) char *string; int len; --- 109,115 ---- } /* compute id for string */ ! static int Hash (string, len) char *string; int len; *************** *** 100,126 **** if (hash < 0) hash = -hash; return hash; - } - - /* Empty cache (for rehash) */ - EmptyFontPatternCache (cache) - FontPatternCachePtr cache; - { - int i; - - for (i = 0; i < NBUCKETS; i++) - cache->buckets[i] = 0; - for (i = 0; i < NENTRIES; i++) - { - cache->entries[i].next = &cache->entries[i+1]; - cache->entries[i].prev = 0; - cache->entries[i].pFont = 0; - xfree (cache->entries[i].pattern); - cache->entries[i].pattern = 0; - cache->entries[i].patlen = 0; - } - cache->free = &cache->entries[0]; - cache->entries[NENTRIES - 1].next = 0; } /* add entry */ --- 122,127 ---- *** ./lib/xtrans/Xtranslcl.c@@/PUBLIC-LATEST Fri Feb 6 15:54:39 1998 --- xc/lib/xtrans/Xtranslcl.c Wed Apr 29 07:18:29 1998 *************** *** 1,4 **** ! /* $TOG: Xtranslcl.c /main/35 1998/02/06 15:54:44 kaleb $ */ /* Copyright 1993, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: Xtranslcl.c /main/37 1998/04/29 07:18:40 barstow $ */ /* Copyright 1993, 1994, 1998 The Open Group *************** *** 82,87 **** --- 82,88 ---- #endif #include #include + #include /* * The local transports should be treated the same as a UNIX domain socket *************** *** 280,285 **** --- 281,287 ---- char *slave, namelen; char buf[20]; /* MAX_PATH_LEN?? */ PFV savef; + pid_t saved_pid; PRMSG(2,"TRANS(PTSOpenClient)(%s)\n", port, 0,0 ); *************** *** 337,343 **** * cannot be changed back to its original condition, hence the fork(). */ ! if( !fork()) { uid_t saved_euid; saved_euid = geteuid(); --- 339,345 ---- * cannot be changed back to its original condition, hence the fork(). */ ! if(!(saved_pid=fork())) { uid_t saved_euid; saved_euid = geteuid(); *************** *** 349,355 **** exit( 0 ); } ! wait( &exitval ); if (chmod(slave, 0666) < 0) { close(fd); --- 351,357 ---- exit( 0 ); } ! waitpid(saved_pid, &exitval, 0); if (chmod(slave, 0666) < 0) { close(fd); *************** *** 1780,1785 **** --- 1782,1793 ---- static char *workingXLOCAL=NULL; static char *freeXLOCAL=NULL; + #ifdef sco + #define DEF_XLOCAL "UNIX:SCO:PTS:NAMED:ISC" + #else + #define DEF_XLOCAL "UNIX:PTS:NAMED:ISC:SCO" + #endif + static void TRANS(LocalInitTransports)(protocol) *************** *** 1797,1803 **** else { XLOCAL=(char *)getenv("XLOCAL"); if(XLOCAL==NULL) ! XLOCAL="UNIX:PTS:NAMED:ISC:SCO"; workingXLOCAL=freeXLOCAL=(char *)malloc (strlen (XLOCAL) + 1); if (workingXLOCAL) strcpy (workingXLOCAL, XLOCAL); --- 1805,1811 ---- else { XLOCAL=(char *)getenv("XLOCAL"); if(XLOCAL==NULL) ! XLOCAL=DEF_XLOCAL; workingXLOCAL=freeXLOCAL=(char *)malloc (strlen (XLOCAL) + 1); if (workingXLOCAL) strcpy (workingXLOCAL, XLOCAL); *** ./lib/xtrans/Xtranstli.c@@/PUBLIC-LATEST Fri Feb 6 15:54:57 1998 --- xc/lib/xtrans/Xtranstli.c Wed Apr 22 16:31:34 1998 *************** *** 1,4 **** ! /* $TOG: Xtranstli.c /main/28 1998/02/06 15:55:02 kaleb $ */ /* Copyright 1993, 1994, 1998 The Open Group --- 1,4 ---- ! /* $TOG: Xtranstli.c /main/29 1998/04/22 16:31:16 barstow $ */ /* Copyright 1993, 1994, 1998 The Open Group *************** *** 101,107 **** --- 101,117 ---- #define TLINODENAME "TLI:test" #endif + #ifndef PORTBUFSIZE + #ifdef TRANS_SERVER + #define PORTBUFSIZE 64 + #else + #ifdef TRANS_CLIENT + #define PORTBUFSIZE 64 + #endif + #endif + #endif + /* * These are some utility function used by the real interface function below. */ *************** *** 247,253 **** char *port; { ! struct sockaddr_un *sunaddr; struct t_bind *req=NULL; PRMSG(2, "TRANS(TLITLIBindLocal)(%d,%d,%s)\n", fd, family, port); --- 257,263 ---- char *port; { ! struct sockaddr_un *sunaddr=NULL; struct t_bind *req=NULL; PRMSG(2, "TRANS(TLITLIBindLocal)(%d,%d,%s)\n", fd, family, port); *************** *** 298,303 **** --- 308,317 ---- PRMSG(1, "TRANS(TLIBindLocal): Unable to bind TLI device to %s\n", port, 0,0 ); + if (sunaddr) + free((char *) sunaddr); + if (req) + t_free((char *)req,T_BIND); return -1; } return 0; *************** *** 322,327 **** --- 336,342 ---- if( (ciptr->fd=t_open( device, O_RDWR, NULL )) < 0 ) { PRMSG(1, "TRANS(TLIOpen): t_open failed for %s\n", device, 0,0 ); + free(ciptr); return NULL; } *************** *** 736,741 **** --- 751,757 ---- { PRMSG(1, "TRANS(TLICreateListener): failed to allocate a t_bind\n", 0,0,0 ); + t_free((char *)req,T_BIND); return TRANS_CREATE_LISTENER_FAILED; } *************** *** 787,793 **** char *port; { - #define PORTBUFSIZE 64 /* what is a real size for this? */ char portbuf[PORTBUFSIZE]; struct t_bind *req; struct sockaddr_in *sinaddr; --- 803,808 ---- *************** *** 855,860 **** --- 870,876 ---- { struct t_bind *req; struct sockaddr_un *sunaddr; + int ret_value; PRMSG(2,"TRANS(TLITLICreateListener)(%x->%d,%s)\n", ciptr, ciptr->fd, port ? port : "NULL"); *************** *** 896,902 **** req->qlen=1; ! return TRANS(TLICreateListener)(ciptr, req); } --- 912,922 ---- req->qlen=1; ! ret_value = TRANS(TLICreateListener)(ciptr, req); ! ! free((char *) sunaddr); ! ! return ret_value; } *************** *** 966,972 **** PRMSG(1, "%s\n", t_errlist[t_errno], 0,0 ); t_free((char *)call,T_CALL); t_close(newciptr->fd); - free(newciptr->addr); free(newciptr); *status = TRANS_ACCEPT_FAILED; return NULL; --- 986,991 ---- *************** *** 977,983 **** if( TRANS(TLIGetAddr)(newciptr) < 0 ) { PRMSG(1, ! "TRANS(TLIAccept): TRANS(TLIGetPeerAddr)() failed: %d\n", errno, 0,0 ); t_close(newciptr->fd); free(newciptr); --- 996,1002 ---- if( TRANS(TLIGetAddr)(newciptr) < 0 ) { PRMSG(1, ! "TRANS(TLIAccept): TRANS(TLIGetAddr)() failed: %d\n", errno, 0,0 ); t_close(newciptr->fd); free(newciptr); *************** *** 1102,1108 **** char *port; { - #define PORTBUFSIZE 64 /* what is a real size for this? */ char portbuf[PORTBUFSIZE]; struct t_call *sndcall; long tmpport; --- 1121,1126 ---- *************** *** 1155,1160 **** --- 1173,1179 ---- { struct t_call *sndcall; struct sockaddr_un *sunaddr; + int ret_value; PRMSG(2, "TRANS(TLITLIConnect)(%s,%s)\n", host, port, 0); *************** *** 1168,1174 **** malloc(sizeof(struct sockaddr_un))) == NULL ) { PRMSG(1, ! "TRANS(TLICreateListener): failed to allocate a sockaddr_un\n", 0,0,0 ); t_free((char *)sndcall,T_CALL); return TRANS_CONNECT_FAILED; --- 1187,1193 ---- malloc(sizeof(struct sockaddr_un))) == NULL ) { PRMSG(1, ! "TRANS(TLITLIConnect): failed to allocate a sockaddr_un\n", 0,0,0 ); t_free((char *)sndcall,T_CALL); return TRANS_CONNECT_FAILED; *************** *** 1187,1193 **** sndcall->addr.len=sizeof(*sunaddr); sndcall->addr.maxlen=sizeof(*sunaddr); ! return TRANS(TLIConnect)(ciptr, sndcall ); } #endif /* TRANS_CLIENT */ --- 1206,1216 ---- sndcall->addr.len=sizeof(*sunaddr); sndcall->addr.maxlen=sizeof(*sunaddr); ! ret_value = TRANS(TLIConnect)(ciptr, sndcall ); ! ! free((char *) sunaddr); ! ! return ret_value; } #endif /* TRANS_CLIENT */ *** Imakefile@@/PUBLIC-LATEST Wed Nov 13 14:49:26 1996 --- xc/nls/Compose/Imakefile Mon Jun 29 09:09:27 1998 *************** *** 1,4 **** ! XCOMM $XConsortium: Imakefile /main/6 1996/11/13 14:45:36 lehors $ #ifndef Win32Architecture # define ComposeTarget(name) @@\ --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/9 1998/06/29 09:17:20 kaleb $ #ifndef Win32Architecture # define ComposeTarget(name) @@\ *************** *** 18,20 **** --- 18,21 ---- ComposeTarget(iso8859-1) ComposeTarget(iso8859-2) + ComposeTarget(fcd8859-15) *** ./nls/Compose/iso8859-1@@/PUBLIC-LATEST Wed Nov 8 07:24:13 1995 --- xc/nls/Compose/iso8859-1 Wed May 20 15:27:42 1998 *************** *** 1,4 **** ! # $XConsortium: iso8859-1 /main/6 1995/11/08 07:24:10 kaleb $ # # ISO 8859-1 (Latin1) Compose Sequence # --- 1,4 ---- ! # $TOG: iso8859-1 /main/7 1998/05/20 15:33:23 kaleb $ # # ISO 8859-1 (Latin1) Compose Sequence # *************** *** 186,191 **** --- 186,193 ---- : "\303" Atilde : "\304" Adiaeresis : "\304" Adiaeresis + : "\304" Adiaeresis + : "\304" Adiaeresis : "\305" Aring : "\305" Aring : "\306" AE *************** *** 205,210 **** --- 207,214 ---- : "\343" atilde : "\344" adiaeresis : "\344" adiaeresis + : "\344" adiaeresis + : "\344" adiaeresis : "\345" aring : "\345" aring : "\346" ae *************** *** 228,233 **** --- 232,239 ---- : "\312" Ecircumflex : "\313" Ediaeresis : "\313" Ediaeresis + : "\313" Ediaeresis + : "\313" Ediaeresis : "\350" egrave : "\350" egrave : "\351" eacute *************** *** 240,245 **** --- 246,253 ---- : "\352" ecircumflex : "\353" ediaeresis : "\353" ediaeresis + : "\353" ediaeresis + : "\353" ediaeresis : "\314" Igrave : "\314" Igrave : "\315" Iacute *************** *** 252,257 **** --- 260,267 ---- : "\316" Icircumflex : "\317" Idiaeresis : "\317" Idiaeresis + : "\317" Idiaeresis + : "\317" Idiaeresis : "\354" igrave : "\354" igrave : "\355" iacute *************** *** 264,269 **** --- 274,281 ---- : "\356" icircumflex : "\357" idiaeresis : "\357" idiaeresis + : "\357" idiaeresis + : "\357" idiaeresis : "\321" Ntilde : "\321" Ntilde : "\321" Ntilde *************** *** 288,293 **** --- 300,307 ---- : "\325" Otilde : "\326" Odiaeresis : "\326" Odiaeresis + : "\326" Odiaeresis + : "\326" Odiaeresis : "\330" Ooblique : "\330" Ooblique : "\362" ograve *************** *** 306,311 **** --- 320,327 ---- : "\365" otilde : "\366" odiaeresis : "\366" odiaeresis + : "\366" odiaeresis + : "\366" odiaeresis : "\370" oslash : "\370" oslash : "\331" Ugrave *************** *** 320,325 **** --- 336,343 ---- : "\333" Ucircumflex : "\334" Udiaeresis : "\334" Udiaeresis + : "\334" Udiaeresis + : "\334" Udiaeresis : "\371" ugrave : "\371" ugrave : "\372" uacute *************** *** 332,337 **** --- 350,357 ---- : "\373" ucircumflex : "\374" udiaeresis : "\374" udiaeresis + : "\374" udiaeresis + : "\374" udiaeresis : "\337" ssharp : "\336" THORN : "\376" thorn *************** *** 345,351 **** --- 365,374 ---- : "\375" yacute : "\377" ydiaeresis : "\377" ydiaeresis + : "\377" ydiaeresis + : "\377" ydiaeresis # + # # dead key accent keysyms # Special Character : "|" bar *************** *** 603,608 **** --- 626,633 ---- Ctrl : "\303" Atilde Ctrl : "\304" Adiaeresis Ctrl : "\304" Adiaeresis + Ctrl : "\304" Adiaeresis + Ctrl : "\304" Adiaeresis Ctrl : "\305" Aring Ctrl : "\305" Aring Ctrl : "\306" AE *************** *** 622,627 **** --- 647,654 ---- Ctrl : "\343" atilde Ctrl : "\344" adiaeresis Ctrl : "\344" adiaeresis + Ctrl : "\344" adiaeresis + Ctrl : "\344" adiaeresis Ctrl : "\345" aring Ctrl : "\345" aring Ctrl : "\346" ae *************** *** 645,650 **** --- 672,679 ---- Ctrl : "\312" Ecircumflex Ctrl : "\313" Ediaeresis Ctrl : "\313" Ediaeresis + Ctrl : "\313" Ediaeresis + Ctrl : "\313" Ediaeresis Ctrl : "\350" egrave Ctrl : "\350" egrave Ctrl : "\351" eacute *************** *** 657,662 **** --- 686,693 ---- Ctrl : "\352" ecircumflex Ctrl : "\353" ediaeresis Ctrl : "\353" ediaeresis + Ctrl : "\353" ediaeresis + Ctrl : "\353" ediaeresis Ctrl : "\314" Igrave Ctrl : "\314" Igrave Ctrl : "\315" Iacute *************** *** 669,674 **** --- 700,707 ---- Ctrl : "\316" Icircumflex Ctrl : "\317" Idiaeresis Ctrl : "\317" Idiaeresis + Ctrl : "\317" Idiaeresis + Ctrl : "\317" Idiaeresis Ctrl : "\354" igrave Ctrl : "\354" igrave Ctrl : "\355" iacute *************** *** 681,686 **** --- 714,721 ---- Ctrl : "\356" icircumflex Ctrl : "\357" idiaeresis Ctrl : "\357" idiaeresis + Ctrl : "\357" idiaeresis + Ctrl : "\357" idiaeresis Ctrl : "\321" Ntilde Ctrl : "\321" Ntilde Ctrl : "\321" Ntilde *************** *** 705,710 **** --- 740,747 ---- Ctrl : "\325" Otilde Ctrl : "\326" Odiaeresis Ctrl : "\326" Odiaeresis + Ctrl : "\326" Odiaeresis + Ctrl : "\326" Odiaeresis Ctrl : "\330" Ooblique Ctrl : "\330" Ooblique Ctrl : "\362" ograve *************** *** 723,728 **** --- 760,767 ---- Ctrl : "\365" otilde Ctrl : "\366" odiaeresis Ctrl : "\366" odiaeresis + Ctrl : "\366" odiaeresis + Ctrl : "\366" odiaeresis Ctrl : "\370" oslash Ctrl : "\370" oslash Ctrl : "\331" Ugrave *************** *** 737,742 **** --- 776,783 ---- Ctrl : "\333" Ucircumflex Ctrl : "\334" Udiaeresis Ctrl : "\334" Udiaeresis + Ctrl : "\334" Udiaeresis + Ctrl : "\334" Udiaeresis Ctrl : "\371" ugrave Ctrl : "\371" ugrave Ctrl : "\372" uacute *************** *** 749,754 **** --- 790,797 ---- Ctrl : "\373" ucircumflex Ctrl : "\374" udiaeresis Ctrl : "\374" udiaeresis + Ctrl : "\374" udiaeresis + Ctrl : "\374" udiaeresis Ctrl : "\337" ssharp Ctrl : "\336" THORN Ctrl : "\376" thorn *************** *** 762,765 **** --- 805,810 ---- Ctrl : "\375" yacute Ctrl : "\377" ydiaeresis Ctrl : "\377" ydiaeresis + Ctrl : "\377" ydiaeresis + Ctrl : "\377" ydiaeresis # End of Sequence Definition *** ./nls/Compose/iso8859-2@@/PUBLIC-LATEST Wed Jan 10 17:22:34 1996 --- xc/nls/Compose/iso8859-2 Wed May 20 15:27:48 1998 *************** *** 1,4 **** ! # $XConsortium: iso8859-2 /main/1 1996/01/10 17:21:26 kaleb $ # # ISO 8859-2 (Latin2) Compose Sequence # --- 1,4 ---- ! # $TOG: iso8859-2 /main/2 1998/05/20 15:33:30 kaleb $ # # ISO 8859-2 (Latin2) Compose Sequence # *************** *** 57,62 **** --- 57,64 ---- # are for compose sequences. : "\241" Aogonek : "\241" Aogonek + : "\241" Aogonek + : "\241" Aogonek : "\242" breve : "\243" Lstroke : "\244" currency *************** *** 73,78 **** --- 75,82 ---- <0> : "\244" currency : "\245" Lcaron : "\245" Lcaron + : "\245" Lcaron + : "\245" Lcaron : "\246" Sacute : "\246" Sacute : "\246" Sacute *************** *** 92,101 **** --- 96,111 ---- : "\250" diaeresis : "\251" Scaron : "\251" Scaron + : "\251" Scaron + : "\251" Scaron : "\252" Scedilla : "\252" Scedilla + : "\252" Scedilla + : "\252" Scedilla : "\253" Tcaron : "\253" Tcaron + : "\253" Tcaron + : "\253" Tcaron : "\254" Zacute : "\254" Zacute : "\254" Zacute *************** *** 103,118 **** --- 113,134 ---- : "\255" hyphen : "\256" Zcaron : "\256" Zcaron + : "\256" Zcaron + : "\256" Zcaron : "\257" Zabovedot <0> : "\260" degree <0> : "\260" degree : "\261" aogonek : "\261" aogonek + : "\261" aogonek + : "\261" aogonek : "\262" ogonek : "\263" lstroke : "\264" acute : "\265" lcaron : "\265" lcaron + : "\265" lcaron + : "\265" lcaron : "\266" sacute : "\266" sacute : "\266" sacute *************** *** 121,130 **** --- 137,152 ---- : "\270" cedilla : "\271" scaron : "\271" scaron + : "\271" scaron + : "\271" scaron : "\272" scedilla : "\272" scedilla + : "\272" scedilla + : "\272" scedilla : "\273" tcaron : "\273" tcaron + : "\273" tcaron + : "\273" tcaron : "\274" zacute : "\274" zacute : "\274" zacute *************** *** 133,138 **** --- 155,162 ---- : "\275" doubleacute : "\276" zcaron : "\276" zcaron + : "\276" zcaron + : "\276" zcaron : "\277" zabovedot : "\300" Racute : "\300" Racute *************** *** 147,152 **** --- 171,178 ---- : "\302" Acircumflex : "\302" Acircumflex : "\303" Abreve + : "\303" Abreve + : "\303" Abreve : "\304" Adiaeresis : "\304" Adiaeresis : "\305" Lacute *************** *** 159,166 **** --- 185,196 ---- : "\306" Cacute : "\307" Ccedilla : "\307" Ccedilla + : "\307" Ccedilla + : "\307" Ccedilla : "\310" Ccaron : "\310" Ccaron + : "\310" Ccaron + : "\310" Ccaron : "\311" Eacute : "\311" Eacute : "\311" Eacute *************** *** 167,176 **** --- 197,210 ---- : "\311" Eacute : "\312" Eogonek : "\312" Eogonek + : "\312" Eogonek + : "\312" Eogonek : "\313" Ediaeresis : "\313" Ediaeresis : "\314" Ecaron : "\314" Ecaron + : "\314" Ecaron + : "\314" Ecaron : "\315" Iacute : "\315" Iacute : "\315" Iacute *************** *** 181,186 **** --- 215,222 ---- : "\316" Icircumflex : "\317" Dcaron : "\317" Dcaron + : "\317" Dcaron + : "\317" Dcaron : "\320" Dstroke : "\320" Dstroke : "\321" Nacute *************** *** 189,194 **** --- 225,232 ---- : "\321" Nacute : "\322" Ncaron : "\322" Ncaron + : "\322" Ncaron + : "\322" Ncaron : "\323" Oacute : "\323" Oacute : "\323" Oacute *************** *** 204,209 **** --- 242,249 ---- : "\327" multiply : "\330" Rcaron : "\330" Rcaron + : "\330" Rcaron + : "\330" Rcaron : "\331" Uring : "\331" Uring : "\332" Uacute *************** *** 220,225 **** --- 260,267 ---- : "\335" Yacute : "\336" Tcedilla : "\336" Tcedilla + : "\336" Tcedilla + : "\336" Tcedilla : "\337" ssharp : "\340" racute : "\340" racute *************** *** 234,239 **** --- 276,283 ---- : "\342" acircumflex : "\342" acircumflex : "\343" abreve + : "\343" abreve + : "\343" abreve : "\344" adiaeresis : "\344" adiaeresis : "\345" lacute *************** *** 246,253 **** --- 290,301 ---- : "\346" cacute : "\347" ccedilla : "\347" ccedilla + : "\347" ccedilla + : "\347" ccedilla : "\350" ccaron : "\350" ccaron + : "\350" ccaron + : "\350" ccaron : "\351" eacute : "\351" eacute : "\351" eacute *************** *** 254,263 **** --- 302,315 ---- : "\351" eacute : "\352" eogonek : "\352" eogonek + : "\352" eogonek + : "\352" eogonek : "\353" ediaeresis : "\353" ediaeresis : "\354" ecaron : "\354" ecaron + : "\354" ecaron + : "\354" ecaron : "\355" iacute : "\355" iacute : "\355" iacute *************** *** 268,273 **** --- 320,327 ---- : "\356" icircumflex : "\357" dcaron : "\357" dcaron + : "\357" dcaron + : "\357" dcaron : "\360" dstroke : "\360" dstroke : "\361" nacute *************** *** 276,281 **** --- 330,337 ---- : "\361" nacute : "\362" ncaron : "\362" ncaron + : "\362" ncaron + : "\362" ncaron : "\363" nacute : "\363" nacute : "\363" nacute *************** *** 292,297 **** --- 348,355 ---- : "\367" division : "\370" rcaron : "\370" rcaron + : "\370" rcaron + : "\370" rcaron : "\371" uring : "\371" uring : "\372" uacute *************** *** 308,313 **** --- 366,373 ---- : "\375" yacute : "\376" tcedilla : "\376" tcedilla + : "\376" tcedilla + : "\376" tcedilla : "\377" abovedot : "\301" Aacute : "\306" Cacute *** /dev/null Sat Jun 27 09:24:15 1998 --- xc/nls/Compose/fcd8859-15 Wed Jun 17 15:46:08 1998 *************** *** 0 **** --- 1,443 ---- + # $TOG: fcd8859-15 /main/2 1998/06/17 15:53:45 kaleb $ + # + # ISO 8859-1 (Latin1) Compose Sequence + # + # Sequence Definition + # + # Means + # Special Character + : "#" numbersign + : "'" apostrophe + : "'" apostrophe + : "@" at + : "[" bracketleft + : "\\" backslash + : "\\" backslash + : "\\" backslash + : "]" bracketright + : "^" asciicircum + : "^" asciicircum + : "^" asciicirum + : "^" asciicirum + : "`" grave + : "`" grave + : "{" braceleft + : "{" braceleft + : "|" bar + : "|" bar + : "|" bar + : "|" bar + : "|" bar + : "|" bar + : "}" braceright + : "}" braceright + : "~" asciitilde + : "~" asciitilde + : "~" asciitilde + : "~" asciitilde + : "\241" exclamdown + : "\242" cent + : "\242" cent + : "\242" cent + : "\242" cent + : "\242" cent + : "\242" cent + : "\242" cent + : "\242" cent + : "\243" sterling + : "\243" sterling + : "\243" sterling + : "\243" sterling + : "\243" sterling + : "\243" sterling + : "\243" sterling + : "\243" sterling + : "\244" EuroSign + : "\244" EuroSign + : "\245" yen + : "\245" yen + : "\245" yen + : "\245" yen + : "\245" yen + : "\245" yen + : "\245" yen + : "\245" yen + : "\247" section + : "\247" section + : "\247" section + : "\247" section + : "\247" section + : "\247" section + : "\247" section + : "\247" section + <0> : "\247" section + <0> : "\247" section + <0> : "\247" section + <0> : "\247" section + : "\251" copyright + : "\251" copyright + : "\251" copyright + : "\251" copyright + : "\251" copyright + : "\251" copyright + : "\251" copyright + : "\251" copyright + <0> : "\251" copyright + <0> : "\251" copyright + <0> : "\251" copyright + <0> : "\251" copyright + : "\252" ordfeminine + : "\252" ordfeminine + : "\252" ordfeminine + : "\252" ordfeminine + : "\272" masculine + : "\272" masculine + : "\272" masculine + : "\272" masculine + : "\253" guillemotleft + : "\273" guillemotright + <0> : "\260" degree + <0> : "\260" degree + <0> : "\260" degree + <0> : "\260" degree + : "\261" plusminus + : "\261" plusminus + : "\265" mu + : "\265" mu + : "\265" mu + : "\265" mu + <1> : "\271" onesuperior + <1> : "\271" onesuperior + <1> : "\271" onesuperior + <1> : "\271" onesuperior + <1> : "\271" onesuperior + <1> : "\271" onesuperior + <2> : "\262" twosuperior + <2> : "\262" twosuperior + <2> : "\262" twosuperior + <2> : "\262" twosuperior + <2> : "\262" twosuperior + <2> : "\262" twosuperior + <3> : "\263" threesuperior + <3> : "\263" threesuperior + <3> : "\263" threesuperior + <3> : "\263" threesuperior + <3> : "\263" threesuperior + <3> : "\263" threesuperior +

: "\266" paragraph +

: "\266" paragraph +

: "\266" paragraph +

: "\266" paragraph + : "\267" periodcentered + : "\267" periodcentered + : "\267" periodcentered + : "\277" questiondown + : "\240" nobreakspace + : "\254" notsign + : "\254" notsign + : "\255" hyphen + : "\256" registered + : "\256" registered + : "\257" macron + : "\257" macron + : "\257" macron + : "\257" macron + : "\257" macron + : "\367" division + : "\367" division + : "\327" multiply + : "\264" acute + : "\270" cedilla + : "\250" diaeresis + # Accented Alphabet + : "\300" Agrave + : "\300" Agrave + : "\301" Aacute + : "\301" Aacute + : "\301" Aacute + : "\301" Aacute + : "\302" Acircumflex + : "\302" Acircumflex + : "\302" Acircumflex + : "\302" Acircumflex + : "\303" Atilde + : "\303" Atilde + : "\303" Atilde + : "\303" Atilde + : "\304" Adiaeresis + : "\304" Adiaeresis + : "\304" Adiaeresis + : "\304" Adiaeresis + : "\305" Aring + : "\305" Aring + : "\306" AE + : "\340" agrave + : "\340" agrave + : "\341" aacute + : "\341" aacute + : "\341" aacute + : "\341" aacute + : "\342" acircumflex + : "\342" acircumflex + : "\342" acircumflex + : "\342" acircumflex + : "\343" atilde + : "\343" atilde + : "\343" atilde + : "\343" atilde + : "\344" adiaeresis + : "\344" adiaeresis + : "\344" adiaeresis + : "\344" adiaeresis + : "\345" aring + : "\345" aring + : "\346" ae + : "\307" Ccedilla + : "\307" Ccedilla + : "\347" ccedilla + : "\347" ccedilla + : "\320" ETH + : "\320" ETH + : "\360" eth + : "\360" eth + : "\310" Egrave + : "\310" Egrave + : "\311" Eacute + : "\311" Eacute + : "\311" Eacute + : "\311" Eacute + : "\312" Ecircumflex + : "\312" Ecircumflex + : "\312" Ecircumflex + : "\312" Ecircumflex + : "\313" Ediaeresis + : "\313" Ediaeresis + : "\313" Ediaeresis + : "\313" Ediaeresis + : "\350" egrave + : "\350" egrave + : "\351" eacute + : "\351" eacute + : "\351" eacute + : "\351" eacute + : "\352" ecircumflex + : "\352" ecircumflex + : "\352" ecircumflex + : "\352" ecircumflex + : "\353" ediaeresis + : "\353" ediaeresis + : "\353" ediaeresis + : "\353" ediaeresis + : "\314" Igrave + : "\314" Igrave + : "\315" Iacute + : "\315" Iacute + : "\315" Iacute + : "\315" Iacute + : "\316" Icircumflex + : "\316" Icircumflex + : "\316" Icircumflex + : "\316" Icircumflex + : "\317" Idiaeresis + : "\317" Idiaeresis + : "\317" Idiaeresis + : "\317" Idiaeresis + : "\354" igrave + : "\354" igrave + : "\355" iacute + : "\355" iacute + : "\355" iacute + : "\355" iacute + : "\356" icircumflex + : "\356" icircumflex + : "\356" icircumflex + : "\356" icircumflex + : "\357" idiaeresis + : "\357" idiaeresis + : "\357" idiaeresis + : "\357" idiaeresis + : "\321" Ntilde + : "\321" Ntilde + : "\321" Ntilde + : "\321" Ntilde + : "\361" ntilde + : "\361" ntilde + : "\361" ntilde + : "\361" ntilde + : "\322" Ograve + : "\322" Ograve + : "\323" Oacute + : "\323" Oacute + : "\323" Oacute + : "\323" Oacute + : "\324" Ocircumflex + : "\324" Ocircumflex + : "\324" Ocircumflex + : "\324" Ocircumflex + : "\325" Otilde + : "\325" Otilde + : "\325" Otilde + : "\325" Otilde + : "\326" Odiaeresis + : "\326" Odiaeresis + : "\326" Odiaeresis + : "\326" Odiaeresis + : "\330" Ooblique + : "\330" Ooblique + : "\274" OE + : "\362" ograve + : "\362" ograve + : "\363" oacute + : "\363" oacute + : "\363" oacute + : "\363" oacute + : "\364" ocircumflex + : "\364" ocircumflex + : "\364" ocircumflex + : "\364" ocircumflex + : "\365" otilde + : "\365" otilde + : "\365" otilde + : "\365" otilde + : "\366" odiaeresis + : "\366" odiaeresis + : "\366" odiaeresis + : "\366" odiaeresis + : "\370" oslash + : "\370" oslash + : "\275" oe + : "\246" Scaron + : "\246" Scaron + : "\250" scaron + : "\250" scaron + : "\331" Ugrave + : "\331" Ugrave + : "\332" Uacute + : "\332" Uacute + : "\332" Uacute + : "\332" Uacute + : "\333" Ucircumflex + : "\333" Ucircumflex + : "\333" Ucircumflex + : "\333" Ucircumflex + : "\334" Udiaeresis + : "\334" Udiaeresis + : "\334" Udiaeresis + : "\334" Udiaeresis + : "\371" ugrave + : "\371" ugrave + : "\372" uacute + : "\372" uacute + : "\372" uacute + : "\372" uacute + : "\373" ucircumflex + : "\373" ucircumflex + : "\373" ucircumflex + : "\373" ucircumflex + : "\374" udiaeresis + : "\374" udiaeresis + : "\374" udiaeresis + : "\374" udiaeresis + : "\337" ssharp + : "\336" THORN + : "\376" thorn + : "\335" Yacute + : "\335" Yacute + : "\335" Yacute + : "\335" Yacute + : "\276" Ydiaeresis + : "\276" Ydiaeresis + : "\276" Ydiaeresis + : "\276" Ydiaeresis + : "\375" yacute + : "\375" yacute + : "\375" yacute + : "\375" yacute + : "\377" ydiaeresis + : "\377" ydiaeresis + : "\377" ydiaeresis + : "\377" ydiaeresis + : "\264" Zcaron + : "\264" Zcaron + : "\270" zcaron + : "\270" zcaron + # + # dead key accent keysyms + # Special Character + : "|" bar + : "`" grave + : "'" apostrophe + : "\250" diaeresis + : "^" asciicircum + : "~" asciitilde + : "`" grave + : "'" apostrophe + <0> : "\260" degree + <1> : "\271" onesuperior + <2> : "\262" twosuperior + <3> : "\263" threesuperior + : "\267" periodcentered + : "\254" notsign + : "\257" macron + : "\257" macron + : "\264" acute + : "\270" cedilla + : "\250" diaeresis + # Accented Alphabet + : "\300" Agrave + : "\301" Aacute + : "\302" Acircumflex + : "\303" Atilde + : "\304" Adiaeresis + : "\340" agrave + : "\341" aacute + : "\342" acircumflex + : "\343" atilde + : "\344" adiaeresis + : "\307" Ccedilla + : "\347" ccedilla + : "\310" Egrave + : "\311" Eacute + : "\312" Ecircumflex + : "\313" Ediaeresis + : "\350" egrave + : "\351" eacute + : "\352" ecircumflex + : "\353" ediaeresis + : "\314" Igrave + : "\315" Iacute + : "\316" Icircumflex + : "\317" Idiaeresis + : "\354" igrave + : "\355" iacute + : "\356" icircumflex + : "\357" idiaeresis + : "\321" Ntilde + : "\361" ntilde + : "\322" Ograve + : "\323" Oacute + : "\324" Ocircumflex + : "\325" Otilde + : "\326" Odiaeresis + : "\362" ograve + : "\363" oacute + : "\364" ocircumflex + : "\365" otilde + : "\366" odiaeresis + : "\246" Scaron + : "\250" scaron + : "\331" Ugrave + : "\332" Uacute + : "\333" Ucircumflex + : "\334" Udiaeresis + : "\371" ugrave + : "\372" uacute + : "\373" ucircumflex + : "\374" udiaeresis + : "\335" Yacute + : "\276" Ydiaeresis + : "\375" yacute + : "\377" ydiaeresis + : "\264" Zcaron + : "\270" zcaron + # End of Sequence Definition *** ./nls/XLC_LOCALE/Imakefile@@/PUBLIC-LATEST Mon Sep 29 11:33:17 1997 --- xc/nls/XLC_LOCALE/Imakefile Thu May 21 07:45:56 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imakefile /main/15 1997/09/29 11:34:18 kaleb $ WCHAR32 = HasWChar32 TBLDIR = $(XLOCALEDIR)/tbl_data --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/17 1998/05/21 07:51:40 kaleb $ WCHAR32 = HasWChar32 TBLDIR = $(XLOCALEDIR)/tbl_data *************** *** 39,44 **** --- 39,46 ---- LTarget(iso8859-7) LTarget(iso8859-8) LTarget(iso8859-9) + LTarget(iso8859-10) + LTarget(fcd8859-15) LTarget(ja) LTarget(ja.JIS) LTarget(ja.SJIS) *************** *** 62,67 **** --- 64,71 ---- InstallNonExecFile(tab8859_7,$(TBLDIR)) InstallNonExecFile(tab8859_8,$(TBLDIR)) InstallNonExecFile(tab8859_9,$(TBLDIR)) + InstallNonExecFile(tab8859_10,$(TBLDIR)) + InstallNonExecFile(tab8859_15,$(TBLDIR)) InstallNonExecFile(jis0208,$(TBLDIR)) InstallNonExecFile(ksc5601,$(TBLDIR)) InstallNonExecFile(gb2312,$(TBLDIR)) *** /dev/null Sat Jun 27 09:24:17 1998 --- xc/nls/XLC_LOCALE/fcd8859-15 Wed May 20 14:43:35 1998 *************** *** 0 **** --- 1,78 ---- + XCOMM $TOG: fcd8859-15 /main/1 1998/05/20 14:49:16 kaleb $ + XCOMM XLocale Database Sample for fcd/dis/iso 8859-15. + XCOMM When Final Committee Draft (FCD) 8859-15 is formalized + XCOMM then this file will be renamed iso8859-15. + XCOMM This file is provided as preliminary support for the Latin-9 + XCOMM (a.k.a. Latin-0) character set so that Europeans who want + XCOMM the Euro currency character can do so. + XCOMM + + XCOMM + XCOMM XLC_FONTSET category + XCOMM + XLC_FONTSET + XCOMM fs0 class + fs0 { + charset { + name ISO8859-1:GL + } + font { + primary FCD8859-15:GL + substitute FCD8859-15:GL + vertical_rotate all + } + } + XCOMM fs1 class + fs1 { + charset { + name FCD8859-15:GR + } + font { + primary FCD8859-2:GR + } + } + END XLC_FONTSET + + XCOMM + XCOMM XLC_XLOCALE category + XCOMM + XLC_XLOCALE + + encoding_name FCD8859-15 + mb_cur_max 1 + state_depend_encoding False + #if WCHAR32 + wc_encoding_mask \x30000000 + wc_shift_bits 7 + #else + wc_encoding_mask \x00008080 + wc_shift_bits 8 + #endif + + #ifndef X_LOCALE + use_stdc_env True + force_convert_to_mb True + #endif + + XCOMM cs0 class + cs0 { + side GL:Default + length 1 + wc_encoding \x00000000 + ct_encoding FCD8859-15:GL; ISO8859-1:GL + } + + + XCOMM cs1 class + cs1 { + side GR:Default + length 1 + #if WCHAR32 + wc_encoding \x30000000 + #else + wc_encoding \x00008080 + #endif + ct_encoding FCD8859-15:GR + } + + END XLC_XLOCALE *** /dev/null Sat Jun 27 09:24:18 1998 --- xc/nls/XLC_LOCALE/iso8859-10 Wed May 20 14:43:39 1998 *************** *** 0 **** --- 1,73 ---- + XCOMM $TOG: iso8859-10 /main/1 1998/05/20 14:49:21 kaleb $ + XCOMM XLocale Database Sample for iso8859-4. + XCOMM + + XCOMM + XCOMM XLC_FONTSET category + XCOMM + XLC_FONTSET + XCOMM fs0 class + fs0 { + charset { + name ISO8859-1:GL + } + font { + primary ISO8859-10:GL + substitute ISO8859-1:GL + vertical_rotate all + } + } + XCOMM fs1 class + fs1 { + charset { + name ISO8859-10:GR + } + font { + primary ISO8859-10:GR + } + } + END XLC_FONTSET + + XCOMM + XCOMM XLC_XLOCALE category + XCOMM + XLC_XLOCALE + + encoding_name ISO8859-10 + mb_cur_max 1 + state_depend_encoding False + #if WCHAR32 + wc_encoding_mask \x30000000 + wc_shift_bits 7 + #else + wc_encoding_mask \x00008080 + wc_shift_bits 8 + #endif + + #ifndef X_LOCALE + use_stdc_env True + force_convert_to_mb True + #endif + + XCOMM cs0 class + cs0 { + side GL:Default + length 1 + wc_encoding \x00000000 + ct_encoding ISO8859-10:GL; ISO8859-1:GL + } + + + XCOMM cs1 class + cs1 { + side GR:Default + length 1 + #if WCHAR32 + wc_encoding \x30000000 + #else + wc_encoding \x00008080 + #endif + ct_encoding ISO8859-10:GR + } + + END XLC_XLOCALE *** /dev/null Sat Jun 27 09:24:20 1998 --- xc/nls/XLC_LOCALE/tab8859_10 Wed May 20 14:43:44 1998 *************** *** 0 **** --- 1,22 ---- + 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f + 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f + 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f + 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f + 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f + 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f + 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f + 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f + 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f + 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f + 00a0 0104 0112 0122 012a 0128 0136 00a7 + 013b 0110 0160 0166 017d 00ad 016a 014a + 00b0 0105 0113 0123 012b 0129 0137 00b7 + 013c 0111 0161 0167 017e 2014 016b 014b + 0100 00c1 00c2 00c3 00c4 00c5 00c6 012e + 010c 00c9 0118 00cb 0116 00cd 00ce 00cf + 00d0 0145 014c 00d3 00d4 00d5 00d6 0168 + 00d8 0172 00da 00db 00dc 00dd 00de 00df + 0101 00e1 00e2 00e3 00e4 00e5 00e6 012f + 010d 00e9 0119 00eb 0117 00ed 00ee 00ef + 00f0 0146 014d 00f3 00f4 00f5 00f6 00f7 + 00f8 00f9 00fa 00fb 00fc 00fd 00fe 0138 *** /dev/null Sat Jun 27 09:24:21 1998 --- xc/nls/XLC_LOCALE/tab8859_15 Wed May 20 14:43:48 1998 *************** *** 0 **** --- 1,16 ---- + 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f + 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f + 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f + 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f + 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f + 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f + 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f + 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f + 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f + 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f + a0 a1 a2 a3 20ac a5 0160 a7 0161 a9 aa ab ac ad ae af + b0 b1 b2 b3 017d b5 b6 b7 017e b9 ba bb 0152 0153 0178 bf + c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf + d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df + e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef + f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff *** /dev/null Sun Jun 28 08:31:32 1998 --- xc/nls/XLC_LOCALE/tabkoi8_r Wed May 20 14:43:52 1998 *************** *** 0 **** --- 1,24 ---- + 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f + 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f + 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f + 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f + 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f + 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f + 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f + 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f + 2500 2502 250c 2510 2514 2518 251c 2524 + 252c 2534 253c 2580 2584 2588 258c 2590 + 2591 2592 2593 2320 25a0 2219 221a 2248 + 2264 2265 00a0 2321 00b0 00b2 00b7 00f7 + 2550 2551 2552 0451 2553 2554 2555 2556 + 2557 2558 2559 255a 255b 255c 255d 255e + 255f 2560 2561 0401 2562 2563 2564 2565 + 2566 2567 2568 2569 256a 256b 256c 00a9 + 044e 0430 0431 0446 0434 0435 0444 0433 + 0445 0438 0439 043a 043b 043c 043d 043e + 043f 044f 0440 0441 0442 0443 0436 0432 + 044c 044b 0437 0448 044d 0449 0447 044a + 042e 0410 0411 0426 0414 0415 0424 0413 + 0425 0418 0419 041a 041b 041c 041d 041e + 041f 042f 0420 0421 0422 0423 0416 0412 + 042c 042b 0417 0428 042d 0429 0427 042a *** ./nls/compose.dir@@/PUBLIC-LATEST Wed Dec 25 23:58:09 1996 --- xc/nls/compose.dir Tue May 26 13:45:42 1998 *************** *** 1,42 **** ! XCOMM $XConsortium: compose.dir /main/5 1996/12/25 23:53:00 kaleb $ XCOMM XCOMM This file contains compose table file name. XCOMM The first word is the compose table file name and XCOMM the second word is full locale name. XCOMM ! iso8859-1/Compose C ! iso8859-1/Compose da_DK.ISO8859-1 ! iso8859-1/Compose de_DE.ISO8859-1 ! iso8859-1/Compose de_AT.ISO8859-1 ! iso8859-1/Compose de_CH.ISO8859-1 ! iso8859-1/Compose en_US.ISO8859-1 ! iso8859-1/Compose en_GB.ISO8859-1 ! iso8859-1/Compose en_AU.ISO8859-1 ! iso8859-1/Compose en_CA.ISO8859-1 ! iso8859-1/Compose es_ES.ISO8859-1 ! iso8859-1/Compose fi_FI.ISO8859-1 ! iso8859-1/Compose fr_FR.ISO8859-1 ! iso8859-1/Compose fr_BE.ISO8859-1 ! iso8859-1/Compose fr_CA.ISO8859-1 ! iso8859-1/Compose fr_CH.ISO8859-1 ! iso8859-1/Compose is_IS.ISO8859-1 ! iso8859-1/Compose it_IT.ISO8859-1 ! iso8859-1/Compose it_CH.ISO8859-1 ! iso8859-1/Compose lt_LN.ISO8859-1 ! iso8859-1/Compose nl_NL.ISO8859-1 ! iso8859-1/Compose nl_BE.ISO8859-1 ! iso8859-1/Compose no_NO.ISO8859-1 ! iso8859-1/Compose pt_PT.ISO8859-1 ! iso8859-1/Compose sv_SE.ISO8859-1 ! iso8859-1/Compose sv_SE.ISO8859-1 ! iso8859-2/Compose cs_CZ.ISO8859-2 ! iso8859-2/Compose cz_CZ.ISO8859-2 ! iso8859-2/Compose hu_HU.ISO8859-2 ! iso8859-2/Compose hr_HR.ISO8859-2 ! iso8859-2/Compose pl_PL.ISO8859-2 ! iso8859-2/Compose ro_RO.ISO8859-2 ! iso8859-2/Compose sh_YU.ISO8859-2 ! iso8859-2/Compose sk_SK.ISO8859-2 ! iso8859-2/Compose sl_CS.ISO8859-2 ! iso8859-2/Compose sl_SI.ISO8859-2 ! iso8859-2/Compose sr_SP.ISO8859-2 --- 1,79 ---- ! XCOMM $TOG: compose.dir /main/9 1998/05/26 13:51:43 kaleb $ XCOMM XCOMM This file contains compose table file name. XCOMM The first word is the compose table file name and XCOMM the second word is full locale name. XCOMM ! iso8859-1/Compose: C ! iso8859-1/Compose: af_ZA.ISO8859-1 ! iso8859-1/Compose: ca_ES.ISO8859-1 ! iso8859-1/Compose: da_DK.ISO8859-1 ! iso8859-1/Compose: de_AT.ISO8859-1 ! iso8859-1/Compose: de_CH.ISO8859-1 ! iso8859-1/Compose: de_DE.ISO8859-1 ! iso8859-1/Compose: de_LI.ISO8859-1 ! iso8859-1/Compose: de_LU.ISO8859-1 ! iso8859-1/Compose: en_AU.ISO8859-1 ! iso8859-1/Compose: en_BZ.ISO8859-1 ! iso8859-1/Compose: en_CA.ISO8859-1 ! iso8859-1/Compose: en_GB.ISO8859-1 ! iso8859-1/Compose: en_IE.ISO8859-1 ! iso8859-1/Compose: en_JM.ISO8859-1 ! iso8859-1/Compose: en_NZ.ISO8859-1 ! iso8859-1/Compose: en_TT.ISO8859-1 ! iso8859-1/Compose: en_UK.ISO8859-1 ! iso8859-1/Compose: en_US.ISO8859-1 ! iso8859-1/Compose: en_ZA.ISO8859-1 ! iso8859-1/Compose: es_AR.ISO8859-1 ! iso8859-1/Compose: es_BO.ISO8859-1 ! iso8859-1/Compose: es_CL.ISO8859-1 ! iso8859-1/Compose: es_CO.ISO8859-1 ! iso8859-1/Compose: es_CR.ISO8859-1 ! iso8859-1/Compose: es_DO.ISO8859-1 ! iso8859-1/Compose: es_EC.ISO8859-1 ! iso8859-1/Compose: es_ES.ISO8859-1 ! iso8859-1/Compose: es_GT.ISO8859-1 ! iso8859-1/Compose: es_HN.ISO8859-1 ! iso8859-1/Compose: es_MX.ISO8859-1 ! iso8859-1/Compose: es_NI.ISO8859-1 ! iso8859-1/Compose: es_PA.ISO8859-1 ! iso8859-1/Compose: es_PE.ISO8859-1 ! iso8859-1/Compose: es_PR.ISO8859-1 ! iso8859-1/Compose: es_PY.ISO8859-1 ! iso8859-1/Compose: es_SV.ISO8859-1 ! iso8859-1/Compose: es_UY.ISO8859-1 ! iso8859-1/Compose: es_VE.ISO8859-1 ! iso8859-1/Compose: eu_ES.ISO8859-1 ! iso8859-1/Compose: fi_FI.ISO8859-1 ! iso8859-1/Compose: fo_FO.ISO8859-1 ! iso8859-1/Compose: fr_BE.ISO8859-1 ! iso8859-1/Compose: fr_CA.ISO8859-1 ! iso8859-1/Compose: fr_CH.ISO8859-1 ! iso8859-1/Compose: fr_FR.ISO8859-1 ! iso8859-1/Compose: fr_LU.ISO8859-1 ! iso8859-1/Compose: id_ID.ISO8859-1 ! iso8859-1/Compose: is_IS.ISO8859-1 ! iso8859-1/Compose: it_CH.ISO8859-1 ! iso8859-1/Compose: it_IT.ISO8859-1 ! iso8859-1/Compose: lt_LN.ISO8859-1 ! iso8859-1/Compose: nl_BE.ISO8859-1 ! iso8859-1/Compose: nl_NL.ISO8859-1 ! iso8859-1/Compose: no_NO.ISO8859-1 ! iso8859-1/Compose: pt_BR.ISO8859-1 ! iso8859-1/Compose: pt_PT.ISO8859-1 ! iso8859-1/Compose: sv_FI.ISO8859-1 ! iso8859-1/Compose: sv_SE.ISO8859-1 ! iso8859-2/Compose: cs_CZ.ISO8859-2 ! iso8859-2/Compose: cz_CZ.ISO8859-2 ! iso8859-2/Compose: hr_HR.ISO8859-2 ! iso8859-2/Compose: hu_HU.ISO8859-2 ! iso8859-2/Compose: pl_PL.ISO8859-2 ! iso8859-2/Compose: ro_RO.ISO8859-2 ! iso8859-2/Compose: sh_YU.ISO8859-2 ! iso8859-2/Compose: sk_SK.ISO8859-2 ! iso8859-2/Compose: sl_CS.ISO8859-2 ! iso8859-2/Compose: sl_SI.ISO8859-2 ! iso8859-2/Compose: sq_AL.ISO8859-2 ! iso8859-2/Compose: sr_SP.ISO8859-2 ! iso8859-2/Compose: sr_YU.ISO8859-2 ! en_US.utf/Compose: en_US.utf *** ./nls/locale.alias@@/PUBLIC-LATEST Thu Nov 13 18:37:46 1997 --- xc/nls/locale.alias Tue May 26 13:35:48 1998 *************** *** 1,4 **** ! XCOMM $TOG: locale.alias /main/27 1997/11/13 18:41:10 kaleb $ XCOMM XCOMM This file contains alias name of locale. XCOMM Each alias name is described within one line. --- 1,4 ---- ! XCOMM $TOG: locale.alias /main/33 1998/05/26 13:41:50 kaleb $ XCOMM XCOMM This file contains alias name of locale. XCOMM Each alias name is described within one line. *************** *** 5,309 **** XCOMM The first word is the alias name (simplified locale name) XCOMM the second word is full locale name. XCOMM ! POSIX C ! POSIX-UTF2 C ! C_C.C C ! C.en C ! C.iso88591 en_US.ISO8859-1 ! Cextend en_US.ISO8859-1 ! Cextend.en en_US.ISO8859-1 ! English_United-States.437 C XCOMM ! ar ar_AA.ISO8859-6 ! ar_AA ar_AA.ISO8859-6 ! ar_SA.iso88596 ar_SA.ISO8859-6 ! bg bg_BG.ISO8859-5 ! bg_BG bg_BG.ISO8859-5 ! bg_BG.iso88595 bg_BG.ISO8859-5 ! cs cs_CZ.ISO8859-2 ! cs_CS cs_CZ.ISO8859-2 ! cs_CS.ISO8859-2 cs_CZ.ISO8859-2 ! cs_CZ.iso88592 cs_CZ.ISO8859-2 ! cz cz_CZ.ISO8859-2 ! cz_CZ cz_CZ.ISO8859-2 ! da da_DK.ISO8859-1 ! da_DK da_DK.ISO8859-1 ! da_DK.88591 da_DK.ISO8859-1 ! da_DK.88591.en da_DK.ISO8859-1 ! da_DK.iso88591 da_DK.ISO8859-1 ! da_DK.ISO_8859-1 da_DK.ISO8859-1 ! de de_DE.ISO8859-1 ! de_AT de_AT.ISO8859-1 ! de_AT.ISO_8859-1 de_AT.ISO8859-1 ! de_CH de_CH.ISO8859-1 ! de_CH.ISO_8859-1 de_CH.ISO8859-1 ! de_DE de_DE.ISO8859-1 ! de_DE.88591 de_DE.ISO8859-1 ! de_DE.88591.en de_DE.ISO8859-1 ! de_DE.iso88591 de_DE.ISO8859-1 ! de_DE.ISO_8859-1 de_DE.ISO8859-1 ! GER_DE.8859 de_DE.ISO8859-1 ! GER_DE.8859.in de_DE.ISO8859-1 ! ee ee_EE.ISO8859-4 ! el el_GR.ISO8859-7 ! el_GR el_GR.ISO8859-7 ! el_GR.iso88597 el_GR.ISO8859-7 ! en en_US.ISO8859-1 ! en_AU en_AU.ISO8859-1 ! en_AU.ISO_8859-1 en_AU.ISO8859-1 ! en_CA en_CA.ISO8859-1 ! en_CA.ISO_8859-1 en_CA.ISO8859-1 ! en_GB en_GB.ISO8859-1 ! en_GB.88591 en_GB.ISO8859-1 ! en_GB.88591.en en_GB.ISO8859-1 ! en_GB.iso88591 en_GB.ISO8859-1 ! en_GB.ISO_8859-1 en_GB.ISO8859-1 ! en_UK en_GB.ISO8859-1 ! ENG_GB.8859 en_GB.ISO8859-1 ! ENG_GB.8859.in en_GB.ISO8859-1 ! en_IE en_IE.ISO8859-1 ! en_NZ en_NZ.ISO8859-1 ! en_US en_US.ISO8859-1 ! en_US.88591 en_US.ISO8859-1 ! en_US.88591.en en_US.ISO8859-1 ! en_US.iso88591 en_US.ISO8859-1 ! en_US.ISO_8859-1 en_US.ISO8859-1 ! en_US.UTF-8 en_US.utf ! es es_ES.ISO8859-1 ! es_AR es_AR.ISO8859-1 ! es_BO es_BO.ISO8859-1 ! es_CL es_CL.ISO8859-1 ! es_CO es_CO.ISO8859-1 ! es_CR es_CR.ISO8859-1 ! es_EC es_EC.ISO8859-1 ! es_ES es_ES.ISO8859-1 ! es_ES.88591 es_ES.ISO8859-1 ! es_ES.88591.en es_ES.ISO8859-1 ! es_ES.iso88591 es_ES.ISO8859-1 ! es_ES.ISO_8859-1 es_ES.ISO8859-1 ! es_GT es_GT.ISO8859-1 ! es_MX es_MX.ISO8859-1 ! es_NI es_NI.ISO8859-1 ! es_PA es_PA.ISO8859-1 ! es_PE es_PE.ISO8859-1 ! es_PY es_PY.ISO8859-1 ! es_SV es_SV.ISO8859-1 ! es_UY es_UY.ISO8859-1 ! es_VE es_VE.ISO8859-1 #if defined(SVR4) && defined(sun) ! XCOMM Sun Solaris 2.6 erroneously has uses the country code "et" for ! XCOMM Estonia. "Et" is Ethiopia, Estonia should be "ee". Sun also has ! XCOMM erroneously specified Estonia as a Latin-1 using country in their ! XCOMM Xlocale database, however this is clearly incorrect according to ! XCOMM ISO8859. ! et ee_EE.ISO8859-4 #endif ! fi fi_FI.ISO8859-1 ! fi_FI fi_FI.ISO8859-1 ! fi_FI.88591 fi_FI.ISO8859-1 ! fi_FI.88591.en fi_FI.ISO8859-1 ! fi_FI.iso88591 fi_FI.ISO8859-1 ! fi_FI.ISO_8859-1 fi_FI.ISO8859-1 ! fr fr_FR.ISO8859-1 ! fr_BE fr_BE.ISO8859-1 ! fr_BE.88591 fr_BE.ISO8859-1 ! fr_BE.88591.en fr_BE.ISO8859-1 ! fr_BE.ISO_8859-1 fr_BE.ISO8859-1 ! fr_CA fr_CA.ISO8859-1 ! fr_CA.88591 fr_CA.ISO8859-1 ! fr_CA.88591.en fr_CA.ISO8859-1 ! fr_CA.iso88591 fr_CA.ISO8859-1 ! fr_CA.ISO_8859-1 fr_CA.ISO8859-1 ! fr_CH fr_CH.ISO8859-1 ! fr_CH.88591 fr_CH.ISO8859-1 ! fr_CH.88591.en fr_CH.ISO8859-1 ! fr_CH.ISO_8859-1 fr_CH.ISO8859-1 ! fr_FR fr_FR.ISO8859-1 ! fr_FR.88591 fr_FR.ISO8859-1 ! fr_FR.88591.en fr_FR.ISO8859-1 ! fr_FR.iso88591 fr_FR.ISO8859-1 ! fr_FR.ISO_8859-1 fr_FR.ISO8859-1 ! FRE_FR.8859 fr_FR.ISO8859-1 ! FRE_FR.8859.in fr_FR.ISO8859-1 ! hr hr_HR.ISO8859-2 ! hr_HR hr_HR.ISO8859-2 ! hr_HR.iso88592 hr_HR.ISO8859-2 ! hr_HR.ISO_8859-2 hr_HR.ISO8859-2 ! hu hu_HU.ISO8859-2 ! hu_HU hu_HU.ISO8859-2 ! hu_HU.iso88592 hu_HU.ISO8859-2 ! is is_IS.ISO8859-1 ! is_IS is_IS.ISO8859-1 ! is_IS.iso88591 is_IS.ISO8859-1 ! is_IS.ISO_8859-1 is_IS.ISO8859-1 ! it it_IT.ISO8859-1 ! it_CH it_CH.ISO8859-1 ! it_CH.ISO_8859-1 it_CH.ISO8859-1 ! it_IT it_IT.ISO8859-1 ! it_IT.88591 it_IT.ISO8859-1 ! it_IT.88591.en it_IT.ISO8859-1 ! it_IT.iso88591 it_IT.ISO8859-1 ! it_IT.ISO_8859-1 it_IT.ISO8859-1 ! iw iw_IL.ISO8859-8 ! iw_IL iw_IL.ISO8859-8 ! iw_IL.iso88598 iw_IL.ISO8859-8 ! ja ja_JP.eucJP ! ja.JIS ja_JP.JIS7 ! ja.SJIS ja_JP.SJIS #ifndef __uxp__ ! ja_JP ja_JP.eucJP #else /* __uxp__ */ ! ja_JP ja_JP.U90 ! ja_JP.U90 ja_JP.U90 ! ja_JP.S90 ja_JP.S90 #endif /* __uxp__ */ ! ja_JP.ujis ja_JP.eucJP ! ja_JP.eucJP ja_JP.eucJP ! Jp_JP ja_JP.eucJP ! ja_JP.AJEC ja_JP.eucJP ! ja_JP.EUC ja_JP.eucJP ! ja_JP.ISO-2022-JP ja_JP.JIS7 ! ja_JP.JIS ja_JP.JIS7 ! ja_JP.jis7 ja_JP.JIS7 ! ja_JP.mscode ja_JP.SJIS ! ja_JP.SJIS ja_JP.SJIS ! ko ko_KR.eucKR ! ko_KR ko_KR.eucKR ! ko_KR.EUC ko_KR.eucKR ! ko_KR.euc ko_KR.eucKR #if defined(__FreeBSD__) XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's XCOMM generic latin-1 locale name. N.B. "lt" is a bad code to use for a XCOMM generic Latin-1 locale anyway because it is the country code for XCOMM Lithuania, which by default uses Latin-4. ! lt_LN.ISO_8859-1 lt_LN.ISO8859-1 #endif ! lt lt_LT.ISO8859-4 ! lv lv_LV.ISO8859-4 ! mk mk_MK.ISO8859-5 ! mk_MK mk_MK.ISO8859-5 ! nl nl_NL.ISO8859-1 ! nl_BE nl_BE.ISO8859-1 ! nl_BE.88591 nl_BE.ISO8859-1 ! nl_BE.88591.en nl_BE.ISO8859-1 ! nl_BE.ISO_8859-1 nl_BE.ISO8859-1 ! nl_NL nl_NL.ISO8859-1 ! nl_NL.88591 nl_NL.ISO8859-1 ! nl_NL.88591.en nl_NL.ISO8859-1 ! nl_NL.iso88591 nl_NL.ISO8859-1 ! nl_NL.ISO_8859-1 nl_NL.ISO8859-1 ! no no_NO.ISO8859-1 ! no_NO no_NO.ISO8859-1 ! no_NO.88591 no_NO.ISO8859-1 ! no_NO.88591.en no_NO.ISO8859-1 ! no_NO.iso88591 no_NO.ISO8859-1 ! no_NO.ISO_8859-1 no_NO.ISO8859-1 ! pl pl_PL.ISO8859-2 ! pl_PL pl_PL.ISO8859-2 ! pl_PL.iso88592 pl_PL.ISO8859-2 ! pt pt_PT.ISO8859-1 ! pt_BR pt_BR.ISO8859-1 ! pt_PT pt_PT.ISO8859-1 ! pt_PT.88591 pt_PT.ISO8859-1 ! pt_PT.88591.en pt_PT.ISO8859-1 ! pt_PT.iso88591 pt_PT.ISO8859-1 ! pt_PT.ISO_8859-1 pt_PT.ISO8859-1 ! ro ro_RO.ISO8859-2 ! ro_RO ro_RO.ISO8859-2 ! ro_RO.iso88592 ro_RO.ISO8859-2 ! ru ru_RU.ISO8859-5 ! ru_RU ru_RU.ISO8859-5 ! ru_RU.iso88595 ru_RU.ISO8859-5 ! ru_SU ru_RU.ISO8859-5 ! ru_SU.ISO8859-5 ru_RU.ISO8859-5 ! ru_SU.KOI8-R ru_RU.KOI8-R ! sh sh_YU.ISO8859-2 ! sh_HR.iso88592 sh_HR.ISO8859-2 ! sh_YU sh_YU.ISO8859-2 ! sh_SP sh_YU.ISO8859-2 ! sk sk_SK.ISO8859-2 ! sk_SK sk_SK.ISO8859-2 ! sl sl_CS.ISO8859-2 ! sl_CS sl_CS.ISO8859-2 ! sl_SI sl_SI.ISO8859-2 ! sl_SI.iso88592 sl_SI.ISO8859-2 ! sp sp_YU.ISO8859-5 ! sp_YU sp_YU.ISO8859-5 ! sr_SP sr_SP.ISO8859-2 ! sv sv_SE.ISO8859-1 ! sv_SE sv_SE.ISO8859-1 ! sv_SE.88591 sv_SE.ISO8859-1 ! sv_SE.88591.en sv_SE.ISO8859-1 ! sv_SE.iso88591 sv_SE.ISO8859-1 ! sv_SE.ISO_8859-1 sv_SE.ISO8859-1 ! th_TH th_TH.TACTIS ! th_TH.tis620 th_TH.TACTIS ! tr tr_TR.ISO8859-9 ! tr_TR tr_TR.ISO8859-9 ! tr_TR.iso88599 tr_TR.ISO8859-9 ! zh zh_CN.eucCN ! zh_CN zh_CN.eucCN ! zh_CN.EUC zh_CN.eucCN ! zh_TW zh_TW.eucTW ! zh_TW.EUC zh_TW.eucTW ! zh_CN.big5 zh_TW.eucTW XCOMM The following locale names are used in SCO 3.0 ! english_uk.8859 en_GB.ISO8859-1 ! english_us.8859 en_US.ISO8859-1 ! english_us.ascii en_US.ISO8859-1 ! french_france.8859 fr_FR.ISO8859-1 ! german_germany.8859 de_DE.ISO8859-1 ! portuguese_brazil.8859 pt_BR.ISO8859-1 ! spanish_spain.8859 es_ES.ISO8859-1 XCOMM The following locale names are used in HPUX 9.x ! american.iso88591 en_US.ISO8859-1 ! arabic.iso88596 ar_AA.ISO8859-6 ! bulgarian bg_BG.ISO8859-5 ! c-french.iso88591 fr_CA.ISO8859-1 ! chinese-s zh_CN.eucCN ! chinese-t zh_TW.eucTW ! croatian hr_HR.ISO8859-2 ! czech cs_CS.ISO8859-2 ! danish.iso88591 da_DK.ISO8859-1 ! dutch.iso88591 nl_BE.ISO8859-1 ! english.iso88591 en_EN.ISO8859-1 ! finnish.iso88591 fi_FI.ISO8859-1 ! french.iso88591 fr_CH.ISO8859-1 ! german.iso88591 de_CH.ISO8859-1 ! greek.iso88597 el_GR.ISO8859-7 ! hebrew.iso88598 iw_IL.ISO8859-8 ! hungarian hu_HU.ISO8859-2 ! icelandic.iso88591 is_IS.ISO8859-1 ! italian.iso88591 it_IT.ISO8859-1 #if ! (defined(SVR4) && defined(sun)) ! japanese ja_JP.SJIS #else ! japanese ja_JP.eucJP #endif ! japanese.euc ja_JP.eucJP ! korean ko_KR.eucKR ! norwegian.iso88591 no_NO.ISO8859-1 ! polish pl_PL.ISO8859-2 ! portuguese.iso88591 pt_PT.ISO8859-1 ! rumanian ro_RO.ISO8859-2 ! russian ru_SU.ISO8859-5 ! serbocroatian sh_YU.ISO8859-2 ! slovak sk_SK.ISO8859-2 ! slovene sl_CS.ISO8859-2 ! spanish.iso88591 es_ES.ISO8859-1 ! swedish.iso88591 sv_SE.ISO8859-1 ! turkish.iso88599 tr_TR.ISO8859-9 XCOMM Solaris and SunOS have iso_8859_1 LC_CTYPES to augment LANG=C ! iso_8859_1 en_US.ISO8859-1 ! XCOMM Microsoft Windows/NT 3.51 Japanese Edition ! Korean_Korea.949 ko_KR.eucKR ! Japanese_Japan.932 ja_JP.SJIS XCOMM Other miscellaneous locale names ! ISO8859-1 en_US.ISO8859-1 ! ISO-8859-1 en_US.ISO8859-1 #ifndef __uxp__ ! japan ja_JP.eucJP #else ! japan ja_JP.U90 #endif ! Japanese-EUC ja_JP.eucJP --- 5,412 ---- XCOMM The first word is the alias name (simplified locale name) XCOMM the second word is full locale name. XCOMM ! POSIX: C ! POSIX-UTF2: C ! C_C.C: C ! C.en: C ! C.iso88591: en_US.ISO8859-1 ! Cextend: en_US.ISO8859-1 ! Cextend.en: en_US.ISO8859-1 ! English_United-States.437: C XCOMM ! ar: ar_AA.ISO8859-6 ! ar_AA: ar_AA.ISO8859-6 ! ar_SA.iso88596: ar_SA.ISO8859-6 ! bg: bg_BG.ISO8859-5 ! bg_BG: bg_BG.ISO8859-5 ! bg_BG.iso88595: bg_BG.ISO8859-5 ! cs: cs_CZ.ISO8859-2 ! cs_CS: cs_CZ.ISO8859-2 ! cs_CS.ISO8859-2: cs_CZ.ISO8859-2 ! cs_CZ: cs_CZ.ISO8859-2 ! cs_CZ.iso88592: cs_CZ.ISO8859-2 ! cz: cz_CZ.ISO8859-2 ! cz_CZ: cz_CZ.ISO8859-2 ! da: da_DK.ISO8859-1 ! da_DK: da_DK.ISO8859-1 ! da_DK.88591: da_DK.ISO8859-1 ! da_DK.88591.en: da_DK.ISO8859-1 ! da_DK.iso88591: da_DK.ISO8859-1 ! da_DK.ISO_8859-1: da_DK.ISO8859-1 ! de: de_DE.ISO8859-1 ! de_AT: de_AT.ISO8859-1 ! de_AT.ISO_8859-1: de_AT.ISO8859-1 ! de_CH: de_CH.ISO8859-1 ! de_CH.ISO_8859-1: de_CH.ISO8859-1 ! de_DE: de_DE.ISO8859-1 ! de_DE.88591: de_DE.ISO8859-1 ! de_DE.88591.en: de_DE.ISO8859-1 ! de_DE.iso88591: de_DE.ISO8859-1 ! de_DE.ISO_8859-1: de_DE.ISO8859-1 ! GER_DE.8859: de_DE.ISO8859-1 ! GER_DE.8859.in: de_DE.ISO8859-1 ! ee: ee_EE.ISO8859-4 ! el: el_GR.ISO8859-7 ! el_GR: el_GR.ISO8859-7 ! el_GR.iso88597: el_GR.ISO8859-7 ! en: en_US.ISO8859-1 ! en_AU: en_AU.ISO8859-1 ! en_AU.ISO_8859-1: en_AU.ISO8859-1 ! en_CA: en_CA.ISO8859-1 ! en_CA.ISO_8859-1: en_CA.ISO8859-1 ! en_GB: en_GB.ISO8859-1 ! en_GB.88591: en_GB.ISO8859-1 ! en_GB.88591.en: en_GB.ISO8859-1 ! en_GB.iso88591: en_GB.ISO8859-1 ! en_GB.ISO_8859-1: en_GB.ISO8859-1 ! en_UK: en_GB.ISO8859-1 ! ENG_GB.8859: en_GB.ISO8859-1 ! ENG_GB.8859.in: en_GB.ISO8859-1 ! en_IE: en_IE.ISO8859-1 ! en_NZ: en_NZ.ISO8859-1 ! en_US: en_US.ISO8859-1 ! en_US.88591: en_US.ISO8859-1 ! en_US.88591.en: en_US.ISO8859-1 ! en_US.iso88591: en_US.ISO8859-1 ! en_US.ISO_8859-1: en_US.ISO8859-1 ! en_US.UTF-8: en_US.utf ! es: es_ES.ISO8859-1 ! es_AR: es_AR.ISO8859-1 ! es_BO: es_BO.ISO8859-1 ! es_CL: es_CL.ISO8859-1 ! es_CO: es_CO.ISO8859-1 ! es_CR: es_CR.ISO8859-1 ! es_EC: es_EC.ISO8859-1 ! es_ES: es_ES.ISO8859-1 ! es_ES.88591: es_ES.ISO8859-1 ! es_ES.88591.en: es_ES.ISO8859-1 ! es_ES.iso88591: es_ES.ISO8859-1 ! es_ES.ISO_8859-1: es_ES.ISO8859-1 ! es_GT: es_GT.ISO8859-1 ! es_MX: es_MX.ISO8859-1 ! es_NI: es_NI.ISO8859-1 ! es_PA: es_PA.ISO8859-1 ! es_PE: es_PE.ISO8859-1 ! es_PY: es_PY.ISO8859-1 ! es_SV: es_SV.ISO8859-1 ! es_UY: es_UY.ISO8859-1 ! es_VE: es_VE.ISO8859-1 #if defined(SVR4) && defined(sun) ! XCOMM Sun Solaris 2.6 has erroneously specified Estonian as a Latin-1 ! XCOMM language; however this is clearly incorrect according to ISO8859. #endif ! et: et_EE.ISO8859-4 ! et_EE: et_EE.ISO8859-4 ! fi: fi_FI.ISO8859-1 ! fi_FI: fi_FI.ISO8859-1 ! fi_FI.88591: fi_FI.ISO8859-1 ! fi_FI.88591.en: fi_FI.ISO8859-1 ! fi_FI.iso88591: fi_FI.ISO8859-1 ! fi_FI.ISO_8859-1: fi_FI.ISO8859-1 ! fr: fr_FR.ISO8859-1 ! fr_BE: fr_BE.ISO8859-1 ! fr_BE.88591: fr_BE.ISO8859-1 ! fr_BE.88591.en: fr_BE.ISO8859-1 ! fr_BE.ISO_8859-1: fr_BE.ISO8859-1 ! fr_CA: fr_CA.ISO8859-1 ! fr_CA.88591: fr_CA.ISO8859-1 ! fr_CA.88591.en: fr_CA.ISO8859-1 ! fr_CA.iso88591: fr_CA.ISO8859-1 ! fr_CA.ISO_8859-1: fr_CA.ISO8859-1 ! fr_CH: fr_CH.ISO8859-1 ! fr_CH.88591: fr_CH.ISO8859-1 ! fr_CH.88591.en: fr_CH.ISO8859-1 ! fr_CH.ISO_8859-1: fr_CH.ISO8859-1 ! fr_FR: fr_FR.ISO8859-1 ! fr_FR.88591: fr_FR.ISO8859-1 ! fr_FR.88591.en: fr_FR.ISO8859-1 ! fr_FR.iso88591: fr_FR.ISO8859-1 ! fr_FR.ISO_8859-1: fr_FR.ISO8859-1 ! FRE_FR.8859: fr_FR.ISO8859-1 ! FRE_FR.8859.in: fr_FR.ISO8859-1 ! hr: hr_HR.ISO8859-2 ! hr_HR: hr_HR.ISO8859-2 ! hr_HR.iso88592: hr_HR.ISO8859-2 ! hr_HR.ISO_8859-2: hr_HR.ISO8859-2 ! hu: hu_HU.ISO8859-2 ! hu_HU: hu_HU.ISO8859-2 ! hu_HU.iso88592: hu_HU.ISO8859-2 ! is: is_IS.ISO8859-1 ! is_IS: is_IS.ISO8859-1 ! is_IS.iso88591: is_IS.ISO8859-1 ! is_IS.ISO_8859-1: is_IS.ISO8859-1 ! it: it_IT.ISO8859-1 ! it_CH: it_CH.ISO8859-1 ! it_CH.ISO_8859-1: it_CH.ISO8859-1 ! it_IT: it_IT.ISO8859-1 ! it_IT.88591: it_IT.ISO8859-1 ! it_IT.88591.en: it_IT.ISO8859-1 ! it_IT.iso88591: it_IT.ISO8859-1 ! it_IT.ISO_8859-1: it_IT.ISO8859-1 ! iw: iw_IL.ISO8859-8 ! iw_IL: iw_IL.ISO8859-8 ! iw_IL.iso88598: iw_IL.ISO8859-8 ! ja: ja_JP.eucJP ! ja.JIS: ja_JP.JIS7 ! ja.SJIS: ja_JP.SJIS #ifndef __uxp__ ! ja_JP: ja_JP.eucJP #else /* __uxp__ */ ! ja_JP: ja_JP.U90 ! ja_JP.U90: ja_JP.U90 ! ja_JP.S90: ja_JP.S90 #endif /* __uxp__ */ ! ja_JP.ujis: ja_JP.eucJP ! ja_JP.eucJP: ja_JP.eucJP ! Jp_JP: ja_JP.eucJP ! ja_JP.AJEC: ja_JP.eucJP ! ja_JP.EUC: ja_JP.eucJP ! ja_JP.ISO-2022-JP: ja_JP.JIS7 ! ja_JP.JIS: ja_JP.JIS7 ! ja_JP.jis7: ja_JP.JIS7 ! ja_JP.mscode: ja_JP.SJIS ! ja_JP.SJIS: ja_JP.SJIS ! ko: ko_KR.eucKR ! ko_KR: ko_KR.eucKR ! ko_KR.EUC: ko_KR.eucKR ! ko_KR.euc: ko_KR.eucKR #if defined(__FreeBSD__) XCOMM most locales in FreeBSD 2.1.[56] do not work, allow use of FreeBSD's XCOMM generic latin-1 locale name. N.B. "lt" is a bad code to use for a XCOMM generic Latin-1 locale anyway because it is the country code for XCOMM Lithuania, which by default uses Latin-4. ! lt_LN.ISO_8859-1: lt_LN.ISO8859-1 #endif ! lt: lt_LT.ISO8859-4 ! lv: lv_LV.ISO8859-4 ! mk: mk_MK.ISO8859-5 ! mk_MK: mk_MK.ISO8859-5 ! nl: nl_NL.ISO8859-1 ! nl_BE: nl_BE.ISO8859-1 ! nl_BE.88591: nl_BE.ISO8859-1 ! nl_BE.88591.en: nl_BE.ISO8859-1 ! nl_BE.ISO_8859-1: nl_BE.ISO8859-1 ! nl_NL: nl_NL.ISO8859-1 ! nl_NL.88591: nl_NL.ISO8859-1 ! nl_NL.88591.en: nl_NL.ISO8859-1 ! nl_NL.iso88591: nl_NL.ISO8859-1 ! nl_NL.ISO_8859-1: nl_NL.ISO8859-1 ! no: no_NO.ISO8859-1 ! no_NO: no_NO.ISO8859-1 ! no_NO.88591: no_NO.ISO8859-1 ! no_NO.88591.en: no_NO.ISO8859-1 ! no_NO.iso88591: no_NO.ISO8859-1 ! no_NO.ISO_8859-1: no_NO.ISO8859-1 ! pl: pl_PL.ISO8859-2 ! pl_PL: pl_PL.ISO8859-2 ! pl_PL.iso88592: pl_PL.ISO8859-2 ! pt: pt_PT.ISO8859-1 ! pt_BR: pt_BR.ISO8859-1 ! pt_PT: pt_PT.ISO8859-1 ! pt_PT.88591: pt_PT.ISO8859-1 ! pt_PT.88591.en: pt_PT.ISO8859-1 ! pt_PT.iso88591: pt_PT.ISO8859-1 ! pt_PT.ISO_8859-1: pt_PT.ISO8859-1 ! ro: ro_RO.ISO8859-2 ! ro_RO: ro_RO.ISO8859-2 ! ro_RO.iso88592: ro_RO.ISO8859-2 ! ru: ru_RU.ISO8859-5 ! ru_RU: ru_RU.ISO8859-5 ! ru_RU.iso88595: ru_RU.ISO8859-5 ! ru_SU: ru_RU.ISO8859-5 ! ru_SU.ISO8859-5: ru_RU.ISO8859-5 ! ru_SU.KOI8-R: ru_RU.KOI8-R ! sh: sh_YU.ISO8859-2 ! sh_HR.iso88592: sh_HR.ISO8859-2 ! sh_YU: sh_YU.ISO8859-2 ! sh_SP: sh_YU.ISO8859-2 ! sk: sk_SK.ISO8859-2 ! sk_SK: sk_SK.ISO8859-2 ! sk_sK.iso88592: sk_SK.ISO8859-2 ! sl: sl_CS.ISO8859-2 ! sl_CS: sl_CS.ISO8859-2 ! sl_SI: sl_SI.ISO8859-2 ! sl_SI.iso88592: sl_SI.ISO8859-2 ! sp: sp_YU.ISO8859-5 ! sp_YU: sp_YU.ISO8859-5 ! sr_SP: sr_SP.ISO8859-2 ! sv: sv_SE.ISO8859-1 ! sv_SE: sv_SE.ISO8859-1 ! sv_SE.88591: sv_SE.ISO8859-1 ! sv_SE.88591.en: sv_SE.ISO8859-1 ! sv_SE.iso88591: sv_SE.ISO8859-1 ! sv_SE.ISO_8859-1: sv_SE.ISO8859-1 ! th_TH: th_TH.TACTIS ! th_TH.tis620: th_TH.TACTIS ! tr: tr_TR.ISO8859-9 ! tr_TR: tr_TR.ISO8859-9 ! tr_TR.iso88599: tr_TR.ISO8859-9 ! zh: zh_CN.eucCN ! zh_CN: zh_CN.eucCN ! zh_CN.EUC: zh_CN.eucCN ! zh_TW: zh_TW.eucTW ! zh_TW.EUC: zh_TW.eucTW ! zh_CN.big5: zh_TW.eucTW XCOMM The following locale names are used in SCO 3.0 ! english_uk.8859: en_GB.ISO8859-1 ! english_us.8859: en_US.ISO8859-1 ! english_us.ascii: en_US.ISO8859-1 ! french_france.8859: fr_FR.ISO8859-1 ! german_germany.8859: de_DE.ISO8859-1 ! portuguese_brazil.8859: pt_BR.ISO8859-1 ! spanish_spain.8859: es_ES.ISO8859-1 XCOMM The following locale names are used in HPUX 9.x ! american.iso88591: en_US.ISO8859-1 ! arabic.iso88596: ar_AA.ISO8859-6 ! bulgarian: bg_BG.ISO8859-5 ! c-french.iso88591: fr_CA.ISO8859-1 ! chinese-s: zh_CN.eucCN ! chinese-t: zh_TW.eucTW ! croatian: hr_HR.ISO8859-2 ! czech: cs_CS.ISO8859-2 ! danish.iso88591: da_DK.ISO8859-1 ! dutch.iso88591: nl_BE.ISO8859-1 ! english.iso88591: en_EN.ISO8859-1 ! finnish.iso88591: fi_FI.ISO8859-1 ! french.iso88591: fr_CH.ISO8859-1 ! german.iso88591: de_CH.ISO8859-1 ! greek.iso88597: el_GR.ISO8859-7 ! hebrew.iso88598: iw_IL.ISO8859-8 ! hungarian: hu_HU.ISO8859-2 ! icelandic.iso88591: is_IS.ISO8859-1 ! italian.iso88591: it_IT.ISO8859-1 #if ! (defined(SVR4) && defined(sun)) ! japanese: ja_JP.SJIS #else ! japanese: ja_JP.eucJP #endif ! japanese.euc: ja_JP.eucJP ! korean: ko_KR.eucKR ! norwegian.iso88591: no_NO.ISO8859-1 ! polish: pl_PL.ISO8859-2 ! portuguese.iso88591: pt_PT.ISO8859-1 ! rumanian: ro_RO.ISO8859-2 ! russian: ru_SU.ISO8859-5 ! serbocroatian: sh_YU.ISO8859-2 ! slovak: sk_SK.ISO8859-2 ! slovene: sl_CS.ISO8859-2 ! spanish.iso88591: es_ES.ISO8859-1 ! swedish.iso88591: sv_SE.ISO8859-1 ! turkish.iso88599: tr_TR.ISO8859-9 ! univ.utf8: en_US.utf ! XCOMM Digital Unix utf ! universal.utf8@ucs4: en_US.utf ! XCOMM Solaris 2.6 ! en_US.UTF-8: en_US.utf XCOMM Solaris and SunOS have iso_8859_1 LC_CTYPES to augment LANG=C ! iso_8859_1: en_US.ISO8859-1 ! #ifdef WIN32 ! XCOMM Microsoft Windows/NT 4.0 SP3 ! XCOMM parser doesn't grok embedded spaces in locale name ! Afrikaans_South Africa.1252: af_ZA.iso8859-1 ! Arabic_Bahrain.1256: ar_BH.iso8859-6 ! Arabic_Algeria.1256: ar_DZ.iso8859-6 ! Arabic_Egypt.1256: ar_EG.iso8859-6 ! Arabic_Iraq.1256: ar_IQ.iso8859-6 ! Arabic_Jordan.1256: ar_JO.iso8859-6 ! Arabic_Kuwait.1256: ar_KW.iso8859-6 ! Arabic_Lebanon.1256: ar_LB.iso8859-6 ! Arabic_Libya.1256: ar_LY.iso8859-6 ! Arabic_Morocco.1256: ar_MA.iso8859-6 ! Arabic_Oman.1256: ar_OM.iso8859-6 ! Arabic_Qatar.1256: ar_QA.iso8859-6 ! Arabic_Saudi Arabia.1256: ar_SA.iso8859-6 ! Arabic_Tunisia.1256: ar_TN.iso8859-6 ! Arabic_Yemen.1256: ar_YE.iso8859-6 ! Belarusian_Belarus.1251: be_BY.iso8859-5 ! Bulgarian_Bulgaria.1251: bg_BG.iso8859-5 ! Catalan_Spain.1252: ca_ES.iso8859-1 ! Czech_Czech Republic.1250: cs_CZ.iso8859-2 ! Danish_Denmark.1252: da_DK.iso8859-1 ! German_Austria.1252: de_AT.iso8859-1 ! German_Switzerland.1252: de_CH.iso8859-1 ! German_Germany.1252: de_DE.iso8859-1 ! German_Liechtenstein.1252: de_LI.iso8859-1 ! German_Luxembourg.1252: de_LU.iso8859-1 ! Greek_Greece.1253: el_GR.iso8859-7 ! English_Australia.1252: en_AU.iso8859-1 ! English_Belize.1252: en_BZ.iso8859-1 ! English_Canada.1252: en_CA.iso8859-1 ! English_Ireland.1252: en_IE.iso8859-1 ! English_Jamaica.1252: en_JM.iso8859-1 ! English_New Zealand.1252: en_NZ.iso8859-1 ! English_Trinidad y Tobago.1252: en_TT.iso8859-1 ! English_United Kingdom.1252: en_UK.iso8859-1 ! English_United States.1252: en_US.iso8859-1 ! English_South Africa.1252: en_ZA.iso8859-1 ! Spanish_Argentina.1252: es_AR.iso8859-1 ! Spanish_Bolivia.1252: es_BO.iso8859-1 ! Spanish_Chile.1252: es_CL.iso8859-1 ! Spanish_Colombia.1252: es_CO.iso8859-1 ! Spanish_Costa Rica.1252: es_CR.iso8859-1 ! Spanish_Dominican Republic.1252: es_DO.iso8859-1 ! Spanish_Ecuador.1252: es_EC.iso8859-1 ! Spanish - Modern Sort_Spain.1252: es_ES.iso8859-1 ! Spanish - Traditional Sort_Spain.1252: es_ES.iso8859-1 ! Spanish_Guatemala.1252: es_GT.iso8859-1 ! Spanish_Honduras.1252: es_HN.iso8859-1 ! Spanish_Mexican.1252: es_MX.iso8859-1 ! Spanish_Nicaragua.1252: es_NI.iso8859-1 ! Spanish_Panama.1252: es_PA.iso8859-1 ! Spanish_Paraguay.1252: es_PY.iso8859-1 ! Spanish_Peru.1252: es_PE.iso8859-1 ! Spanish_Puerto Rico.1252: es_PR.iso8859-1 ! Spanish_El Salvador.1252: es_SV.iso8859-1 ! Spanish_Uruguay.1252: es_UY.iso8859-1 ! Spanish_Venezuela.1252: es_VE.iso8859-1 ! Estonian_Estonia.1257 et_EE.iso8859-4 ! Basque_Spain.1252: eu_ES.iso8859-1 ! Finnish_Finland.1252: fi_FI.iso8859-1 ! French_Belgium.1252: fr_BE.iso8859-1 ! French_Canada.1252: fr_CA.iso8859-1 ! French_Switzerland.1252: fr_CH.iso8859-1 ! French_France.1252: fr_FR.iso8859-1 ! French_Luxembourg.1252: fr_LU.iso8859-1 ! Faeroese_Faeroe Islands.1252: fo_FO.iso8859-1 ! Hebrew_Israel.1255: he_IL.iso8859-8 ! Croatian_Croatia.1250: hr_HR.iso8859-2 ! Hungarian_Hungary.1250: hu_HU.iso8859-2 ! Indonesian_Indonesia.1252: id_ID.iso8859-1 ! Icelandic_Iceland.1252: is_IS.iso8859-1 ! Italian_Switzerland.1252: it_CH.iso8859-1 ! Italian_Italy.1252: it_IT.iso8859-1 ! Japanese_Japan.932: ja_JP.SJIS ! Korean_Korea.949: ko_KR.EUC ! Lithuanian_Lithuania.1257 lt_LT.iso8859-4 ! Latvian_Latvia.1257: lv_LV.iso8859-4 ! Dutch_Belgium.1252: nl_BE.iso8859-1 ! Dutch_Netherlands.1252: nl_NL.iso8859-1 ! Norwegian (Nynorsk)_Norway.1252: no_NO.iso8859-1 ! Norwegian (Bokmål)_Norway.1252: no_NO.iso8859-1 ! Polish_Poland.1250: pl_PL.iso8859-2 ! Portuguese_Brazil.1252: pt_BR.iso8859-1 ! Portuguese_Portugal.1252: pt_PT.iso8859-1 ! Romanian_Romania.1250: ro_RO.iso8859-2 ! Russian_Russia.1251: ru_RU.iso8859-5 ! Slovak_Slovakia.1250: sk_SK.iso8859-2 ! Slovene_Slovenia.1250: sl_SI.iso8859-2 ! Albanian_Albania.1250: sq_AL.iso8859-2 ! Serbian (Latin)_Serbia.1250: sr_YU.iso8859-2 ! Swedish_Finland.1252: sv_FI.iso8859-1 ! Swedish_Sweden.1252: sv_SE.iso8859-1 ! Turkish_Turkey.1254: tr_TR.iso8859-9 ! Ukrainian_Ukraine.1251: uk_UA.iso8859-5 ! Chinese(PRC)_People's Republic of China.936: zh_CN.EUC ! Chinese(PRC)_Hong Kong.950: zh_HK.EUC ! Chinese(Singapore)_Signapore.936: zh_SG.EUC ! Chinese(Taiwan)_Taiwan.950: zh_TW.EUC ! #endif XCOMM Other miscellaneous locale names ! ISO8859-1: en_US.ISO8859-1 ! ISO-8859-1: en_US.ISO8859-1 #ifndef __uxp__ ! japan: ja_JP.eucJP #else ! japan: ja_JP.U90 #endif ! Japanese-EUC: ja_JP.eucJP *** ./nls/locale.dir@@/PUBLIC-LATEST Mon Sep 29 11:33:09 1997 --- xc/nls/locale.dir Tue May 26 10:32:08 1998 *************** *** 1,63 **** ! XCOMM $TOG: locale.dir /main/8 1997/09/29 11:34:11 kaleb $ XCOMM ! XCOMM This file contains locale database file name ! XCOMM The first word is the locale database file name and ! XCOMM the second word is full locale name. XCOMM ! C/XLC_LOCALE C ! iso8859-6/XLC_LOCALE ar_AA.ISO8859-6 ! iso8859-5/XLC_LOCALE bg_BG.ISO8859-5 ! iso8859-2/XLC_LOCALE cs_CZ.ISO8859-2 ! iso8859-2/XLC_LOCALE cz_CZ.ISO8859-2 ! iso8859-1/XLC_LOCALE da_DK.ISO8859-1 ! iso8859-1/XLC_LOCALE de_AT.ISO8859-1 ! iso8859-1/XLC_LOCALE de_CH.ISO8859-1 ! iso8859-1/XLC_LOCALE de_DE.ISO8859-1 ! iso8859-7/XLC_LOCALE el_GR.ISO8859-7 ! iso8859-1/XLC_LOCALE en_AU.ISO8859-1 ! iso8859-1/XLC_LOCALE en_CA.ISO8859-1 ! iso8859-1/XLC_LOCALE en_GB.ISO8859-1 ! iso8859-1/XLC_LOCALE en_US.ISO8859-1 ! iso8859-1/XLC_LOCALE es_ES.ISO8859-1 ! iso8859-1/XLC_LOCALE fi_FI.ISO8859-1 ! iso8859-1/XLC_LOCALE fr_BE.ISO8859-1 ! iso8859-1/XLC_LOCALE fr_CA.ISO8859-1 ! iso8859-1/XLC_LOCALE fr_CH.ISO8859-1 ! iso8859-1/XLC_LOCALE fr_FR.ISO8859-1 ! iso8859-2/XLC_LOCALE hu_HU.ISO8859-2 ! iso8859-2/XLC_LOCALE hr_HR.ISO8859-2 ! iso8859-1/XLC_LOCALE is_IS.ISO8859-1 ! iso8859-1/XLC_LOCALE it_CH.ISO8859-1 ! iso8859-1/XLC_LOCALE it_IT.ISO8859-1 ! iso8859-8/XLC_LOCALE iw_IL.ISO8859-8 ! ja/XLC_LOCALE ja_JP.eucJP ! ja.SJIS/XLC_LOCALE ja_JP.SJIS ! ja.JIS/XLC_LOCALE ja_JP.JIS7 ! ko/XLC_LOCALE ko_KR.eucKR ! iso8859-1/XLC_LOCALE lt_LN.ISO8859-1 ! iso8859-5/XLC_LOCALE mk_MK.ISO8859-5 ! iso8859-1/XLC_LOCALE nl_BE.ISO8859-1 ! iso8859-1/XLC_LOCALE nl_NL.ISO8859-1 ! iso8859-1/XLC_LOCALE no_NO.ISO8859-1 ! iso8859-2/XLC_LOCALE pl_PL.ISO8859-2 ! iso8859-1/XLC_LOCALE pt_PT.ISO8859-1 ! iso8859-2/XLC_LOCALE ro_RO.ISO8859-2 ! iso8859-5/XLC_LOCALE ru_RU.ISO8859-5 ! koi8-r/XLC_LOCALE ru_RU.KOI8-R ! iso8859-2/XLC_LOCALE sh_YU.ISO8859-2 ! iso8859-2/XLC_LOCALE sk_SK.ISO8859-2 ! iso8859-2/XLC_LOCALE sl_CS.ISO8859-2 ! iso8859-2/XLC_LOCALE sl_SI.ISO8859-2 ! iso8859-5/XLC_LOCALE sp_YU.ISO8859-5 ! iso8859-2/XLC_LOCALE sr_SP.ISO8859-2 ! iso8859-1/XLC_LOCALE sv_SE.ISO8859-1 ! iso8859-1/XLC_LOCALE sv_SE.ISO8859-1 ! th_TH/XLC_LOCALE th_TH.TACTIS ! iso8859-9/XLC_LOCALE tr_TR.ISO8859-9 ! zh/XLC_LOCALE zh_CN.eucCN ! zh_TW/XLC_LOCALE zh_TW.eucTW ! en_US.utf/XLC_LOCALE en_US.utf #ifdef __uxp__ ! ja.U90/XLC_LOCALE ja_JP.U90 ! ja.S90/XLC_LOCALE ja_JP.S90 #endif --- 1,118 ---- ! XCOMM $TOG: locale.dir /main/13 1998/05/26 10:38:09 kaleb $ XCOMM ! XCOMM This file contains locALE: database file name ! XCOMM The first word is the locALE: database file name and ! XCOMM the second word is full locALE: name. XCOMM ! C/XLC_LOCALE: C ! iso8859-1/XLC_LOCALE: af_ZA.ISO8859-1 ! iso8859-6/XLC_LOCALE: ar_AA.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_BH.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_DZ.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_EG.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_IQ.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_JO.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_KW.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_LB.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_LY.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_MA.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_OM.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_QA.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_SA.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_TN.ISO8859-6 ! iso8859-6/XLC_LOCALE: ar_YE.ISO8859-6 ! iso8859-5/XLC_LOCALE: bg_BG.ISO8859-5 ! iso8859-1/XLC_LOCALE: ca_ES.ISO8859-1 ! iso8859-2/XLC_LOCALE: cs_CZ.ISO8859-2 ! iso8859-2/XLC_LOCALE: cz_CZ.ISO8859-2 ! iso8859-1/XLC_LOCALE: da_DK.ISO8859-1 ! iso8859-1/XLC_LOCALE: de_AT.ISO8859-1 ! iso8859-1/XLC_LOCALE: de_CH.ISO8859-1 ! iso8859-1/XLC_LOCALE: de_DE.ISO8859-1 ! iso8859-1/XLC_LOCALE: de_LI.ISO8859-1 ! iso8859-1/XLC_LOCALE: de_LU.ISO8859-1 ! iso8859-7/XLC_LOCALE: el_GR.ISO8859-7 ! iso8859-1/XLC_LOCALE: en_AU.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_BZ.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_CA.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_GB.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_IE.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_JM.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_NZ.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_TT.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_UK.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_US.ISO8859-1 ! iso8859-1/XLC_LOCALE: en_ZA.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_AR.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_BO.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_CL.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_CO.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_CR.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_DO.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_EC.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_ES.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_GT.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_HN.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_MX.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_NI.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_PA.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_PE.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_PR.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_PY.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_SV.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_UY.ISO8859-1 ! iso8859-1/XLC_LOCALE: es_VE.ISO8859-1 ! iso8859-4/XLC_LOCALE: et_EE.ISO8859-4 ! iso8859-1/XLC_LOCALE: eu_ES.ISO8859-1 ! iso8859-1/XLC_LOCALE: fi_FI.ISO8859-1 ! iso8859-1/XLC_LOCALE: fo_FO.ISO8859-1 ! iso8859-1/XLC_LOCALE: fr_BE.ISO8859-1 ! iso8859-1/XLC_LOCALE: fr_CA.ISO8859-1 ! iso8859-1/XLC_LOCALE: fr_CH.ISO8859-1 ! iso8859-1/XLC_LOCALE: fr_FR.ISO8859-1 ! iso8859-1/XLC_LOCALE: fr_LU.ISO8859-1 ! iso8859-8/XLC_LOCALE: he_IL.ISO8859-8 ! iso8859-2/XLC_LOCALE: hr_HR.ISO8859-2 ! iso8859-2/XLC_LOCALE: hu_HU.ISO8859-2 ! iso8859-1/XLC_LOCALE: id_ID.ISO8859-1 ! iso8859-1/XLC_LOCALE: is_IS.ISO8859-1 ! iso8859-1/XLC_LOCALE: it_CH.ISO8859-1 ! iso8859-1/XLC_LOCALE: it_IT.ISO8859-1 ! iso8859-8/XLC_LOCALE: iw_IL.ISO8859-8 ! ja/XLC_LOCALE: ja_JP.eucJP ! ja.SJIS/XLC_LOCALE: ja_JP.SJIS ! ja.JIS/XLC_LOCALE: ja_JP.JIS7 ! ko/XLC_LOCALE: ko_KR.eucKR ! iso8859-1/XLC_LOCALE: lt_LN.ISO8859-1 ! iso8859-1/XLC_LOCALE: lt_LT.ISO8859-4 ! iso8859-1/XLC_LOCALE: lv_LV.ISO8859-4 ! iso8859-5/XLC_LOCALE: mk_MK.ISO8859-5 ! iso8859-1/XLC_LOCALE: nl_BE.ISO8859-1 ! iso8859-1/XLC_LOCALE: nl_NL.ISO8859-1 ! iso8859-1/XLC_LOCALE: no_NO.ISO8859-1 ! iso8859-2/XLC_LOCALE: pl_PL.ISO8859-2 ! iso8859-1/XLC_LOCALE: pt_BR.ISO8859-1 ! iso8859-1/XLC_LOCALE: pt_PT.ISO8859-1 ! iso8859-2/XLC_LOCALE: ro_RO.ISO8859-2 ! iso8859-5/XLC_LOCALE: ru_RU.ISO8859-5 ! koi8-r/XLC_LOCALE: ru_RU.KOI8-R ! iso8859-2/XLC_LOCALE: sh_YU.ISO8859-2 ! iso8859-2/XLC_LOCALE: sk_SK.ISO8859-2 ! iso8859-2/XLC_LOCALE: sl_CS.ISO8859-2 ! iso8859-2/XLC_LOCALE: sl_SI.ISO8859-2 ! iso8859-5/XLC_LOCALE: sp_YU.ISO8859-5 ! iso8859-2/XLC_LOCALE: sq_AL.ISO8859-2 ! iso8859-2/XLC_LOCALE: sr_SP.ISO8859-2 ! iso8859-2/XLC_LOCALE: sr_YU.ISO8859-2 ! iso8859-1/XLC_LOCALE: sv_FI.ISO8859-1 ! iso8859-1/XLC_LOCALE: sv_SE.ISO8859-1 ! th_TH/XLC_LOCALE: th_TH.TACTIS ! iso8859-9/XLC_LOCALE: tr_TR.ISO8859-9 ! iso8859-5/XLC_LOCALE: uk_UA.ISO8859-5 ! zh/XLC_LOCALE: zh_CN.eucCN ! zh_TW/XLC_LOCALE: zh_TW.eucTW ! en_US.utf/XLC_LOCALE: en_US.utf #ifdef __uxp__ ! ja.U90/XLC_LOCALE: ja_JP.U90 ! ja.S90/XLC_LOCALE: ja_JP.S90 #endif *** ./programs/Imakefile@@/PUBLIC-LATEST Tue Oct 14 16:16:35 1997 --- xc/programs/Imakefile Thu Feb 26 17:14:21 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imakefile /main/84 1997/10/14 16:18:23 kaleb $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/85 1998/02/26 17:14:44 kaleb $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" *************** *** 31,37 **** --- 31,39 ---- XFINDPROXYSRCDIR = xfindproxy XFWPSRCDIR = xfwp XHOSTSRCDIR = xhost + #if BuildPlugin XRXSRCDIR = xrx + #endif XSMSRCDIR = xsm XTERMSRCDIR = xterm SCRIPTSDIR = scripts *** ./programs/Xserver/Xext/mbuf.c@@/PUBLIC-LATEST Mon Feb 9 15:24:12 1998 --- xc/programs/Xserver/Xext/mbuf.c Thu Feb 26 12:04:53 1998 *************** *** 20,26 **** ********************************************************/ ! /* $TOG: mbuf.c /main/26 1998/02/09 15:24:27 kaleb $ */ #define NEED_REPLIES #define NEED_EVENTS #include --- 20,26 ---- ********************************************************/ ! /* $TOG: mbuf.c /main/27 1998/02/26 12:04:55 barstow $ */ #define NEED_REPLIES #define NEED_EVENTS #include *************** *** 44,49 **** --- 44,53 ---- #include #endif + #ifdef PANORAMIX + #include "panoramiX.h" + #endif + /* given an OtherClientPtr obj, get the ClientPtr */ #define rClient(obj) (clients[CLIENT_ID((obj)->resource)]) *************** *** 52,60 **** --- 56,73 ---- #define ValidEventMasks (ExposureMask|MultibufferClobberNotifyMask|MultibufferUpdateNotifyMask) + #ifdef PANORAMIX + extern int PanoramiXNumScreens; + extern Bool noPanoramiXExtension; + extern PanoramiXWindow *PanoramiXWinRoot; + extern PanoramiXPmap *PanoramiXPmapRoot; + extern PanoramiXData *panoramiXdataPtr; + #endif + /* The _Multibuffer and _Multibuffers structures below refer to each other, * so we need this forward declaration */ + typedef struct _Multibuffers *MultibuffersPtr; /* *************** *** 132,137 **** --- 145,151 ---- static void RecalculateMultibufferOtherEvents (); static int EventSelectForMultibuffer(); + /* * The Pixmap associated with a buffer can be found as a resource * with this type *************** *** 412,418 **** --- 426,505 ---- return Success; } + #ifdef PANORAMIX static int + ProcPanoramiXCreateImageBuffers (client) + register ClientPtr client; + { + REQUEST(xMbufCreateImageBuffersReq); + + register int result; + int i, j, k, len; + PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + PanoramiXWindow *next; + PanoramiXWindow *pPanoramiXids; + PanoramiXWindow *pPanoramiXPrev_ids; + PanoramiXPmap *local; + PanoramiXPmap *pPanoramiXPmap = PanoramiXPmapRoot; + CARD32 *value, *orig_ids; + XID *ids; + XID ID; + DrawablePtr pDrawable; + + REQUEST_AT_LEAST_SIZE (xMbufCreateImageBuffersReq); + PANORAMIXFIND_ID(pPanoramiXWin,stuff->window); + IF_RETURN(!pPanoramiXWin, BadRequest); + len = stuff->length - (sizeof(xMbufCreateImageBuffersReq) >> 2); + ids = (XID *)ALLOCATE_LOCAL(sizeof(XID)*len); + orig_ids = (XID *)ALLOCATE_LOCAL(sizeof(XID)*len); + if (!ids) + return BadAlloc; + memcpy((char *)orig_ids, (char *) &stuff[1], len * sizeof(XID)); + value = (CARD32 *)&stuff[1]; + /* New resources are pixmaps */ + FOR_NSCREENS_OR_ONCE(pPanoramiXWin , j) { + stuff->window = pPanoramiXWin->info[j].id; + for (i = 0; i < len; i++) { + ids[i] = (XID)orig_ids[i]; + /* These will be MultibufferDrawableResType & MultibufferResType */ + pPanoramiXPmap = PanoramiXPmapRoot; + PANORAMIXFIND_ID(pPanoramiXPmap, ids[i]); + if (!pPanoramiXPmap) { + local = (PanoramiXWindow *)Xcalloc(sizeof(PanoramiXWindow)); + for (k = 0; k <= PanoramiXNumScreens - 1; k++) { + ID = k ? FakeClientID(client->index) : ids[i]; + local->info[k].id = ID; + } + local->FreeMe = FALSE; + PANORAMIXFIND_LAST(pPanoramiXPmap, PanoramiXPmapRoot); + pPanoramiXPmap->next = local; + value[i] = local->info[j].id; + }else + value[i] = pPanoramiXPmap->info[j].id; + } + if (!j) + noPanoramiXExtension = TRUE; + result = ProcCreateImageBuffers (client); + noPanoramiXExtension = FALSE; + BREAK_IF(result != Success); + } + if (result != Success) { + if (ids) + Xfree(ids); + if (orig_ids) + Xfree(orig_ids); + if (local) + Xfree(local); + } + return (result); + } + #endif + + #ifdef PANORAMIX + int + #else + static int + #endif ProcCreateImageBuffers (client) register ClientPtr client; { *************** *** 474,480 **** swapl(&rep.length, n); swaps(&rep.numberBuffer, n); } ! WriteToClient(client, sizeof (xMbufCreateImageBuffersReply), (char *)&rep); return (client->noClientException); } --- 561,570 ---- swapl(&rep.length, n); swaps(&rep.numberBuffer, n); } ! #ifdef PANORAMIX ! if (noPanoramiXExtension) ! #endif ! WriteToClient(client, sizeof (xMbufCreateImageBuffersReply), (char*)&rep); return (client->noClientException); } *************** *** 491,496 **** --- 581,597 ---- CARD32 minDelay; TimeStamp activateTime, bufferTime; + #ifdef PANORAMIX + WindowPtr pWndw; + PanoramiXPmap *pPanoramiXPmap = PanoramiXPmapRoot; + MultibufferPtr *pScrn0Multibuffer; + MultibuffersPtr *ppScrn0Multibuffers; + int k; + int panoramiX_buf = 0; + Bool FoundScreen; + + #endif + REQUEST_AT_LEAST_SIZE (xMbufDisplayImageBuffersReq); nbuf = stuff->length - (sizeof (xMbufDisplayImageBuffersReq) >> 2); if (!nbuf) *************** *** 497,502 **** --- 598,620 ---- return Success; minDelay = stuff->minDelay; ids = (XID *) &stuff[1]; + #ifdef PANORAMIX + if (!noPanoramiXExtension) + { + int maxbuf = 0; + maxbuf = nbuf * PanoramiXNumScreens; + ppScrn0Multibuffers = (MultibuffersPtr *) xalloc(maxbuf * sizeof (MultibuffersPtr)); + pScrn0Multibuffer = (MultibufferPtr *) xalloc (maxbuf * sizeof(MultibufferPtr)); + if (!ppScrn0Multibuffers || !pScrn0Multibuffer) + { + if ( sizeof (long) != sizeof(CARD32) ) DEALLOCATE_LOCAL(ids); + xfree (ppScrn0Multibuffers); + xfree (pScrn0Multibuffer); + client->errorValue = 0; + return BadAlloc; + } + } + #endif ppMultibuffers = (MultibuffersPtr *) ALLOCATE_LOCAL(nbuf * sizeof (MultibuffersPtr)); pMultibuffer = (MultibufferPtr *) ALLOCATE_LOCAL(nbuf * sizeof (MultibufferPtr)); if (!ppMultibuffers || !pMultibuffer) *************** *** 510,516 **** activateTime.milliseconds = 0; for (i = 0; i < nbuf; i++) { ! pMultibuffer[i] = (MultibufferPtr) LookupIDByType (ids[i], MultibufferResType); if (!pMultibuffer[i]) { DEALLOCATE_LOCAL(ppMultibuffers); --- 628,710 ---- activateTime.milliseconds = 0; for (i = 0; i < nbuf; i++) { ! #ifdef PANORAMIX ! if (!noPanoramiXExtension) { ! pPanoramiXPmap = PanoramiXPmapRoot; ! PANORAMIXFIND_ID(pPanoramiXPmap, ids[i]); ! if (!pPanoramiXPmap){ ! if ( sizeof (long) != sizeof(CARD32) ) DEALLOCATE_LOCAL(ids); ! xfree (ppMultibuffers); ! xfree (pMultibuffer); ! client->errorValue = ids[i]; ! return MultibufferErrorBase + MultibufferBadBuffer; ! } ! FoundScreen = FALSE; ! pScrn0Multibuffer[panoramiX_buf] = (MultibufferPtr) ! LookupIDByType (ids[i], MultibufferResType); ! ppScrn0Multibuffers[i] = pScrn0Multibuffer[i]->pMultibuffers; ! pWndw = ppScrn0Multibuffers[i]->pWindow; ! for (k = 0; (k < PanoramiXNumScreens && !FoundScreen); k++) { ! pMultibuffer[panoramiX_buf] = (MultibufferPtr) ! LookupIDByType (pPanoramiXPmap->info[k].id, MultibufferResType); ! if (!pMultibuffer[i]) ! { ! if ( sizeof (long) != sizeof(CARD32) ) DEALLOCATE_LOCAL(ids); ! xfree (ppMultibuffers); ! xfree (pMultibuffer); ! client->errorValue = ids[i]; ! return MultibufferErrorBase + MultibufferBadBuffer; ! } ! ppMultibuffers[panoramiX_buf] = pMultibuffer[panoramiX_buf]->pMultibuffers; ! /* Figure out where the buffer resides, which screens */ ! if ( ((pWndw->drawable.x < 0) && ! (pWndw->drawable.x + pWndw->drawable.width < 0)) ! || ( (pWndw->drawable.x > ! panoramiXdataPtr[k].x + panoramiXdataPtr[k].width) && ! (pWndw->drawable.x + pWndw->drawable.width > ! panoramiXdataPtr[k].x + panoramiXdataPtr[k].width))) ! /* its not on screen - k -, try next screen */ ! continue; ! if ( ((pWndw->drawable.y < 0) && ! (pWndw->drawable.y + pWndw->drawable.height < 0)) ! || ( (pWndw->drawable.y > ! panoramiXdataPtr[k].y + panoramiXdataPtr[k].height) && ! (pWndw->drawable.y + pWndw->drawable.height > ! panoramiXdataPtr[k].y + panoramiXdataPtr[k].height))) ! /* its not on screen - k -, try next screen */ ! continue; ! ! /* The window resides on screen k, which means we need to ! keep the buffer information for this screen */ ! panoramiX_buf++; ! ! /* Is it only on this screen, or does it enter onto another ! screen */ ! if ( ((pWndw->drawable.x + pWndw->drawable.width) <= ! (panoramiXdataPtr[k].x + panoramiXdataPtr[k].width)) && ! ((pWndw->drawable.y + pWndw->drawable.height) <= ! (panoramiXdataPtr[k].y + ! panoramiXdataPtr[k].height )) ) ! FoundScreen = TRUE; ! } /* for each screen k */ ! for (j = 0; j < i; j++) ! { ! if (ppScrn0Multibuffers[i] == ppScrn0Multibuffers[j]) ! { ! if ( sizeof (long) != sizeof(CARD32) ) DEALLOCATE_LOCAL(ids); ! DEALLOCATE_LOCAL(ppScrn0Multibuffers); ! DEALLOCATE_LOCAL(pScrn0Multibuffer); ! DEALLOCATE_LOCAL(ppMultibuffers); ! DEALLOCATE_LOCAL(pMultibuffer); ! client->errorValue = ids[i]; ! return BadMatch; ! } ! } ! bufferTime = ppScrn0Multibuffers[i]->lastUpdate; ! }else { ! #endif ! pMultibuffer[i] = (MultibufferPtr) LookupIDByType (ids[i], ! MultibufferResType); if (!pMultibuffer[i]) { DEALLOCATE_LOCAL(ppMultibuffers); *************** *** 530,535 **** --- 724,732 ---- } } bufferTime = ppMultibuffers[i]->lastUpdate; + #ifdef PANORAMIX + } + #endif BumpTimeStamp (&bufferTime, minDelay); if (CompareTimeStamps (bufferTime, activateTime) == LATER) activateTime = bufferTime; *************** *** 541,553 **** --- 738,791 ---- ; } else + #ifdef PANORAMIX + if (!noPanoramiXExtension){ + PerformDisplayRequest (ppMultibuffers, pMultibuffer, panoramiX_buf); + }else + #endif PerformDisplayRequest (ppMultibuffers, pMultibuffer, nbuf); + + #ifdef PANORAMIX + if (!noPanoramiXExtension){ + DEALLOCATE_LOCAL(ppScrn0Multibuffers); + DEALLOCATE_LOCAL(pScrn0Multibuffer); + } + #endif + DEALLOCATE_LOCAL(ppMultibuffers); DEALLOCATE_LOCAL(pMultibuffer); return Success; } + #ifdef PANORAMIX static int + ProcPanoramiXDestroyImageBuffers (client) + ClientPtr client; + { + REQUEST (xMbufDestroyImageBuffersReq); + WindowPtr pWin; + + register int result; + int j; + PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + + REQUEST_SIZE_MATCH (xMbufDestroyImageBuffersReq); + PANORAMIXFIND_ID(pPanoramiXWin,stuff->window); + IF_RETURN(!pPanoramiXWin, BadRequest); + FOR_NSCREENS_OR_ONCE(pPanoramiXWin , j) { + stuff->window = pPanoramiXWin->info[j].id; + result = ProcDestroyImageBuffers (client); + BREAK_IF(result != Success); + } + return (result); + } + #endif + + #ifdef PANORAMIX + int + #else + static int + #endif ProcDestroyImageBuffers (client) register ClientPtr client; { *************** *** 561,567 **** --- 799,832 ---- return Success; } + #ifdef PANORAMIX static int + ProcPanoramiXSetMBufferAttributes (client) + ClientPtr client; + { + REQUEST (xMbufSetMBufferAttributesReq); + WindowPtr pWin; + + register int result; + int j; + PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + + REQUEST_SIZE_MATCH (xMbufSetMBufferAttributesReq); + PANORAMIXFIND_ID(pPanoramiXWin,stuff->window); + IF_RETURN(!pPanoramiXWin, BadRequest); + FOR_NSCREENS_OR_ONCE(pPanoramiXWin , j) { + stuff->window = pPanoramiXWin->info[j].id; + result = ProcSetMBufferAttributes (client); + BREAK_IF(result != Success); + } + return (result); + } + #endif + #ifdef PANORAMIX + int + #else + static int + #endif ProcSetMBufferAttributes (client) register ClientPtr client; { *************** *** 881,893 **** --- 1146,1179 ---- case X_MbufGetBufferVersion: return ProcGetBufferVersion (client); case X_MbufCreateImageBuffers: + #ifdef PANORAMIX + if ( !noPanoramiXExtension ) + return ProcPanoramiXCreateImageBuffers (client); + else + return ProcCreateImageBuffers (client); + #else return ProcCreateImageBuffers (client); + #endif case X_MbufDisplayImageBuffers: return ProcDisplayImageBuffers (client); case X_MbufDestroyImageBuffers: + #ifdef PANORAMIX + if ( !noPanoramiXExtension ) + return ProcPanoramiXDestroyImageBuffers (client); + else + return ProcDestroyImageBuffers (client); + #else return ProcDestroyImageBuffers (client); + #endif case X_MbufSetMBufferAttributes: + #ifdef PANORAMIX + if ( !noPanoramiXExtension ) + return ProcPanoramiXSetMBufferAttributes (client); + else + return ProcSetMBufferAttributes (client); + #else return ProcSetMBufferAttributes (client); + #endif case X_MbufGetMBufferAttributes: return ProcGetMBufferAttributes (client); case X_MbufSetBufferAttributes: *** ./programs/Xserver/Xext/panoramiX.c@@/PUBLIC-LATEST Mon Nov 3 13:53:02 1997 --- xc/programs/Xserver/Xext/panoramiX.c Fri Feb 27 12:22:49 1998 *************** *** 1,4 **** ! /* $TOG: panoramiX.c /main/2 1997/11/03 13:55:53 kaleb $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * --- 1,4 ---- ! /* $TOG: panoramiX.c /main/5 1998/02/27 12:22:22 barstow $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * *************** *** 503,513 **** { if (pVisual->vid == pDepth->vids[d]) { ! PanoramiXColorDepthTable[i].panoramiXScreenMap[pVisual->class].vmap[pDepth->depth].vid[d] = pDepth->vids[d]; ! PanoramiXColorDepthTable[i].panoramiXScreenMap[pVisual->class].vmap[pDepth->depth].numVids++; ! } ! } ! } } PanoramiXColorDepthTable[i].numVisuals = 6; } /* for each screen */ --- 503,519 ---- { if (pVisual->vid == pDepth->vids[d]) { ! PanoramiXColorDepthTable[i]. ! panoramiXScreenMap[pVisual->class].vmap[pDepth->depth]. ! vid[ ! PanoramiXColorDepthTable[i]. ! panoramiXScreenMap[pVisual->class]. ! vmap[pDepth->depth].numVids++ ! ] ! = pDepth->vids[d]; ! } ! } ! } } PanoramiXColorDepthTable[i].numVisuals = 6; } /* for each screen */ *************** *** 768,773 **** return ProcPanoramiXGetScreenCount(client); case X_PanoramiXGetScreenSize: return ProcPanoramiXGetScreenSize(client); - return BadRequest; } } --- 774,779 ---- return ProcPanoramiXGetScreenCount(client); case X_PanoramiXGetScreenSize: return ProcPanoramiXGetScreenSize(client); } + return BadRequest; } *** ./programs/Xserver/Xext/panoramiXprocs.c@@/PUBLIC-LATEST Wed Dec 24 13:29:06 1997 --- xc/programs/Xserver/Xext/panoramiXprocs.c Tue Mar 17 06:48:57 1998 *************** *** 1,4 **** ! /* $TOG: panoramiXprocs.c /main/5 1997/12/24 13:34:45 kaleb $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * --- 1,4 ---- ! /* $TOG: panoramiXprocs.c /main/9 1998/03/17 06:51:10 kaleb $ */ /**************************************************************** * * * Copyright (c) Digital Equipment Corporation, 1991, 1997 * *************** *** 184,189 **** --- 184,190 ---- } localWin->FreeMe = FALSE; localWin->visibility = VisibilityNotViewable; + localWin->VisibilitySent = FALSE; PANORAMIXFIND_LAST(pPanoramiXWin, PanoramiXWinRoot); pPanoramiXWin->next = localWin; if ( stuff->visual != CopyFromParent) *************** *** 447,453 **** REQUEST(xResourceReq); int j,result; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; ! register WindowPtr pWin; Window winID; PanoramiXGC *pPanoramiXFreeGC; --- 448,454 ---- REQUEST(xResourceReq); int j,result; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; ! register WindowPtr pWin, pChild; Window winID; PanoramiXGC *pPanoramiXFreeGC; *************** *** 460,469 **** --- 461,482 ---- PanoramiXPmap *pPanoramiXFreePmapback = NULL; REQUEST_SIZE_MATCH(xResourceReq); + /* initialize visibility */ + pWin = (WindowPtr)SecurityLookupWindow(stuff->id, client, + SecurityReadAccess); + IF_RETURN(!pWin, BadWindow); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib) { + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pChild->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } + pPanoramiXWin = PanoramiXWinRoot; PANORAMIXFIND_ID(pPanoramiXWin, stuff->id); IF_RETURN(!pPanoramiXWin, BadWindow); PanoramiXMapped = TRUE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; for (j = 0; j <= (PanoramiXNumScreens - 1); j++) { winID = pPanoramiXWin->info[j].id; *************** *** 473,480 **** --- 486,503 ---- stuff->id = winID; result = (*SavedProcVector[X_MapWindow])(client); } + /* clean up */ PanoramiXMapped = FALSE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib){ + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pChild->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } return (result); } *************** *** 484,489 **** --- 507,513 ---- REQUEST(xResourceReq); int j,result; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + register WindowPtr pWin, pChild; PanoramiXGC *pPanoramiXFreeGC; PanoramiXGC *pPanoramiXFreeGCback = NULL; *************** *** 495,511 **** --- 519,558 ---- PanoramiXPmap *pPanoramiXFreePmapback = NULL; REQUEST_SIZE_MATCH(xResourceReq); + /* initialize visibility values */ + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + IF_RETURN(!pWin, BadWindow); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib){ + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pChild->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } + + pPanoramiXWin = PanoramiXWinRoot; PANORAMIXFIND_ID(pPanoramiXWin, stuff->id); IF_RETURN(!pPanoramiXWin, BadWindow); PanoramiXMapped = TRUE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; for (j = 0; j <= (PanoramiXNumScreens - 1); j++) { stuff->id = pPanoramiXWin->info[j].id; result = (*SavedProcVector[X_MapSubwindows])(client); } + /* clean up */ PanoramiXMapped = FALSE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib) { + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pChild->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } PANORAMIX_FREE(client); return (result); } *************** *** 516,522 **** REQUEST(xResourceReq); int j, result; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; ! PanoramiXGC *pPanoramiXFreeGC; PanoramiXGC *pPanoramiXFreeGCback = NULL; PanoramiXWindow *pPanoramiXFreeWin; --- 563,570 ---- REQUEST(xResourceReq); int j, result; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; ! register WindowPtr pWin, pChild; ! PanoramiXGC *pPanoramiXFreeGC; PanoramiXGC *pPanoramiXFreeGCback = NULL; PanoramiXWindow *pPanoramiXFreeWin; *************** *** 527,543 **** --- 575,614 ---- PanoramiXPmap *pPanoramiXFreePmapback = NULL; REQUEST_SIZE_MATCH(xResourceReq); + /* initialize visibility values */ + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + IF_RETURN(!pWin, BadWindow); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib){ + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pWin->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } + PANORAMIXFIND_ID(pPanoramiXWin, stuff->id); IF_RETURN(!pPanoramiXWin, BadWindow); PanoramiXMapped = TRUE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; for (j = 0; j <= (PanoramiXNumScreens - 1); j++) { stuff->id = pPanoramiXWin->info[j].id; result = (*SavedProcVector[X_UnmapWindow])(client); } + + /* clean up */ PanoramiXMapped = FALSE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib) { + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pChild->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } PANORAMIX_FREE(client); return (client->noClientException); } *************** *** 548,553 **** --- 619,625 ---- REQUEST(xResourceReq); int j, result; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + register WindowPtr pWin, pChild; PanoramiXGC *pPanoramiXFreeGC; PanoramiXGC *pPanoramiXFreeGCback = NULL; *************** *** 559,575 **** --- 631,670 ---- PanoramiXPmap *pPanoramiXFreePmapback = NULL; REQUEST_SIZE_MATCH(xResourceReq); + /* initialize visibility values */ + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + IF_RETURN(!pWin, BadWindow); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib){ + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pWin->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } + PANORAMIXFIND_ID(pPanoramiXWin, stuff->id); IF_RETURN(!pPanoramiXWin, BadWindow); PanoramiXMapped = TRUE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; for (j = 0; j <= (PanoramiXNumScreens - 1); j++) { stuff->id = pPanoramiXWin->info[j].id; result = (*SavedProcVector[X_UnmapSubwindows])(client); } + + /* clean up */ PanoramiXMapped = FALSE; PanoramiXVisibilityNotifySent = FALSE; + pPanoramiXWin->VisibilitySent = FALSE; + pWin = (WindowPtr) SecurityLookupWindow(stuff->id, + client,SecurityReadAccess); + for (pChild = pWin->firstChild; pChild; pChild = pChild->nextSib){ + pPanoramiXWin = PanoramiXWinRoot; + PANORAMIXFIND_ID(pPanoramiXWin, pWin->drawable.id); + if (pPanoramiXWin) + pPanoramiXWin->VisibilitySent = FALSE; + } PANORAMIX_FREE(client); return (client->noClientException); } *************** *** 1631,1636 **** --- 1726,1737 ---- pPanoramiXWin = (locDraw->type == DRAWABLE_PIXMAP) ? PanoramiXPmapRoot : PanoramiXWinRoot; PANORAMIXFIND_ID(pPanoramiXWin, locDraw->id); + /* In the case of Multibuffering, we need to make sure the drawable + isn't really a pixmap associated to a drawable */ + if (!pPanoramiXWin && (stuff->drawable != locDraw->id)) { + pPanoramiXWin = PanoramiXPmapRoot; + PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + } IF_RETURN(!pPanoramiXWin, BadDrawable); PANORAMIXFIND_ID(pPanoramiXGC, stuff->gc); IF_RETURN(!pPanoramiXGC, BadGC); *************** *** 1688,1693 **** --- 1789,1800 ---- pPanoramiXWin = (locDraw->type == DRAWABLE_PIXMAP) ? PanoramiXPmapRoot : PanoramiXWinRoot; PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + /* In the case of Multibuffering, we need to make sure the drawable + isn't really a pixmap associated to a drawable */ + if (!pPanoramiXWin && (stuff->drawable != locDraw->id)) { + pPanoramiXWin = PanoramiXPmapRoot; + PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + } IF_RETURN(!pPanoramiXWin, BadDrawable); PANORAMIXFIND_ID(pPanoramiXGC, stuff->gc); IF_RETURN(!pPanoramiXGC, BadGC); *************** *** 2080,2096 **** orig_x = stuff->dstX; orig_y = stuff->dstY; FOR_NSCREENS_OR_ONCE(pPanoramiXWin, j) { ! if ( (pPanoramiXWin == pPanoramiXRoot) || ! ( (pDraw->type == DRAWABLE_PIXMAP) && ! (stuff->width > panoramiXdataPtr[j].width) || ! (stuff->height > panoramiXdataPtr[j].height)) ) ! { ! stuff->dstX = orig_x - panoramiXdataPtr[j].x; ! stuff->dstY = orig_y - panoramiXdataPtr[j].y; ! } ! stuff->drawable = pPanoramiXWin->info[j].id; ! stuff->gc = pPanoramiXGC->info[j].id; ! result = (* SavedProcVector[X_PutImage])(client); } return(result); } --- 2187,2205 ---- orig_x = stuff->dstX; orig_y = stuff->dstY; FOR_NSCREENS_OR_ONCE(pPanoramiXWin, j) { ! if (pPanoramiXWin == pPanoramiXRoot) { ! stuff->dstX = orig_x - panoramiXdataPtr[j].x; ! stuff->dstY = orig_y - panoramiXdataPtr[j].y; ! } ! if (pDraw->type == DRAWABLE_PIXMAP) { ! if (stuff->width > panoramiXdataPtr[j].width) ! stuff->dstX = orig_x - panoramiXdataPtr[j].x; ! if (stuff->height > panoramiXdataPtr[j].height) ! stuff->dstY = orig_y - panoramiXdataPtr[j].y; ! } ! stuff->drawable = pPanoramiXWin->info[j].id; ! stuff->gc = pPanoramiXGC->info[j].id; ! result = (* SavedProcVector[X_PutImage])(client); } return(result); } *************** *** 2415,2431 **** PanoramiXWindow *pPanoramiXRoot; PanoramiXWindow *pPanoramiXWin; ! PanoramiXGC *pPanoramiXGC = PanoramiXGCRoot; ! DrawablePtr pDraw; ! GC *pGC; ! int orig_x, orig_y; REQUEST(xPolyTextReq); VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client); pPanoramiXRoot = (pDraw->type == DRAWABLE_PIXMAP) ! ? PanoramiXPmapRoot : PanoramiXWinRoot; pPanoramiXWin = pPanoramiXRoot; PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); IF_RETURN(!pPanoramiXWin, BadDrawable); PANORAMIXFIND_ID(pPanoramiXGC, stuff->gc); IF_RETURN(!pPanoramiXGC, BadGC); --- 2524,2547 ---- PanoramiXWindow *pPanoramiXRoot; PanoramiXWindow *pPanoramiXWin; ! PanoramiXGC *pPanoramiXGC = PanoramiXGCRoot; ! DrawablePtr pDraw; ! PixmapPtr pPixmap; ! GC *pGC; ! int orig_x, orig_y; REQUEST(xPolyTextReq); VALIDATE_DRAWABLE_AND_GC(stuff->drawable, pDraw, pGC, client); pPanoramiXRoot = (pDraw->type == DRAWABLE_PIXMAP) ! ? PanoramiXPmapRoot : PanoramiXWinRoot; pPanoramiXWin = pPanoramiXRoot; PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + /* In the case of Multibuffering, we need to make sure the drawable + isn't really a pixmap associated to a drawable */ + if (!pPanoramiXWin && (stuff->drawable != pDraw->id)) { + pPanoramiXWin = PanoramiXPmapRoot; + PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + } IF_RETURN(!pPanoramiXWin, BadDrawable); PANORAMIXFIND_ID(pPanoramiXGC, stuff->gc); IF_RETURN(!pPanoramiXGC, BadGC); *************** *** 2475,2480 **** --- 2591,2602 ---- ? PanoramiXPmapRoot : PanoramiXWinRoot; pPanoramiXWin = pPanoramiXRoot; PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + /* In the case of Multibuffering, we need to make sure the drawable + isn't really a pixmap associated to a drawable */ + if (!pPanoramiXWin && (stuff->drawable != pDraw->id)) { + pPanoramiXWin = PanoramiXPmapRoot; + PANORAMIXFIND_ID(pPanoramiXWin, stuff->drawable); + } IF_RETURN(!pPanoramiXWin, BadDrawable); PANORAMIXFIND_ID(pPanoramiXGC, stuff->gc); IF_RETURN(!pPanoramiXGC, BadGC); *** ./programs/Xserver/Xprint/Util.c@@/PUBLIC-LATEST Mon Dec 30 15:01:10 1996 --- xc/programs/Xserver/Xprint/Util.c Wed Mar 25 09:14:58 1998 *************** *** 1,4 **** ! /* $XConsortium: Util.c /main/3 1996/12/30 14:55:57 kaleb $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. --- 1,4 ---- ! /* $TOG: Util.c /main/4 1998/03/25 09:17:45 kaleb $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. *************** *** 30,43 **** dealings in this Software without prior written authorization from said copyright holders. */ #include - #include #include #include #include "dixstruct.h" #include "scrnintstr.h" #include "misc.h" - #include #define _XP_PRINT_SERVER_ #include "extensions/Print.h" --- 30,42 ---- dealings in this Software without prior written authorization from said copyright holders. */ + #include "Xos.h" /* for unistd.h and string.h */ #include #include #include #include "dixstruct.h" #include "scrnintstr.h" #include "misc.h" #define _XP_PRINT_SERVER_ #include "extensions/Print.h" *** ./programs/Xserver/Xprint/raster/Raster.c@@/PUBLIC-LATEST Sat Nov 16 15:37:55 1996 --- xc/programs/Xserver/Xprint/raster/Raster.c Mon Apr 6 14:57:24 1998 *************** *** 1,4 **** ! /* $XConsortium: Raster.c /main/3 1996/11/16 15:26:23 rws $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. --- 1,4 ---- ! /* $TOG: Raster.c /main/4 1998/04/06 14:56:49 mgreess $ */ /* (c) Copyright 1996 Hewlett-Packard Company (c) Copyright 1996 International Business Machines Corp. *************** *** 375,381 **** if(pConPriv->getDocClient != (ClientPtr)NULL) { XpFinishDocData(pConPriv->getDocClient); ! pConPriv->getDocClient == NULL; pConPriv->getDocBufSize = 0; } --- 375,381 ---- if(pConPriv->getDocClient != (ClientPtr)NULL) { XpFinishDocData(pConPriv->getDocClient); ! pConPriv->getDocClient = (ClientPtr)NULL; pConPriv->getDocBufSize = 0; } *************** *** 393,399 **** { XpFinishDocData(pConPriv->getDocClient); ! pConPriv->getDocClient == NULL; pConPriv->getDocBufSize = 0; return Success; --- 393,399 ---- { XpFinishDocData(pConPriv->getDocClient); ! pConPriv->getDocClient = (ClientPtr)NULL; pConPriv->getDocBufSize = 0; return Success; *** ./programs/Xserver/cfb/cfbbitblt.c@@/PUBLIC-LATEST Mon Feb 9 14:04:18 1998 --- xc/programs/Xserver/cfb/cfbbitblt.c Thu May 14 14:41:27 1998 *************** *** 25,31 **** Author: Keith Packard */ ! /* $TOG: cfbbitblt.c /main/71 1998/02/09 14:04:32 kaleb $ */ #include "X.h" #include "Xmd.h" --- 25,31 ---- Author: Keith Packard */ ! /* $TOG: cfbbitblt.c /main/73 1998/05/14 14:41:31 msr $ */ #include "X.h" #include "Xmd.h" *** ./programs/Xserver/dix/colormap.c@@/PUBLIC-LATEST Mon Feb 9 14:17:51 1998 --- xc/programs/Xserver/dix/colormap.c Tue Mar 24 18:12:02 1998 *************** *** 41,47 **** ******************************************************************/ ! /* $TOG: colormap.c /main/73 1998/02/09 14:18:06 kaleb $ */ #include "X.h" #define NEED_EVENTS --- 41,47 ---- ******************************************************************/ ! /* $TOG: colormap.c /main/74 1998/03/24 18:17:31 kaleb $ */ #include "X.h" #define NEED_EVENTS *************** *** 1158,1173 **** switch(channel) { case PSEUDOMAP: ! dg = pent->co.local.green - prgb->green; ! db = pent->co.local.blue - prgb->blue; case REDMAP: ! dr = pent->co.local.red - prgb->red; break; case GREENMAP: ! dg = pent->co.local.green - prgb->green; break; case BLUEMAP: ! db = pent->co.local.blue - prgb->blue; break; } sq = dr * dr; --- 1158,1173 ---- switch(channel) { case PSEUDOMAP: ! dg = (long) pent->co.local.green - prgb->green; ! db = (long) pent->co.local.blue - prgb->blue; case REDMAP: ! dr = (long) pent->co.local.red - prgb->red; break; case GREENMAP: ! dg = (long) pent->co.local.green - prgb->green; break; case BLUEMAP: ! db = (long) pent->co.local.blue - prgb->blue; break; } sq = dr * dr; *** ./programs/Xserver/dix/dixfonts.c@@/PUBLIC-LATEST Sat Sep 28 17:20:14 1996 --- xc/programs/Xserver/dix/dixfonts.c Thu May 28 15:40:14 1998 *************** *** 21,27 **** ************************************************************************/ ! /* $XConsortium: dixfonts.c /main/58 1996/09/28 17:11:55 rws $ */ #define NEED_REPLIES #include "X.h" --- 21,27 ---- ************************************************************************/ ! /* $TOG: dixfonts.c /main/61 1998/05/28 15:47:54 kaleb $ */ #define NEED_REPLIES #include "X.h" *************** *** 358,364 **** int i; FontPtr cached = (FontPtr)0; ! if (!lenfname) return BadName; if (patternCache) { --- 358,364 ---- int i; FontPtr cached = (FontPtr)0; ! if (!lenfname || lenfname > XLFDMAXFONTNAMELEN) return BadName; if (patternCache) { *************** *** 657,663 **** * old state */ else if (err == FontNameAlias) { ! char tmp_pattern[256]; /* * when an alias recurses, we need to give * the last FPE a chance to clean up; so we call --- 657,663 ---- * old state */ else if (err == FontNameAlias) { ! char tmp_pattern[XLFDMAXFONTNAMELEN]; /* * when an alias recurses, we need to give * the last FPE a chance to clean up; so we call *************** *** 797,802 **** --- 797,811 ---- int i; LFclosurePtr c; + /* + * The right error to return here would be BadName, however the + * specification does not allow for a Name error on this request. + * Perhaps a better solution would be to return a nil list, i.e. + * a list containing zero fontnames. + */ + if (length > XLFDMAXFONTNAMELEN) + return BadAlloc; + if (!(c = (LFclosurePtr) xalloc(sizeof *c))) return BadAlloc; c->fpe_list = (FontPathElementPtr *) *************** *** 1057,1062 **** --- 1066,1080 ---- { int i; LFWIclosurePtr c; + + /* + * The right error to return here would be BadName, however the + * specification does not allow for a Name error on this request. + * Perhaps a better solution would be to return a nil list, i.e. + * a list containing zero fontnames. + */ + if (length > XLFDMAXFONTNAMELEN) + return BadAlloc; if (!(c = (LFWIclosurePtr) xalloc(sizeof *c))) goto badAlloc; *** ./programs/Xserver/dix/window.c@@/PUBLIC-LATEST Mon Feb 9 14:20:44 1998 --- xc/programs/Xserver/dix/window.c Wed Apr 22 16:32:55 1998 *************** *** 1,4 **** ! /* $TOG: window.c /main/214 1998/02/09 14:20:59 kaleb $ */ /* Copyright 1987, 1998 The Open Group --- 1,4 ---- ! /* $TOG: window.c /main/215 1998/04/22 16:33:01 msr $ */ /* Copyright 1987, 1998 The Open Group *************** *** 371,376 **** --- 371,378 ---- SetWindowToDefaults(pWin); pWin->optional = (WindowOptRec *) xalloc (sizeof (WindowOptRec)); + if (!pWin->optional) + return FALSE; pWin->optional->dontPropagateMask = 0; pWin->optional->otherEventMasks = 0; *** ./programs/Xserver/hw/dec/ws/cfbinit.c@@/PUBLIC-LATEST Tue Feb 10 12:44:34 1998 --- xc/programs/Xserver/hw/dec/ws/cfbinit.c Tue Mar 17 17:41:17 1998 *************** *** 1,4 **** ! /* $TOG: cfbinit.c /main/12 1998/02/10 12:44:52 kaleb $ */ /*********************************************************** Copyright 1991, 1998 The Open Group --- 1,4 ---- ! /* $TOG: cfbinit.c /main/14 1998/03/17 17:41:19 kaleb $ */ /*********************************************************** Copyright 1991, 1998 The Open Group *************** *** 406,421 **** } ! if (!(*screenInit) (pScreen, ! #ifndef __alpha ! dd->pixmap, #else ! (pointer)(((char*)dd->pixmap) - 4096), #endif ! wsp->screenDesc->width, ! wsp->screenDesc->height, ! dpix, dpiy, ! dd->fb_width, dd->bits_per_pixel, dd->depth)) { return FALSE; } --- 406,420 ---- } ! #ifdef ultrix ! #define FB_BITS dd->pixmap #else ! #define FB_BITS dd->plane_mask #endif ! ! if (!(*screenInit) (pScreen, FB_BITS, ! dd->fb_width, dd->fb_height, ! dpix, dpiy, dd->fb_width, dd->bits_per_pixel, dd->depth)) { return FALSE; } *** ./programs/Xserver/hw/dec/ws/init.c@@/PUBLIC-LATEST Tue Feb 10 12:44:47 1998 --- xc/programs/Xserver/hw/dec/ws/init.c Tue Mar 17 16:39:03 1998 *************** *** 41,47 **** ******************************************************************/ ! /* $TOG: init.c /main/13 1998/02/10 12:45:05 kaleb $ */ #include #include --- 41,47 ---- ******************************************************************/ ! /* $TOG: init.c /main/14 1998/03/17 16:39:04 kaleb $ */ #include #include *************** *** 124,129 **** --- 124,130 ---- int wsScreenPrivateIndex; /* the following filth is forced by a broken dix interface */ + #ifndef PRINT_ONLY_SERVER void InitOutput(screenInfo, argc, argv) ScreenInfo *screenInfo; *************** *** 301,303 **** --- 302,306 ---- } SetTimeSinceLastInputEvent (); } + #endif /* PRINT_ONLY_SERVER */ + *** ./programs/Xserver/hw/dec/ws/mdepthinit.c@@/PUBLIC-LATEST Tue Feb 10 12:44:58 1998 --- xc/programs/Xserver/hw/dec/ws/mdepthinit.c Tue Mar 17 16:39:07 1998 *************** *** 1,4 **** ! /* $TOG: mdepthinit.c /main/9 1998/02/10 12:45:16 kaleb $ */ /* Copyright 1992, 1998 The Open Group --- 1,4 ---- ! /* $TOG: mdepthinit.c /main/10 1998/03/17 16:39:08 kaleb $ */ /* Copyright 1992, 1998 The Open Group *************** *** 233,244 **** if (bitsPerDepth[i]) j |= 1 << (bitsPerDepth[i] - 1); } if (!(j & (1 << 7))) bitsPerDepth[8] = 8; if (!(j & (1 << 15))) ! bitsPerDepth[12] = 16; ! if (!(j & (1 << 31))) bitsPerDepth[24] = 32; } #else /* SINGLEDEPTH */ --- 233,248 ---- if (bitsPerDepth[i]) j |= 1 << (bitsPerDepth[i] - 1); } + if (!(j & (1 << 3))) + bitsPerDepth[4] = 8; if (!(j & (1 << 7))) bitsPerDepth[8] = 8; if (!(j & (1 << 15))) ! bitsPerDepth[12] = 32; ! if (!(j & (1 << 23))) bitsPerDepth[24] = 32; + if (!(j & (1 << 31))) + bitsPerDepth[32] = 32; } #else /* SINGLEDEPTH */ *** ./programs/Xserver/hw/dec/ws/ws_color.c@@/PUBLIC-LATEST Tue Feb 10 12:45:10 1998 --- xc/programs/Xserver/hw/dec/ws/ws_color.c Tue Mar 17 16:39:11 1998 *************** *** 40,46 **** SOFTWARE. ******************************************************************/ ! /* $TOG: ws_color.c /main/8 1998/02/10 12:45:29 kaleb $ */ /* * ws_color.c - device specific color routines, stored in screen --- 40,46 ---- SOFTWARE. ******************************************************************/ ! /* $TOG: ws_color.c /main/9 1998/03/17 16:39:12 kaleb $ */ /* * ws_color.c - device specific color routines, stored in screen *************** *** 151,191 **** defs = (xColorItem *)ALLOCATE_LOCAL(entries * sizeof(xColorItem)); /* devPriv == 1 means decomposed hardware colormap */ ! if ((int) pcmap->devPriv == 1 ! && ((pcmap->class | DynamicClass) == DirectColor)) for( i = 0; i < entries; i++) ppix[i] = _DUPRGB( i, pcmap->pVisual); else for ( i=0; iclass == GrayScale || pcmap->class == PseudoColor) { ! for ( i=j=0; ired[i].fShared || pcmap->red[i].refcnt != 0) { ! defs[j].pixel = i; ! defs[j].flags = DoRed|DoGreen|DoBlue; ! if (pcmap->red[i].fShared) { ! defs[j].red = pcmap->red[i].co.shco.red->color; ! defs[j].green = pcmap->red[i].co.shco.green->color; ! defs[j].blue = pcmap->red[i].co.shco.blue->color; ! } else if (pcmap->red[i].refcnt != 0) { ! defs[j].red = pcmap->red[i].co.local.red; ! defs[j].green = pcmap->red[i].co.local.green; ! defs[j].blue = pcmap->red[i].co.local.blue; ! } ! j++; ! } ! } ! entries = j; ! } else { ! QueryColors( pcmap, entries, ppix, prgb); ! for ( i=0; idevPriv == 1 ! && ((pcmap->class | DynamicClass) == DirectColor)) && ! (pcmap->pScreen->rootDepth == 12)) for( i = 0; i < entries; i++) ppix[i] = _DUPRGB( i, pcmap->pVisual); else for ( i=0; i #include --- 41,47 ---- ******************************************************************/ ! /* $TOG: ws_io.c /main/22 1998/02/27 10:30:37 kaleb $ */ #include #include *************** *** 279,285 **** buff[count].y = mh->axis[1]; if (temptime == mh->time) count++; /* paranoid */ } ! mh = (ws_motion_history *) ((int)mh + mb->entry_size); } return count; } --- 279,285 ---- buff[count].y = mh->axis[1]; if (temptime == mh->time) count++; /* paranoid */ } ! mh = (ws_motion_history *) ((char*)mh + mb->entry_size); } return count; } *** ./programs/Xserver/hw/vfb/Imakefile@@/PUBLIC-LATEST Sun Nov 16 16:01:59 1997 --- xc/programs/Xserver/hw/vfb/Imakefile Tue Mar 24 13:24:01 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imakefile /main/12 1997/11/16 16:01:28 kaleb $ #include #if HasShm --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/13 1998/03/24 13:27:03 kaleb $ #include #if HasShm *************** *** 41,47 **** SpecialCObjectRule(InitInput,$(ICONFIGFILES),$(EXT_DEFINES)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) ! SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(EXT_DEFINES) $(PAN_DEFINES)) #if BuildXinerama LinkSourceFile(panoramiXstubs.c,$(SERVERSRC)/Xext) --- 41,47 ---- SpecialCObjectRule(InitInput,$(ICONFIGFILES),$(EXT_DEFINES)) LinkSourceFile(miinitext.c,$(SERVERSRC)/mi) ! SpecialCObjectRule(miinitext,$(ICONFIGFILES),$(PAN_DEFINES)) #if BuildXinerama LinkSourceFile(panoramiXstubs.c,$(SERVERSRC)/Xext) *** ./programs/Xserver/hw/xnest/Keyboard.c@@/PUBLIC-LATEST Sat Sep 28 17:22:09 1996 --- xc/programs/Xserver/hw/xnest/Keyboard.c Tue Apr 21 09:19:06 1998 *************** *** 1,4 **** ! /* $XConsortium: Keyboard.c /main/4 1996/09/28 17:13:49 rws $ */ /* Copyright 1993 by Davor Matic --- 1,4 ---- ! /* $TOG: Keyboard.c /main/5 1998/04/21 09:19:15 msr $ */ /* Copyright 1993 by Davor Matic *************** *** 87,92 **** --- 87,93 ---- KeySymsRec keySyms; CARD8 modmap[256]; int i, j; + XKeyboardState values; switch (onoff) { *************** *** 130,135 **** --- 131,142 ---- keySyms.maxKeyCode = max_keycode; keySyms.mapWidth = mapWidth; keySyms.map = keymap; + + XGetKeyboardControl(xnestDisplay, &values); + + memmove((char *) defaultKeyboardControl.autoRepeats, + (char *) values.auto_repeats, sizeof(values.auto_repeats)); + InitKeyboardDeviceStruct(pDev, &keySyms, modmap, xnestBell, xnestChangeKeyboardControl); XFree(keymap); *** ./programs/Xserver/include/closestr.h@@/PUBLIC-LATEST Mon Feb 9 14:27:31 1998 --- xc/programs/Xserver/include/closestr.h Thu Mar 26 17:23:05 1998 *************** *** 1,4 **** ! /* $TOG: closestr.h /main/11 1998/02/09 14:27:48 kaleb $ */ /* Copyright 1991, 1998 The Open Group --- 1,4 ---- ! /* $TOG: closestr.h /main/12 1998/03/26 17:26:54 kaleb $ */ /* Copyright 1991, 1998 The Open Group *************** *** 57,64 **** /* ListFontsWithInfo */ typedef struct _LFWIstate { ! char pattern[256]; /* max len of font name */ int patlen; int current_fpe; int max_names; --- 57,65 ---- /* ListFontsWithInfo */ + #define XLFDMAXFONTNAMELEN 256 typedef struct _LFWIstate { ! char pattern[XLFDMAXFONTNAMELEN]; int patlen; int current_fpe; int max_names; *** ./programs/Xserver/lbx/lbxcmap.c@@/PUBLIC-LATEST Mon Feb 9 14:31:39 1998 --- xc/programs/Xserver/lbx/lbxcmap.c Wed Mar 11 16:28:49 1998 *************** *** 1,4 **** ! /* $TOG: lbxcmap.c /main/12 1998/02/09 14:31:54 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: lbxcmap.c /main/13 1998/03/11 16:28:54 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 134,140 **** pScreen->DestroyColormap = ((LbxScreenPriv *) (pScreen->devPrivates[ lbxScreenPrivIndex].ptr))->DestroyColormap; (*pScreen->DestroyColormap) (pmap); ! xfree(pmap->devPrivates[lbxColormapPrivIndex].ptr); pScreen->DestroyColormap = LbxDestroyColormap; } --- 134,141 ---- pScreen->DestroyColormap = ((LbxScreenPriv *) (pScreen->devPrivates[ lbxScreenPrivIndex].ptr))->DestroyColormap; (*pScreen->DestroyColormap) (pmap); ! if (pmap->devPrivates && pmap->devPrivates[lbxColormapPrivIndex].ptr) ! xfree(pmap->devPrivates[lbxColormapPrivIndex].ptr); pScreen->DestroyColormap = LbxDestroyColormap; } *************** *** 948,953 **** --- 949,956 ---- LbxColormapPriv *cmapPriv; ColormapPtr *prev; + if (!pmap->devPrivates) + return; cmapPriv = (LbxColormapPriv *) (pmap->devPrivates[lbxColormapPrivIndex].ptr); if (!cmapPriv || (cmapPriv->grab_status == CMAP_NOT_GRABBED)) *** ./programs/Xserver/lbx/lbxdix.c@@/PUBLIC-LATEST Mon Feb 9 14:31:49 1998 --- xc/programs/Xserver/lbx/lbxdix.c Fri May 15 10:29:35 1998 *************** *** 1,4 **** ! /* $TOG: lbxdix.c /main/29 1998/02/09 14:32:04 kaleb $ */ /* Copyright 1998 The Open Group --- 1,4 ---- ! /* $TOG: lbxdix.c /main/30 1998/05/15 10:29:37 msr $ */ /* Copyright 1998 The Open Group *************** *** 649,655 **** LbxClientPtr lbxcp; proxy = LbxPidToProxy(pid); ! lbxcp = proxy->lbxClients[0]; if (lbxcp && (client = lbxcp->client)) { ev.type = LbxEventCode; ev.lbxType = LbxSendTagDataEvent; --- 649,655 ---- LbxClientPtr lbxcp; proxy = LbxPidToProxy(pid); ! lbxcp = (proxy != NULL) ? proxy->lbxClients[0] : NULL; if (lbxcp && (client = lbxcp->client)) { ev.type = LbxEventCode; ev.lbxType = LbxSendTagDataEvent; *** ./programs/Xserver/lbx/lbxtags.c@@/PUBLIC-LATEST Mon Feb 9 14:32:46 1998 --- xc/programs/Xserver/lbx/lbxtags.c Fri May 15 10:29:42 1998 *************** *** 1,4 **** ! /* $TOG: lbxtags.c /main/12 1998/02/09 14:33:01 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: lbxtags.c /main/13 1998/05/15 10:29:43 msr $ */ /* Copyright 1996, 1998 The Open Group *************** *** 173,179 **** for (pid = 1; pid < MAX_NUM_PROXIES; pid++) { if (td->sent_to_proxy[pid >> 3] & (1 << (pid & 7))) { proxy = LbxPidToProxy(pid); ! lbxcp = proxy->lbxClients[0]; if (lbxcp && (client = lbxcp->client)) LbxSendInvalidateTag(client, tid, td->data_type); td->sent_to_proxy[pid >> 3] &= ~(1 << (pid & 7)); --- 173,179 ---- for (pid = 1; pid < MAX_NUM_PROXIES; pid++) { if (td->sent_to_proxy[pid >> 3] & (1 << (pid & 7))) { proxy = LbxPidToProxy(pid); ! lbxcp = (proxy != NULL) ? proxy->lbxClients[0] : NULL; if (lbxcp && (client = lbxcp->client)) LbxSendInvalidateTag(client, tid, td->data_type); td->sent_to_proxy[pid >> 3] &= ~(1 << (pid & 7)); *** ./programs/Xserver/mi/miwideline.c@@/PUBLIC-LATEST Mon Feb 9 14:49:05 1998 --- xc/programs/Xserver/mi/miwideline.c Sat Mar 7 17:38:11 1998 *************** *** 1,4 **** ! /* $TOG: miwideline.c /main/59 1998/02/09 14:49:20 kaleb $ */ /* Copyright 1988, 1998 The Open Group --- 1,4 ---- ! /* $TOG: miwideline.c /main/60 1998/03/07 17:40:23 kaleb $ */ /* Copyright 1988, 1998 The Open Group *************** *** 244,250 **** } } ! static int miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge) double x0, y0; double k; /* x0 * dy - y0 * dx */ --- 244,250 ---- } } ! /* static */ int miPolyBuildEdge (x0, y0, k, dx, dy, xi, yi, left, edge) double x0, y0; double k; /* x0 * dy - y0 * dx */ *************** *** 303,309 **** #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) ! static int miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h) register PolyVertexPtr vertices; register PolySlopePtr slopes; --- 303,309 ---- #define StepAround(v, incr, max) (((v) + (incr) < 0) ? (max - 1) : ((v) + (incr) == max) ? 0 : ((v) + (incr))) ! /* static */ int miPolyBuildPoly (vertices, slopes, count, xi, yi, left, right, pnleft, pnright, h) register PolyVertexPtr vertices; register PolySlopePtr slopes; *** ./programs/Xserver/os/access.c@@/PUBLIC-LATEST Mon Feb 9 15:11:25 1998 --- xc/programs/Xserver/os/access.c Wed Apr 22 16:30:50 1998 *************** *** 1,4 **** ! /* $TOG: access.c /main/71 1998/02/09 15:11:42 kaleb $ */ /*********************************************************** Copyright 1987, 1998 The Open Group --- 1,4 ---- ! /* $TOG: access.c /main/72 1998/04/22 16:31:03 msr $ */ /*********************************************************** Copyright 1987, 1998 The Open Group *************** *** 152,157 **** --- 152,158 ---- } HOST; #define MakeHost(h,l) (h)=(HOST *) xalloc(sizeof *(h)+(l));\ + if((h))\ (h)->addr=(unsigned char *) ((h) + 1); #define FreeHost(h) xfree(h) static HOST *selfhosts = NULL; *** ./programs/Xserver/os/utils.c@@/PUBLIC-LATEST Mon Feb 9 15:12:46 1998 --- xc/programs/Xserver/os/utils.c Wed Apr 22 16:32:31 1998 *************** *** 1,4 **** ! /* $TOG: utils.c /main/135 1998/02/09 15:13:01 kaleb $ */ /* Copyright 1987, 1998 The Open Group --- 1,4 ---- ! /* $TOG: utils.c /main/138 1998/04/22 16:32:51 msr $ */ /* Copyright 1987, 1998 The Open Group *************** *** 79,84 **** --- 79,89 ---- #if NeedVarargsPrototypes #include #endif + #if defined(TCPCONN) || defined(STREAMSCONN) + # ifndef WIN32 + # include + # endif + #endif extern char *display; *************** *** 130,136 **** #endif #ifdef AIXV3 - FILE *aixfd; int SyncOn = 0; extern int SelectWaitTime; #endif --- 135,140 ---- *************** *** 357,365 **** defaultKeyboardControl.autoRepeat = TRUE; - #ifdef AIXV3 - OpenDebug(); - #endif for ( i = 1; i < argc; i++ ) { /* call ddx first, so it can peek/override if it wants */ --- 361,366 ---- *************** *** 738,743 **** --- 739,746 ---- *resargc = prefix_argc + insert_argc + suffix_argc; *resargv = (char **) xalloc((*resargc + 1) * sizeof(char *)); + if (!*resargv) + FatalError("Out of Memory\n"); memcpy(*resargv, prefix_argv, prefix_argc * sizeof(char *)); *************** *** 785,793 **** { #define AUTHORIZATION_NAME "hp-hostname-1" #if defined(TCPCONN) || defined(STREAMSCONN) - #ifndef WIN32 - #include - #endif static char result[1024]; static char *p = NULL; --- 788,793 ---- *************** *** 1062,1069 **** va_list args; { #ifdef AIXV3 - vfprintf(aixfd, f, args); - fflush (aixfd); if (SyncOn) sync(); #else --- 1062,1067 ---- *************** *** 1090,1097 **** va_end(args); #else #ifdef AIXV3 - fprintf(aixfd, f, s0, s1, s2, s3, s4, s5, s6, s7, s8, s9); - fflush (aixfd); if (SyncOn) sync(); #else /* not AIXV3 */ --- 1088,1093 ---- *************** *** 1099,1124 **** #endif /* AIXV3 */ #endif } - - #ifdef AIXV3 - OpenDebug() - { - char aixlogfile[100]; - struct stat aixfilebuf; - - sprintf(aixlogfile,"/tmp/xlogfile%d",getpid()); - - /* if the logfile already exists & is a symlink, fopen() overwrites - * it without unlinking the file. It is necessary to unlink the - * logfile to avoid a security breach & possible exploitation. - */ - if (stat((const char *)aixlogfile,&aixfilebuf) == 0) - unlink(aixlogfile); - if((aixfd = fopen(aixlogfile,"w")) == NULL ) - { - fprintf(stderr,"open %s failed\n",aixlogfile); - exit(-1); - } - chmod(aixlogfile,00644); - } - #endif --- 1095,1097 ---- *** ./programs/Xserver/pandix/dixfonts.c@@/PUBLIC-LATEST Wed Oct 29 13:24:37 1997 --- xc/programs/Xserver/pandix/dixfonts.c Thu May 28 15:46:00 1998 *************** *** 41,47 **** SOFTWARE. ************************************************************************/ ! /* $TOG: dixfonts.c /main/1 1997/10/29 13:27:11 kaleb $ */ #define NEED_REPLIES #include "X.h" --- 41,47 ---- SOFTWARE. ************************************************************************/ ! /* $TOG: dixfonts.c /main/4 1998/05/28 15:52:10 kaleb $ */ #define NEED_REPLIES #include "X.h" *************** *** 387,393 **** int i; FontPtr cached = (FontPtr)0; ! if (!lenfname) return BadName; if (patternCache) { --- 387,393 ---- int i; FontPtr cached = (FontPtr)0; ! if (!lenfname || lenfname > XLFDMAXFONTNAMELEN) return BadName; if (patternCache) { *************** *** 686,692 **** * old state */ else if (err == FontNameAlias) { ! char tmp_pattern[256]; /* * when an alias recurses, we need to give * the last FPE a chance to clean up; so we call --- 686,692 ---- * old state */ else if (err == FontNameAlias) { ! char tmp_pattern[XLFDMAXFONTNAMELEN]; /* * when an alias recurses, we need to give * the last FPE a chance to clean up; so we call *************** *** 826,831 **** --- 826,840 ---- int i; LFclosurePtr c; + /* + * The right error to return here would be BadName, however the + * specification does not allow for a Name error on this request. + * Perhaps a better solution would be to return a nil list, i.e. + * a list containing zero fontnames. + */ + if (length > XLFDMAXFONTNAMELEN) + return BadAlloc; + if (!(c = (LFclosurePtr) xalloc(sizeof *c))) return BadAlloc; c->fpe_list = (FontPathElementPtr *) *************** *** 1086,1091 **** --- 1095,1109 ---- { int i; LFWIclosurePtr c; + + /* + * The right error to return here would be BadName, however the + * specification does not allow for a Name error on this request. + * Perhaps a better solution would be to return a nil list, i.e. + * a list containing zero fontnames. + */ + if (length > XLFDMAXFONTNAMELEN) + return BadAlloc; if (!(c = (LFWIclosurePtr) xalloc(sizeof *c))) goto badAlloc; *** ./programs/Xserver/pandix/events.c@@/PUBLIC-LATEST Mon Feb 9 15:13:21 1998 --- xc/programs/Xserver/pandix/events.c Wed Mar 25 11:42:28 1998 *************** *** 63,69 **** ********************************************************/ ! /* $TOG: events.c /main/3 1998/02/09 15:13:35 kaleb $ */ #include "X.h" #include "misc.h" --- 63,69 ---- ********************************************************/ ! /* $TOG: events.c /main/4 1998/03/25 11:45:38 kaleb $ */ #include "X.h" #include "misc.h" *************** *** 3818,3826 **** GrabRec tempGrab; DeviceIntPtr keybd = inputInfo.keyboard; #ifdef PANORAMIX ! int i, PanoramiXNum; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; #endif REQUEST_SIZE_MATCH(xUngrabKeyReq); --- 3818,3828 ---- GrabRec tempGrab; DeviceIntPtr keybd = inputInfo.keyboard; #ifdef PANORAMIX ! int i; ! Bool result, anyTrue; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + register GrabPtr grab; #endif REQUEST_SIZE_MATCH(xUngrabKeyReq); *************** *** 3827,3841 **** pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); if (!pWin) return BadWindow; ! #ifdef PANORAMIX ! if ( !noPanoramiXExtension ){ ! PanoramiXNum = (sprite.hotPhys.pScreen)->myNum; ! PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); ! GrabWinID = pPanoramiXWin ? ! pPanoramiXWin->info[PanoramiXNum].id : stuff->grabWindow; ! pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); ! } ! #endif if (((stuff->key > keybd->key->curKeySyms.maxKeyCode) || (stuff->key < keybd->key->curKeySyms.minKeyCode)) && (stuff->key != AnyKey)) --- 3829,3835 ---- pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); if (!pWin) return BadWindow; ! if (((stuff->key > keybd->key->curKeySyms.maxKeyCode) || (stuff->key < keybd->key->curKeySyms.minKeyCode)) && (stuff->key != AnyKey)) *************** *** 3849,3855 **** client->errorValue = stuff->modifiers; return BadValue; } - tempGrab.resource = client->clientAsMask; tempGrab.device = keybd; tempGrab.window = pWin; --- 3843,3848 ---- *************** *** 3860,3868 **** --- 3853,3880 ---- tempGrab.detail.exact = stuff->key; tempGrab.detail.pMask = NULL; + #ifdef PANORAMIX + if ( !noPanoramiXExtension ){ + anyTrue = FALSE; + PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); + FOR_NSCREENS_OR_ONCE(pPanoramiXWin, i) { + GrabWinID = pPanoramiXWin ? + pPanoramiXWin->info[i].id : stuff->grabWindow; + pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); + tempGrab.window = pWin; + result = DeletePassiveGrabFromList(&tempGrab); + if (result == TRUE) + anyTrue = result; + } + return (anyTrue); + }else { + #endif if (!DeletePassiveGrabFromList(&tempGrab)) return(BadAlloc); return(Success); + #ifdef PANORAMIX + } + #endif } int *************** *** 3874,3880 **** GrabPtr grab; DeviceIntPtr keybd = inputInfo.keyboard; #ifdef PANORAMIX ! int i, PanoramiXNum; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; #endif --- 3886,3892 ---- GrabPtr grab; DeviceIntPtr keybd = inputInfo.keyboard; #ifdef PANORAMIX ! int i, result, anySuccess; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; #endif *************** *** 3915,3926 **** return BadWindow; #ifdef PANORAMIX if ( !noPanoramiXExtension ){ ! PanoramiXNum = (sprite.hotPhys.pScreen)->myNum; PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); ! GrabWinID = pPanoramiXWin ? ! pPanoramiXWin->info[PanoramiXNum].id : stuff->grabWindow; ! pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); ! } #endif grab = CreateGrab(client->index, keybd, pWin, (Mask)(KeyPressMask | KeyReleaseMask), (Bool)stuff->ownerEvents, --- 3927,3953 ---- return BadWindow; #ifdef PANORAMIX if ( !noPanoramiXExtension ){ ! anySuccess = BadAccess; PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); ! FOR_NSCREENS_OR_ONCE(pPanoramiXWin, i) { ! GrabWinID = pPanoramiXWin ? ! pPanoramiXWin->info[i].id : stuff->grabWindow; ! pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); ! grab = CreateGrab(client->index, keybd, pWin, ! (Mask)(KeyPressMask | KeyReleaseMask), ! (Bool)stuff->ownerEvents, ! (Bool)stuff->keyboardMode, ! (Bool)stuff->pointerMode, ! keybd, stuff->modifiers, KeyPress, ! stuff->key, NullWindow, NullCursor); ! if (!grab) ! return BadAlloc; ! result = AddPassiveGrabToList(grab); ! if (result == Success) ! anySuccess = result; ! } ! return (anySuccess); ! }else { #endif grab = CreateGrab(client->index, keybd, pWin, (Mask)(KeyPressMask | KeyReleaseMask), (Bool)stuff->ownerEvents, *************** *** 3929,3936 **** --- 3956,3967 ---- if (!grab) return BadAlloc; return AddPassiveGrabToList(grab); + #ifdef PANORAMIX + } + #endif } + int ProcGrabButton(client) ClientPtr client; *************** *** 3940,3946 **** CursorPtr cursor; GrabPtr grab; #ifdef PANORAMIX ! int i, PanoramiXNum; Bool NotViewable, NotRealized; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; --- 3971,3977 ---- CursorPtr cursor; GrabPtr grab; #ifdef PANORAMIX ! int i, result, anySuccess; Bool NotViewable, NotRealized; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; *************** *** 3985,3995 **** return BadWindow; #ifdef PANORAMIX if ( !noPanoramiXExtension ){ - PanoramiXNum = (sprite.hotPhys.pScreen)->myNum; - PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); - GrabWinID = pPanoramiXWin ? - pPanoramiXWin->info[PanoramiXNum].id : stuff->grabWindow; - pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); if (stuff->confineTo == PanoramiXWinRoot->info[0].id) stuff->confineTo = None; } --- 4016,4021 ---- *************** *** 4044,4050 **** } } ! grab = CreateGrab(client->index, inputInfo.pointer, pWin, permitOldBugs ? (Mask)(stuff->eventMask | ButtonPressMask | ButtonReleaseMask) : (Mask)stuff->eventMask, --- 4070,4102 ---- } } ! #ifdef PANORAMIX ! if (!noPanoramiXExtension) { ! anySuccess = BadAccess; ! PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); ! FOR_NSCREENS_OR_ONCE(pPanoramiXWin, i) { ! GrabWinID = pPanoramiXWin ? ! pPanoramiXWin->info[i].id : stuff->grabWindow; ! pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); ! grab = CreateGrab(client->index, inputInfo.pointer, pWin, ! permitOldBugs ? (Mask)(stuff->eventMask | ! ButtonPressMask | ButtonReleaseMask) : ! (Mask)stuff->eventMask, ! (Bool)stuff->ownerEvents, ! (Bool) stuff->keyboardMode, ! (Bool)stuff->pointerMode, ! inputInfo.keyboard, stuff->modifiers, ! ButtonPress, stuff->button, confineTo, cursor); ! if (!grab) ! return BadAlloc; ! result = AddPassiveGrabToList(grab); ! if (result == Success) ! anySuccess = result; ! } ! return (anySuccess); ! }else { ! #endif ! grab = CreateGrab(client->index, inputInfo.pointer, pWin, permitOldBugs ? (Mask)(stuff->eventMask | ButtonPressMask | ButtonReleaseMask) : (Mask)stuff->eventMask, *************** *** 4051,4059 **** (Bool)stuff->ownerEvents, (Bool) stuff->keyboardMode, (Bool)stuff->pointerMode, inputInfo.keyboard, stuff->modifiers, ButtonPress, stuff->button, confineTo, cursor); ! if (!grab) return BadAlloc; ! return AddPassiveGrabToList(grab); } int --- 4103,4114 ---- (Bool)stuff->ownerEvents, (Bool) stuff->keyboardMode, (Bool)stuff->pointerMode, inputInfo.keyboard, stuff->modifiers, ButtonPress, stuff->button, confineTo, cursor); ! if (!grab) return BadAlloc; ! return AddPassiveGrabToList(grab); ! #ifdef PANORAMIX ! } ! #endif } int *************** *** 4064,4072 **** WindowPtr pWin; GrabRec tempGrab; #ifdef PANORAMIX ! int i, PanoramiXNum; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; #endif REQUEST_SIZE_MATCH(xUngrabButtonReq); --- 4119,4129 ---- WindowPtr pWin; GrabRec tempGrab; #ifdef PANORAMIX ! int i; ! Bool result, anyTrue; Window GrabWinID; PanoramiXWindow *pPanoramiXWin = PanoramiXWinRoot; + register GrabPtr grab; #endif REQUEST_SIZE_MATCH(xUngrabButtonReq); *************** *** 4079,4093 **** pWin = SecurityLookupWindow(stuff->grabWindow, client, SecurityReadAccess); if (!pWin) return BadWindow; - #ifdef PANORAMIX - if ( !noPanoramiXExtension ){ - PanoramiXNum = (sprite.hotPhys.pScreen)->myNum; - PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); - GrabWinID = pPanoramiXWin ? - pPanoramiXWin->info[PanoramiXNum].id : stuff->grabWindow; - pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); - } - #endif tempGrab.resource = client->clientAsMask; tempGrab.device = inputInfo.pointer; tempGrab.window = pWin; --- 4136,4141 ---- *************** *** 4098,4106 **** tempGrab.detail.exact = stuff->button; tempGrab.detail.pMask = NULL; ! if (!DeletePassiveGrabFromList(&tempGrab)) return(BadAlloc); ! return(Success); } void --- 4146,4172 ---- tempGrab.detail.exact = stuff->button; tempGrab.detail.pMask = NULL; ! #ifdef PANORAMIX ! if ( !noPanoramiXExtension ){ ! PANORAMIXFIND_ID(pPanoramiXWin, stuff->grabWindow); ! FOR_NSCREENS_OR_ONCE(pPanoramiXWin, i) { ! GrabWinID = pPanoramiXWin ? ! pPanoramiXWin->info[i].id : stuff->grabWindow; ! pWin = SecurityLookupWindow(GrabWinID, client, SecurityReadAccess); ! tempGrab.window = pWin; ! result = DeletePassiveGrabFromList(&tempGrab); ! if (result == TRUE) ! anyTrue = result; ! } ! return (anyTrue); ! }else { ! #endif ! if (!DeletePassiveGrabFromList(&tempGrab)) return(BadAlloc); ! return(Success); ! #ifdef PANORAMIX ! } ! #endif } void *** ./programs/Xserver/pandix/window.c@@/PUBLIC-LATEST Mon Feb 9 15:13:41 1998 --- xc/programs/Xserver/pandix/window.c Wed Apr 22 16:33:07 1998 *************** *** 19,25 **** * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ ! /* $TOG: window.c /main/2 1998/02/09 15:13:56 kaleb $ */ /* Copyright 1987, 1998 The Open Group --- 19,25 ---- * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ ! /* $TOG: window.c /main/3 1998/04/22 16:33:20 msr $ */ /* Copyright 1987, 1998 The Open Group *************** *** 432,437 **** --- 432,439 ---- SetWindowToDefaults(pWin); pWin->optional = (WindowOptRec *) xalloc (sizeof (WindowOptRec)); + if (!pWin->optional) + return FALSE; pWin->optional->dontPropagateMask = 0; pWin->optional->otherEventMasks = 0; *** ./programs/Xserver/panmi/mivaltree.c@@/PUBLIC-LATEST Mon Feb 9 15:15:23 1998 --- xc/programs/Xserver/panmi/mivaltree.c Tue Mar 17 06:49:05 1998 *************** *** 19,25 **** * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ ! /* $TOG: mivaltree.c /main/2 1998/02/09 15:15:38 kaleb $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function --- 19,25 ---- * or in FAR 52.227-19, as applicable. * * * *****************************************************************/ ! /* $TOG: mivaltree.c /main/3 1998/03/17 06:51:18 kaleb $ */ /* * mivaltree.c -- * Functions for recalculating window clip lists. Main function *************** *** 557,562 **** --- 557,564 ---- PanoramiXoldVis = pPanoramiXWin->visibility; else PanoramiXoldVis = pParent->visibility; + if (oldVis == VisibilityNotViewable) + PanoramiXoldVis = oldVis; switch (RECT_IN_REGION( pScreen, panoramiXuniverse, &borderSize)) { case rgnIN: *************** *** 590,603 **** PanoramiXnewVis = VisibilityFullyObscured; break; } ! if (pPanoramiXWin) pPanoramiXWin->visibility = PanoramiXnewVis; ! if (PanoramiXoldVis != PanoramiXnewVis && (!PanoramiXVisibilityNotifySent) && ((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask)) { pParent->visibility = PanoramiXnewVis; SendVisibilityNotify(pParent); - PanoramiXVisibilityNotifySent = TRUE; pParent->visibility = oldVis; } --- 592,609 ---- PanoramiXnewVis = VisibilityFullyObscured; break; } ! if (pPanoramiXWin) { pPanoramiXWin->visibility = PanoramiXnewVis; + PanoramiXVisibilityNotifySent = pPanoramiXWin->VisibilitySent; + }else + PanoramiXVisibilityNotifySent = FALSE; ! if (PanoramiXoldVis != PanoramiXnewVis && (!PanoramiXVisibilityNotifySent) ! && ((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask)) { pParent->visibility = PanoramiXnewVis; + pPanoramiXWin->VisibilitySent = TRUE; SendVisibilityNotify(pParent); pParent->visibility = oldVis; } *************** *** 816,834 **** &pChild->borderSize); REGION_INIT(pScreen, &PanoramiXborderSize, NullBox, 0); if ( kind == VTMove ) ! PanoramiXClippedRegion(pChild, &PanoramiXborderSize, ! (pChild->borderSize.extents.x2 - pChild->drawable.width), ! (pChild->borderSize.extents.y2 - pChild->drawable.height), ! (pChild->drawable.width + wBorderWidth(pChild)), ! (pChild->drawable.height + wBorderWidth(pChild))); else ! PanoramiXClippedRegion(pChild, &PanoramiXborderSize, (pChild->drawable.x - wBorderWidth(pChild)), (pChild->drawable.y - wBorderWidth(pChild)), (pChild->drawable.width + (2*wBorderWidth(pChild))), ! (pChild->drawable.height + (2*wBorderWidth(pChild)))); ! REGION_INTERSECT(pScreen, &PanoramiXchildUniverse, panoramiXuniverse, &PanoramiXborderSize); PanoramiXComputeClips (pChild, pScreen, &childUniverse, &PanoramiXchildUniverse, kind, exposed); } /* --- 822,842 ---- &pChild->borderSize); REGION_INIT(pScreen, &PanoramiXborderSize, NullBox, 0); if ( kind == VTMove ) ! PanoramiXClippedRegion(pChild, &PanoramiXborderSize, ! (pChild->borderSize.extents.x2 - wBorderWidth(pChild)), ! (pChild->borderSize.extents.y2 - wBorderWidth(pChild)), ! (pChild->drawable.width + (2*wBorderWidth(pChild))), ! (pChild->drawable.height + (2*wBorderWidth(pChild)))); else ! PanoramiXClippedRegion(pChild, &PanoramiXborderSize, (pChild->drawable.x - wBorderWidth(pChild)), (pChild->drawable.y - wBorderWidth(pChild)), (pChild->drawable.width + (2*wBorderWidth(pChild))), ! (pChild->drawable.height + (2*wBorderWidth(pChild)))); ! ! REGION_UNION(pScreen, &PanoramiXchildUniverse, panoramiXuniverse, &PanoramiXborderSize); + PanoramiXComputeClips (pChild, pScreen, &childUniverse, &PanoramiXchildUniverse, kind, exposed); } /* *************** *** 928,934 **** } } ! /*- *----------------------------------------------------------------------- * miValidateTree -- * Recomputes the clip list for pParent and all its inferiors. --- 936,942 ---- } } ! /* *----------------------------------------------------------------------- * miValidateTree -- * Recomputes the clip list for pParent and all its inferiors. *************** *** 1024,1043 **** #ifdef PANORAMIX if (!noPanoramiXExtension) { REGION_INIT(pScreen, &PanoramiXborderClip, NullBox, 0); ! if ( kind == VTMove ) PanoramiXClippedRegion(pWin, &PanoramiXborderClip, ! (pWin->borderClip.extents.x2 - pWin->drawable.width), ! (pWin->borderClip.extents.y2 - pWin->drawable.height ), ! (pWin->drawable.width + wBorderWidth(pWin)), ! (pWin->drawable.height + wBorderWidth(pWin))); ! else PanoramiXClippedRegion(pWin, &PanoramiXborderClip, (pWin->drawable.x - wBorderWidth(pWin)), (pWin->drawable.y - wBorderWidth(pWin)), (pWin->drawable.width + (2*wBorderWidth(pWin))), (pWin->drawable.height + (2*wBorderWidth(pWin)))); - REGION_APPEND( pScreen, &PanoramiXtotalClip, &PanoramiXborderClip); } #endif if (pWin->viewable) --- 1032,1053 ---- #ifdef PANORAMIX if (!noPanoramiXExtension) { REGION_INIT(pScreen, &PanoramiXborderClip, NullBox, 0); ! if ( kind == VTMove ) PanoramiXClippedRegion(pWin, &PanoramiXborderClip, ! (pWin->borderClip.extents.x2 - pWin->drawable.width ! - wBorderWidth(pWin) ), ! (pWin->borderClip.extents.y2 - pWin->drawable.height ! - wBorderWidth(pWin) ), ! (pWin->drawable.width + (2*wBorderWidth(pWin))), ! (pWin->drawable.height + (2*wBorderWidth(pWin)))); ! else PanoramiXClippedRegion(pWin, &PanoramiXborderClip, (pWin->drawable.x - wBorderWidth(pWin)), (pWin->drawable.y - wBorderWidth(pWin)), (pWin->drawable.width + (2*wBorderWidth(pWin))), (pWin->drawable.height + (2*wBorderWidth(pWin)))); REGION_APPEND( pScreen, &PanoramiXtotalClip, &PanoramiXborderClip); + } #endif if (pWin->viewable) *************** *** 1057,1069 **** #ifdef PANORAMIX if (!noPanoramiXExtension) { REGION_INIT(pScreen, &PanoramiXborderClip, NullBox, 0); ! if ( kind == VTMove ) PanoramiXClippedRegion(pWin, &PanoramiXborderClip, ! (pWin->borderClip.extents.x2 - pWin->drawable.width), ! (pWin->borderClip.extents.y2 - pWin->drawable.height), ! (pWin->drawable.width + wBorderWidth(pWin)), ! (pWin->drawable.height + wBorderWidth(pWin))); ! else PanoramiXClippedRegion(pWin, &PanoramiXborderClip, (pWin->drawable.x - wBorderWidth(pWin)), (pWin->drawable.y - wBorderWidth(pWin)), --- 1067,1081 ---- #ifdef PANORAMIX if (!noPanoramiXExtension) { REGION_INIT(pScreen, &PanoramiXborderClip, NullBox, 0); ! if ( kind == VTMove ) PanoramiXClippedRegion(pWin, &PanoramiXborderClip, ! (pWin->borderClip.extents.x2 - pWin->drawable.width ! - wBorderWidth(pWin) ), ! (pWin->borderClip.extents.y2 - pWin->drawable.height ! - wBorderWidth(pWin) ), ! (pWin->drawable.width + (2*wBorderWidth(pWin))), ! (pWin->drawable.height + (2*wBorderWidth(pWin)))); ! else PanoramiXClippedRegion(pWin, &PanoramiXborderClip, (pWin->drawable.x - wBorderWidth(pWin)), (pWin->drawable.y - wBorderWidth(pWin)), *************** *** 1103,1121 **** /* This should be the Root window, use clipList if its a Move otherwise use the drawable x,y and widths, the areas might have been clipped away, assign clipList to get data section */ ! if ( kind == VTMove ) PanoramiXClippedRegion(pParent, &PanoramiXclipList, ! (pParent->clipList.extents.x2 - pParent->drawable.width), ! (pParent->clipList.extents.y2 - pParent->drawable.height), ! (pParent->drawable.width + wBorderWidth(pParent)), ! (pParent->drawable.height + wBorderWidth(pParent))); ! else PanoramiXClippedRegion(pParent, &PanoramiXclipList, (pParent->drawable.x - wBorderWidth(pParent)), (pParent->drawable.y - wBorderWidth(pParent)), (pParent->drawable.width + (2*wBorderWidth(pParent))), (pParent->drawable.height + (2*wBorderWidth(pParent)))); ! REGION_UNION( pScreen, &PanoramiXtotalClip, &PanoramiXtotalClip, &PanoramiXclipList); } #endif REGION_UNION( pScreen, &totalClip, &totalClip, &pParent->clipList); --- 1115,1136 ---- /* This should be the Root window, use clipList if its a Move otherwise use the drawable x,y and widths, the areas might have been clipped away, assign clipList to get data section */ ! if ( kind == VTMove ) PanoramiXClippedRegion(pParent, &PanoramiXclipList, ! (pParent->clipList.extents.x2 - pParent->drawable.width ! - wBorderWidth(pParent) ), ! (pParent->clipList.extents.y2 - pParent->drawable.height ! - wBorderWidth(pParent) ), ! (pParent->drawable.width + (2*wBorderWidth(pParent))), ! (pParent->drawable.height + (2*wBorderWidth(pParent)))); ! else PanoramiXClippedRegion(pParent, &PanoramiXclipList, (pParent->drawable.x - wBorderWidth(pParent)), (pParent->drawable.y - wBorderWidth(pParent)), (pParent->drawable.width + (2*wBorderWidth(pParent))), (pParent->drawable.height + (2*wBorderWidth(pParent)))); ! REGION_UNION( pScreen, &PanoramiXtotalClip, &PanoramiXtotalClip, ! &PanoramiXclipList); } #endif REGION_UNION( pScreen, &totalClip, &totalClip, &pParent->clipList); *************** *** 1167,1191 **** #ifdef PANORAMIX if (!noPanoramiXExtension) { REGION_INIT(pScreen, &PanoramiXborderSize, NullBox, 0); ! if ( kind == VTMove ) PanoramiXClippedRegion(pWin, &PanoramiXborderSize, ! (pWin->borderSize.extents.x2 - pWin->drawable.width), ! (pWin->borderSize.extents.y2 - pWin->drawable.height), ! (pWin->drawable.width + wBorderWidth(pWin)), ! (pWin->drawable.height + wBorderWidth(pWin))); ! else PanoramiXClippedRegion(pWin, &PanoramiXborderSize, (pWin->drawable.x - wBorderWidth(pWin)), (pWin->drawable.y - wBorderWidth(pWin)), (pWin->drawable.width + (2*wBorderWidth(pWin))), (pWin->drawable.height + (2*wBorderWidth(pWin)))); ! if (miRegionDataCopy(&PanoramiXtotalClip, &totalClip)) { ! /* somehow the data portion of childClip needs to get tacked ! onto PanoramiXchildClip, when data is lost this results in ! incorrect determination of the windows visibility */ ! ! REGION_INTERSECT( pScreen, &PanoramiXchildClip, &PanoramiXtotalClip, &PanoramiXborderSize); ! PanoramiXComputeClips (pWin, pScreen, &childClip, &PanoramiXchildClip, kind, &exposed); }else miComputeClips (pWin, pScreen, &childClip, kind, &exposed); --- 1182,1205 ---- #ifdef PANORAMIX if (!noPanoramiXExtension) { REGION_INIT(pScreen, &PanoramiXborderSize, NullBox, 0); ! if (( kind == VTMove ) && (pWin->borderSize.extents.x2 != 0 && ! pWin->borderSize.extents.y2 != 0)) { PanoramiXClippedRegion(pWin, &PanoramiXborderSize, ! (pWin->borderSize.extents.x2 - pWin->drawable.width ! - wBorderWidth(pWin) ), ! (pWin->borderSize.extents.y2 - pWin->drawable.height ! - wBorderWidth(pWin) ), ! (pWin->drawable.width + (2*wBorderWidth(pWin))), ! (pWin->drawable.height + (2*wBorderWidth(pWin)))); ! }else { PanoramiXClippedRegion(pWin, &PanoramiXborderSize, (pWin->drawable.x - wBorderWidth(pWin)), (pWin->drawable.y - wBorderWidth(pWin)), (pWin->drawable.width + (2*wBorderWidth(pWin))), (pWin->drawable.height + (2*wBorderWidth(pWin)))); ! } ! if (miRegionDataCopy(&PanoramiXtotalClip, &totalClip) ) { ! REGION_UNION( pScreen, &PanoramiXchildClip, &PanoramiXtotalClip, &PanoramiXborderSize); PanoramiXComputeClips (pWin, pScreen, &childClip, &PanoramiXchildClip, kind, &exposed); }else miComputeClips (pWin, pScreen, &childClip, kind, &exposed); *** ./programs/bdftopcf/bdftopcf.c@@/PUBLIC-LATEST Mon Feb 9 13:39:28 1998 --- xc/programs/bdftopcf/bdftopcf.c Wed Apr 29 15:45:47 1998 *************** *** 1,4 **** ! /* $TOG: bdftopcf.c /main/9 1998/02/09 13:39:43 kaleb $ */ /* Copyright 1991, 1993, 1998 The Open Group --- 1,4 ---- ! /* $TOG: bdftopcf.c /main/10 1998/04/29 15:45:50 barstow $ */ /* Copyright 1991, 1993, 1998 The Open Group *************** *** 39,44 **** --- 39,46 ---- char *input_name = 0, *output_name = 0; char *program_name; int bit, byte, glyph, scan; + + bzero(&font, sizeof(FontRec)); FontDefaultFormat (&bit, &byte, &glyph, &scan); program_name = argv[0]; *** ./programs/lbxproxy/di/dispatch.c@@/PUBLIC-LATEST Wed Feb 11 09:47:43 1998 --- xc/programs/lbxproxy/di/dispatch.c Mon Feb 23 09:14:15 1998 *************** *** 1,27 **** ! /* $TOG: dispatch.c /main/41 1998/02/11 09:48:03 kaleb $ */ /* - - Copyright 1998 The Open Group - - All Rights Reserved. - - 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. - - */ - /* * Copyright 1992 Network Computing Devices * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that --- 1,7 ---- ! /* $TOG: dispatch.c /main/42 1998/02/23 09:14:20 barstow $ */ /* * Copyright 1992 Network Computing Devices + * Copyright 1996 X Consortium, Inc. * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that *************** *** 155,161 **** client->requestLog[client->requestLogIndex] = MAJOROP; client->requestLogIndex++; #endif ! LBXSequenceNumber(client)++; result = (* client->requestVector[MAJOROP])(client); if (result != Success) --- 135,141 ---- client->requestLog[client->requestLogIndex] = MAJOROP; client->requestLogIndex++; #endif ! client->sequenceNumber++; result = (* client->requestVector[MAJOROP])(client); if (result != Success) *************** *** 345,351 **** nClients++; client->requestVector = client->server->requestVector; client->sequence = 0; ! LBXSequenceNumber(client) = 0; client->largeRequest = NULL; /* wait for X server to kill client */ --- 325,331 ---- nClients++; client->requestVector = client->server->requestVector; client->sequence = 0; ! client->sequenceNumber = 0; client->largeRequest = NULL; /* wait for X server to kill client */ *** ./programs/lbxproxy/di/lbxfuncs.c@@/PUBLIC-LATEST Wed Feb 11 09:48:06 1998 --- xc/programs/lbxproxy/di/lbxfuncs.c Mon Feb 23 09:14:25 1998 *************** *** 1,27 **** ! /* $TOG: lbxfuncs.c /main/48 1998/02/11 09:48:27 kaleb $ */ /* - - Copyright 1998 The Open Group - - All Rights Reserved. - - 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. - - */ - /* * Copyright 1994 Network Computing Devices, Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided --- 1,7 ---- ! /* $TOG: lbxfuncs.c /main/49 1998/02/23 09:14:27 barstow $ */ /* * Copyright 1994 Network Computing Devices, Inc. + * Copyright 1996 X Consortium, Inc. * * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided *************** *** 1386,1393 **** --- 1366,1375 ---- if (reply->type != KeymapNotify && reply->sequenceNumber > LBXSequenceNumber(client)) { + #ifdef SEQ_DEBUG fprintf(stderr, "lbxproxy: reply seq #0x%x > internal seq 0x%x\n", reply->sequenceNumber, LBXSequenceNumber(client)); + #endif reply->sequenceNumber = LBXSequenceNumber(client); } *** ./programs/lbxproxy/di/lbxutil.c@@/PUBLIC-LATEST Wed Feb 11 09:48:15 1998 --- xc/programs/lbxproxy/di/lbxutil.c Mon Feb 23 09:14:36 1998 *************** *** 1,26 **** ! /* $TOG: lbxutil.c /main/27 1998/02/11 09:48:37 kaleb $ */ /* - - Copyright 1998 The Open Group - - All Rights Reserved. - - 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. - - */ - /* * Copyright 1994 Network Computing Devices, Inc. * * Permission to use, copy, modify, distribute, and sell this software and --- 1,5 ---- ! /* $TOG: lbxutil.c /main/28 1998/02/23 09:14:38 barstow $ */ /* * Copyright 1994 Network Computing Devices, Inc. * * Permission to use, copy, modify, distribute, and sell this software and *************** *** 249,255 **** #ifdef SEQ_DEBUG fprintf(stderr, " 0x%x", cur->delay_seq_no); #endif ! if (cur->delay_seq_no == LBXLastResponse(client) + 1) { WriteToClient(client, sizeof(xReply), (char *) &cur->reply); if (cur->dlen) WriteToClient(client, cur->dlen, (char *) cur->data); --- 228,234 ---- #ifdef SEQ_DEBUG fprintf(stderr, " 0x%x", cur->delay_seq_no); #endif ! if ((cur->delay_seq_no & 0xffff) == LBXLastResponse(client) + 1) { WriteToClient(client, sizeof(xReply), (char *) &cur->reply); if (cur->dlen) WriteToClient(client, cur->dlen, (char *) cur->data); *** ./programs/lbxproxy/di/utils.c@@/PUBLIC-LATEST Wed Feb 11 09:49:00 1998 --- xc/programs/lbxproxy/di/utils.c Mon Feb 23 10:36:31 1998 *************** *** 1,4 **** ! /* $TOG: utils.c /main/43 1998/02/11 09:49:21 kaleb $ */ /*********************************************************** Copyright 1987, 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: utils.c /main/44 1998/02/23 10:36:34 barstow $ */ /*********************************************************** Copyright 1987, 1996, 1998 The Open Group *************** *** 236,241 **** --- 236,243 ---- ErrorF("-[terminate|reset] terminate or reset after last client exits\n"); ErrorF(" (default is continue running)\n"); ErrorF("-I ignore all remaining arguments\n"); + ErrorF("-reconnect reset if server connection is broken\n"); + ErrorF(" (default is to exit if connection is broken)\n"); ErrorF("-nolbx disable LBX reencoding of X requests\n"); ErrorF("-nocomp disable stream compression\n"); ErrorF("-nodelta disable request deltas\n"); *************** *** 249,254 **** --- 251,259 ---- ErrorF("-nowinattr disable GetWindowAttributes/GetGeometry\n"); ErrorF(" grouping into one round trip\n"); ErrorF("-nograbcmap disable colormap grabbing\n"); + ErrorF("-norgbfile disables color name to RGB resolution\n"); + ErrorF("-rgbfile path specifies an alternate RGB database\n"); + ErrorF(" for color name to RGB resolution\n"); ErrorF("-tagcachesize # set tag cache size\n"); ErrorF("-maxservers # maximum number of servers to use\n"); ErrorF(" default is 20, but this is overrided\n"); *** ./programs/lbxproxy/include/lbx.h@@/PUBLIC-LATEST Tue Feb 10 18:17:14 1998 --- xc/programs/lbxproxy/include/lbx.h Mon Feb 23 09:34:10 1998 *************** *** 1,4 **** ! /* $TOG: lbx.h /main/23 1998/02/10 18:17:34 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: lbx.h /main/24 1998/02/23 09:34:13 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 263,269 **** #define ReadRequestFromClient(client) ((client)->public.readRequest(client)) #define RequestLength(r,client,g,p) (*(client)->public.requestLength) (r,client,g,p) ! #define LBXSequenceNumber(client) (client->sequenceNumber) #define LBXCacheSafe(client) (client->cache_safe) #define LBXCanDelayReply(client) (client->can_delay_reply) #define LBXSequenceLost(client) (client->sequence_lost) --- 263,269 ---- #define ReadRequestFromClient(client) ((client)->public.readRequest(client)) #define RequestLength(r,client,g,p) (*(client)->public.requestLength) (r,client,g,p) ! #define LBXSequenceNumber(client) ((client->sequenceNumber) & 0xffff) #define LBXCacheSafe(client) (client->cache_safe) #define LBXCanDelayReply(client) (client->can_delay_reply) #define LBXSequenceLost(client) (client->sequence_lost) *** ./programs/proxymngr/main.c@@/PUBLIC-LATEST Thu Feb 12 10:03:00 1998 --- xc/programs/proxymngr/main.c Wed Mar 4 11:29:59 1998 *************** *** 1,4 **** ! /* $TOG: main.c /main/33 1998/02/12 10:03:25 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: main.c /main/36 1998/03/04 11:30:05 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 22,27 **** --- 22,28 ---- from The Open Group. */ + #include #include "pmint.h" #include #include *************** *** 33,38 **** --- 34,44 ---- #include "config.h" #include + #include + #include + #include + #include + void InstallIOErrorHandler (); void NewConnectionXtProc (); static Status PMprotocolSetupProc (); *************** *** 60,73 **** char *configFile = NULL; ! Usage () - { fprintf (stderr, "Usage: proxymngr [-config file] [-verbose]\n"); exit (1); } /* * Main program --- 66,91 ---- char *configFile = NULL; ! void Usage () { fprintf (stderr, "Usage: proxymngr [-config file] [-verbose]\n"); exit (1); } + void + SetCloseOnExec (fd) + int fd; + { + int ret; + #ifdef F_SETFD + #ifdef FD_CLOEXEC + ret = fcntl (fd, F_SETFD, FD_CLOEXEC); + #else + ret = fcntl (fd, F_SETFD, 1); + #endif /* FD_CLOEXEC */ + #endif /* F_SETFD */ + } /* * Main program *************** *** 107,120 **** if (verbose) fprintf (stderr, "config file = %s\n", configFile); - /* * Install an IO error handler. */ - InstallIOErrorHandler (); - /* * Register support for PROXY_MANAGEMENT. */ --- 125,135 ---- *************** *** 137,143 **** } /* For Unmanaged proxies, we do the Setup ! /* ICElib doesn't specify that the same opCode will be returned * so don't bet on it. */ if ((PMOriginatorOpcode = IceRegisterForProtocolSetup ( --- 152,158 ---- } /* For Unmanaged proxies, we do the Setup ! * ICElib doesn't specify that the same opCode will be returned * so don't bet on it. */ if ((PMOriginatorOpcode = IceRegisterForProtocolSetup ( *************** *** 180,191 **** NewConnectionXtProc, (XtPointer) listenObjs[i]); IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); } /* * Main loop */ - XtAppMainLoop (appContext); } --- 195,207 ---- NewConnectionXtProc, (XtPointer) listenObjs[i]); IceSetHostBasedAuthProc (listenObjs[i], HostBasedAuthProc); + + SetCloseOnExec (IceGetListenConnectionNumber (listenObjs[i])); } /* * Main loop */ XtAppMainLoop (appContext); } *************** *** 194,199 **** --- 210,216 ---- * Xt callback invoked when a client attempts to connect. */ + /* ARGSUSED */ void NewConnectionXtProc (client_data, source, id) *************** *** 213,218 **** --- 230,240 ---- } else { IceConnectStatus cstatus; + /* + * Mark this fd to be closed upon exec + */ + SetCloseOnExec (IceConnectionNumber (ice_conn)); + while ((cstatus = IceConnectionStatus (ice_conn))==IceConnectPending) { XtAppProcessEvent (appContext, XtIMAll); } *************** *** 446,451 **** --- 468,520 ---- memcpy (authData, pData, authLen); } + if (serverAddress) + { + /* + * Assume that if serverAddress is something like :0 or :0.0 + * then the request is for a server on the client's host. + * + * However, the proxy handling this request may be on a + * different host than the client or the client host, + * proxy host and the server host may all be different, + * thus a serverAddress of :0 or :0.0 is not useful. + * Therefore, change serverAddrees to use the client's + * hostname. + */ + char *tmpName; + + tmpName = strchr (serverAddress, ':'); + + if (tmpName && ((serverAddress[0] == ':') || + (!strncmp (serverAddress, "unix:", 5)))) + { + struct sockaddr_in serverSock; + int retVal; + int addrLen = sizeof(serverSock); + + retVal = getpeername(IceConnectionNumber(iceConn), + (struct sockaddr *) &serverSock, + &addrLen); + if (!retVal) + { + struct hostent *hostent; + + hostent = gethostbyname (inet_ntoa(serverSock.sin_addr)); + + if (hostent && hostent->h_name) + { + int len; + char * pch = strdup (tmpName); + + len = strlen(hostent->h_name) + strlen(tmpName) + 1; + serverAddress = (char *) realloc (serverAddress, len); + sprintf (serverAddress, "%s%s", hostent->h_name, pch); + free (pch); + } + } + } + } + if (verbose) { printf ("Got GetProxyAddr, serviceName = %s, serverAddr = %s\n", serviceName, serverAddress); *************** *** 919,924 **** --- 988,994 ---- } + /* ARGSUSED */ void _XtProcessIceMsgProc (client_data, source, id) *** ./programs/proxymngr/pmdb.c@@/PUBLIC-LATEST Mon Feb 9 13:45:25 1998 --- xc/programs/proxymngr/pmdb.c Wed Mar 4 11:30:10 1998 *************** *** 1,4 **** ! /* $TOG: pmdb.c /main/23 1998/02/09 13:45:39 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: pmdb.c /main/25 1998/03/04 11:30:12 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 22,35 **** from The Open Group. */ - #include "pmint.h" #include "pmdb.h" #include "config.h" #include static proxy_service *proxyServiceList = NULL; proxy_service * FindProxyService ( --- 22,59 ---- from The Open Group. */ #include "pmint.h" #include "pmdb.h" #include "config.h" #include + #include + #include + #if defined(X_NOT_POSIX) && defined(SIGNALRETURNSINT) + #define SIGVAL int + #else + #define SIGVAL void + #endif + + void SetCloseOnExec (int fd); + static proxy_service *proxyServiceList = NULL; + SIGVAL (*Signal (sig, handler))() + int sig; + SIGVAL (*handler)(); + { + #ifndef X_NOT_POSIX + struct sigaction sigact, osigact; + sigact.sa_handler = handler; + sigemptyset(&sigact.sa_mask); + sigact.sa_flags = 0; + sigaction(sig, &sigact, &osigact); + return osigact.sa_handler; + #else + return signal(sig, handler); + #endif + } proxy_service * FindProxyService ( *************** *** 164,177 **** --- 188,218 ---- char errorString[256]; IcePointer clientDataRet; + /* + * IceOpenConnection will do more than one write to the proxy. + * If the proxy closes the connection before the second write, + * the second write may generate a SIGPIPE (empirically this + * happens on at least AIX). So, temporarily ignore this signal. + */ + + Signal (SIGPIPE, SIG_IGN); + proxy_iceConn = IceOpenConnection( proxyAddress, NULL, False, pmOpcode, sizeof(errorString), errorString); + + Signal (SIGPIPE, SIG_DFL); + if (! proxy_iceConn) { printf("unable to open connection to unmanaged proxy \"%s\" at %s\n", serviceName, proxyAddress); return NULL; } + + /* + * Mark this fd to be closed upon exec + */ + SetCloseOnExec (IceConnectionNumber (proxy_iceConn)); /* See PMprotocolSetupProc */ pmConn = (PMconn *) malloc (sizeof (PMconn)); *** ./programs/xdm/auth.c@@/PUBLIC-LATEST Mon Feb 9 13:54:04 1998 --- xc/programs/xdm/auth.c Thu Feb 26 10:02:18 1998 *************** *** 1,4 **** ! /* $TOG: auth.c /main/63 1998/02/09 13:54:18 kaleb $ */ /* Copyright 1988, 1998 The Open Group --- 1,4 ---- ! /* $TOG: auth.c /main/64 1998/02/26 10:02:22 barstow $ */ /* Copyright 1988, 1998 The Open Group *************** *** 663,669 **** --- 663,672 ---- Xauth *auth; { char displayname[100]; + char tmp_displayname[100]; + strcpy(tmp_displayname, ""); + /* stolen from xinit.c */ /* Make sure this produces the same string as _XGetHostname in lib/X/XlibInt.c. *************** *** 689,694 **** --- 692,699 ---- strcpy(displayname, name.nodename); } writeAddr (FamilyLocal, strlen (displayname), displayname, file, auth); + + strcpy(tmp_displayname, displayname); #endif #if (!defined(NEED_UTSNAME) || defined (hpux)) *************** *** 702,710 **** * is achieved by using gethostname(). For compatability, we must * also still create the entry using uname() above. */ - gethostname(displayname, sizeof(displayname)); ! writeAddr (FamilyLocal, strlen (displayname), displayname, file, auth); #endif } --- 707,721 ---- * is achieved by using gethostname(). For compatability, we must * also still create the entry using uname() above. */ gethostname(displayname, sizeof(displayname)); ! ! /* ! * If gethostname and uname both returned the same name, ! * do not write a duplicate entry. ! */ ! if (strcmp (displayname, tmp_displayname)) ! writeAddr (FamilyLocal, strlen (displayname), displayname, ! file, auth); #endif } *** ./programs/xdm/dm.c@@/PUBLIC-LATEST Mon Feb 9 13:54:38 1998 --- xc/programs/xdm/dm.c Thu Apr 9 15:11:57 1998 *************** *** 1,4 **** ! /* $TOG: dm.c /main/72 1998/02/09 13:54:54 kaleb $ */ /* Copyright 1988, 1998 The Open Group --- 1,4 ---- ! /* $TOG: dm.c /main/73 1998/04/09 15:12:03 barstow $ */ /* Copyright 1988, 1998 The Open Group *************** *** 97,102 **** --- 97,104 ---- static SIGVAL ChildNotify (); #endif + static int parent_pid = -1; /* PID of parent xdm process */ + main (argc, argv) int argc; char **argv; *************** *** 157,162 **** --- 159,165 ---- #else Debug ("xdm: not compiled for XDMCP\n"); #endif + parent_pid = getpid (); (void) Signal (SIGTERM, StopAll); (void) Signal (SIGINT, StopAll); /* *************** *** 342,347 **** --- 345,364 ---- StopAll (n) int n; { + if (parent_pid != getpid()) + { + /* + * We are a child xdm process that was killed by the + * master xdm before we were able to return from fork() + * and remove this signal handler. + * + * See defect XWSog08655 for more information. + */ + Debug ("Child xdm caught SIGTERM before it remove that signal.\n"); + (void) Signal (n, SIG_DFL); + TerminateProcess (getpid(), SIGTERM); + return; + } Debug ("Shutting down entire manager\n"); #ifdef XDMCP DestroyWellKnownSockets (); *** ./programs/xdm/xdmcp.c@@/PUBLIC-LATEST Mon Feb 9 13:56:34 1998 --- xc/programs/xdm/xdmcp.c Thu Jun 4 11:50:37 1998 *************** *** 1,4 **** ! /* $TOG: xdmcp.c /main/17 1998/02/09 13:56:49 kaleb $ */ /* Copyright 1988, 1998 The Open Group --- 1,4 ---- ! /* $TOG: xdmcp.c /main/18 1998/06/04 11:50:41 barstow $ */ /* Copyright 1988, 1998 The Open Group *************** *** 526,531 **** --- 526,533 ---- memmove( (char *) &in_addr.sin_port, clientPort.data, 2); client = (struct sockaddr *) &in_addr; clientlen = sizeof (in_addr); + all_query_respond (client, clientlen, &authenticationNames, + FORWARD_QUERY); } break; #endif *************** *** 547,552 **** --- 549,556 ---- #else clientlen = sizeof (un_addr); #endif + all_query_respond (client, clientlen, &authenticationNames, + FORWARD_QUERY); } break; #endif *************** *** 559,566 **** goto badAddress; #endif } - all_query_respond (client, clientlen, &authenticationNames, - FORWARD_QUERY); } else { --- 563,568 ---- *** ./programs/xfs/Imakefile@@/PUBLIC-LATEST Tue Aug 5 09:01:56 1997 --- xc/programs/xfs/Imakefile Tue Jun 16 15:15:45 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imakefile /main/30 1997/08/05 09:00:19 kaleb $ #undef ServerDefines #include #define IHaveSubdirs --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/31 1998/06/16 15:16:14 msr $ #undef ServerDefines #include #define IHaveSubdirs *************** *** 26,32 **** FSLIBDIR = $(LIBDIR)/fs FSERRORS = $(FSLIBDIR)/fs-errors ! DEFAULTFONTPATH = DefaultFontPath SITE_CONFIG = -DDEFAULTFONTPATH=$(DEFAULTFONTPATH) -DFSERRORS=$(FSERRORS) all:: config --- 26,32 ---- FSLIBDIR = $(LIBDIR)/fs FSERRORS = $(FSLIBDIR)/fs-errors ! DEFAULTFONTPATH = DefaultFSFontPath SITE_CONFIG = -DDEFAULTFONTPATH=$(DEFAULTFONTPATH) -DFSERRORS=$(FSERRORS) all:: config *** ./programs/xfs/difs/Imakefile@@/PUBLIC-LATEST Wed Feb 9 17:20:10 1994 --- xc/programs/xfs/difs/Imakefile Tue Jun 16 15:19:58 1998 *************** *** 1,4 **** ! XCOMM $XConsortium: Imakefile,v 1.14 94/02/09 17:20:10 gildea Exp $ #undef ServerDefines #include --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/15 1998/06/16 15:20:22 msr $ #undef ServerDefines #include *************** *** 13,19 **** INCLUDES = -I../include -I$(FONTINCSRC) DEFINES = AllocateLocalDefines ! FONTDEFINES = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO #ifdef DefaultFSConfigFile DEFAULTCONFIGFILE = DefaultFSConfigFile CONFIGDEFINES = -DDEFAULT_CONFIG_FILE=\"$(DEFAULTCONFIGFILE)\" --- 13,24 ---- INCLUDES = -I../include -I$(FONTINCSRC) DEFINES = AllocateLocalDefines ! #if BuildLowMem ! LOWMEMDEFINES = -DLOWMEMFTPT ! #else ! LOWMEMDEFINES = ! #endif ! FONTDEFINES = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO $(LOWMEMDEFINES) #ifdef DefaultFSConfigFile DEFAULTCONFIGFILE = DefaultFSConfigFile CONFIGDEFINES = -DDEFAULT_CONFIG_FILE=\"$(DEFAULTCONFIGFILE)\" *** charinfo.c@@/PUBLIC-LATEST Wed Feb 11 10:01:56 1998 --- xc/programs/xfs/difs/charinfo.c Wed Apr 15 09:41:33 1998 *************** *** 1,4 **** ! /* $TOG: charinfo.c /main/17 1998/02/11 10:02:18 kaleb $ */ /* Copyright 1990, 1991, 1998 The Open Group --- 1,4 ---- ! /* $TOG: charinfo.c /main/18 1998/04/15 09:41:34 msr $ */ /* Copyright 1990, 1991, 1998 The Open Group *************** *** 258,264 **** int height, dstbpr, charsize; int dst_off, src_off; Bool contiguous, reformat; ! int nchars; int src_glyph_pad = pfont->glyph; int src_bit_order = pfont->bit; int src_byte_order = pfont->byte; --- 258,264 ---- int height, dstbpr, charsize; int dst_off, src_off; Bool contiguous, reformat; ! long nchars; int src_glyph_pad = pfont->glyph; int src_bit_order = pfont->bit; int src_byte_order = pfont->byte; *** ./programs/xfs/difs/fonts.c@@/PUBLIC-LATEST Wed Feb 11 10:02:30 1998 --- xc/programs/xfs/difs/fonts.c Thu May 28 15:41:51 1998 *************** *** 1,4 **** ! /* $TOG: fonts.c /main/28 1998/02/11 10:02:52 kaleb $ */ /* * font control */ --- 1,4 ---- ! /* $TOG: fonts.c /main/30 1998/05/28 15:48:12 kaleb $ */ /* * font control */ *************** *** 443,448 **** --- 443,452 ---- ids; int i; + if (namelen == 0 || namelen > XLFDMAXFONTNAMELEN) { + SendErrToClient(client, FSBadName, (pointer) 0); + return FSBadName; + } /* ** Check name cache. If we find a cached version of this font that ** is cachable, immediately satisfy the request with it. If we find *************** *** 887,893 **** * old state */ else if (err == FontNameAlias) { ! char tmp_pattern[256]; /* * when an alias recurses, we need to give * the last FPE a chance to clean up; so we call --- 891,897 ---- * old state */ else if (err == FontNameAlias) { ! char tmp_pattern[XLFDMAXFONTNAMELEN]; /* * when an alias recurses, we need to give * the last FPE a chance to clean up; so we call *************** *** 1041,1046 **** --- 1045,1061 ---- int i; LFclosurePtr c; + /* + * The right error to return here would be BadName, however the + * specification does not allow for a Name error on this request. + * Perhaps a better solution would be to return a nil list, i.e. + * a list containing zero fontnames. + */ + if (length > XLFDMAXFONTNAMELEN) { + SendErrToClient(client, FSBadAlloc, (pointer) 0); + return TRUE; + } + if (!(c = (LFclosurePtr) fsalloc(sizeof *c))) goto badAlloc; c->fpe_list = (FontPathElementPtr *) *************** *** 1315,1320 **** --- 1330,1346 ---- { int i; LFWXIclosurePtr c; + + /* + * The right error to return here would be BadName, however the + * specification does not allow for a Name error on this request. + * Perhaps a better solution would be to return a nil list, i.e. + * a list containing zero fontnames. + */ + if (length > XLFDMAXFONTNAMELEN) { + SendErrToClient(client, FSBadAlloc, (pointer) 0); + return TRUE; + } if (!(c = (LFWXIclosurePtr) fsalloc(sizeof *c))) goto badAlloc; *** ./programs/xfs/difs/initfonts.c@@/PUBLIC-LATEST Wed Feb 11 10:02:46 1998 --- xc/programs/xfs/difs/initfonts.c Tue Jun 16 15:20:26 1998 *************** *** 1,4 **** ! /* $TOG: initfonts.c /main/8 1998/02/11 10:03:07 kaleb $ */ /* Copyright 1987, 1998 The Open Group --- 1,4 ---- ! /* $TOG: initfonts.c /main/9 1998/06/16 15:20:49 msr $ */ /* Copyright 1987, 1998 The Open Group *************** *** 59,64 **** --- 59,73 ---- #ifdef FONT_PCF FontFileRegisterFpeFunctions(); + #ifdef LOWMEMFTPT + + #ifndef CRAY + SpeedoRegisterFontFileFunctions (); + Type1RegisterFontFileFunctions(); + #endif + + #endif /* ifdef LOWMEMFTPT */ + #endif #ifdef FONT_FS *** ./programs/xfs/include/closestr.h@@/PUBLIC-LATEST Wed Feb 11 10:03:15 1998 --- xc/programs/xfs/include/closestr.h Sun May 17 15:34:09 1998 *************** *** 1,4 **** ! /* $TOG: closestr.h /main/8 1998/02/11 10:03:36 kaleb $ */ /* Copyright 1987, 1998 The Open Group --- 1,4 ---- ! /* $TOG: closestr.h /main/9 1998/05/17 15:40:19 kaleb $ */ /* Copyright 1987, 1998 The Open Group *************** *** 98,105 **** /* ListFontsWithInfo */ typedef struct _LFWIstate { ! char pattern[256]; /* max len of font name */ int patlen; int current_fpe; int max_names; --- 98,106 ---- /* ListFontsWithInfo */ + #define XLFDMAXFONTNAMELEN 256 typedef struct _LFWIstate { ! char pattern[XLFDMAXFONTNAMELEN]; /* max len of font name */ int patlen; int current_fpe; int max_names; *** ./programs/xfwp/io.c@@/PUBLIC-LATEST Mon Feb 9 13:57:52 1998 --- xc/programs/xfwp/io.c Fri Mar 6 15:07:10 1998 *************** *** 1,4 **** ! /* $TOG: io.c /main/14 1998/02/09 13:58:06 kaleb $ */ /* Copyright "1986-1997, 1998 The Open Group --- 1,4 ---- ! /* $TOG: io.c /main/16 1998/03/06 15:05:34 barstow $ */ /* Copyright "1986-1997, 1998 The Open Group *************** *** 366,372 **** * close the PM connection * */ ! (void) fprintf(stderr, "PM failed config check\n"); IceCloseConnection(new_ice_conn); return; } --- 366,372 ---- * close the PM connection * */ ! (void) fprintf(stderr, "The Proxy Manager failed the configuration check\n"); IceCloseConnection(new_ice_conn); return; } *************** *** 1212,1220 **** if (!client_conn_array[fd_counter]) { /* ! * Impossible - right? */ - (void) fprintf (stderr, "input processing error\n"); return; } --- 1212,1220 ---- if (!client_conn_array[fd_counter]) { /* ! * This can happen if the client was marked as closed by ! * doProcessWritables. */ return; } *** ./programs/xieperf/modify.c@@/PUBLIC-LATEST Mon Feb 9 14:00:50 1998 --- xc/programs/xieperf/modify.c Tue Mar 31 09:18:08 1998 *************** *** 1,4 **** ! /* $TOG: modify.c /main/13 1998/02/09 14:01:05 kaleb $ */ /**** module modify.c ****/ /****************************************************************************** --- 1,4 ---- ! /* $TOG: modify.c /main/15 1998/03/31 09:30:54 mgreess $ */ /**** module modify.c ****/ /****************************************************************************** *************** *** 821,827 **** #if defined(SYSV) || defined(SVR4) || defined(__osf__) #define random lrand48 #endif ! #ifndef sgi extern long random(); #endif #define RAND( x, y ) ( ( random() / 2147483648.0 ) * ( y - x ) + x ) --- 821,827 ---- #if defined(SYSV) || defined(SVR4) || defined(__osf__) #define random lrand48 #endif ! #if !defined(sgi) && !defined(linux) extern long random(); #endif #define RAND( x, y ) ( ( random() / 2147483648.0 ) * ( y - x ) + x ) *** ./programs/xrx/Imakefile@@/PUBLIC-LATEST Fri Sep 27 10:01:41 1996 --- xc/programs/xrx/Imakefile Thu Feb 26 17:07:47 1998 *************** *** 1,15 **** ! XCOMM $XConsortium: Imakefile /main/8 1996/09/27 09:56:44 kaleb $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" ! #if BuildPlugin ! #if !VendorHasX11R6_3libXext LIBXPLUGINDIR = libxplugin #endif - PLUGINDIRS = plugin xnest-plugin - #endif ! SUBDIRS = $(LIBXPLUGINDIR) helper $(PLUGINDIRS) MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) --- 1,12 ---- ! XCOMM $TOG: Imakefile /main/10 1998/02/26 17:08:56 kaleb $ #define IHaveSubdirs #define PassCDebugFlags CDEBUGFLAGS="$(CDEBUGFLAGS)" ! #if BuildPlugin && !VendorHasX11R6_3libXext LIBXPLUGINDIR = libxplugin #endif ! SUBDIRS = $(LIBXPLUGINDIR) plugin MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) *** ./programs/xrx/helper/helper.c@@/PUBLIC-LATEST Tue Feb 10 18:29:23 1998 --- xc/programs/xrx/helper/helper.c Wed Feb 25 13:59:51 1998 *************** *** 1,4 **** ! /* $TOG: helper.c /main/18 1998/02/10 18:29:43 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: helper.c /main/19 1998/02/25 13:59:56 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 111,122 **** } /* process the given RxParams and make the RxReturnParams */ ! static void ProcessUIParams(Display *dpy, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char **x_ui_auth_ret) { ! char *fwp_dpyname; XSecurityAuthorization dum; char *x_ui_auth = NULL; Display *rdpy; --- 111,122 ---- } /* process the given RxParams and make the RxReturnParams */ ! static int ProcessUIParams(Display *dpy, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char **x_ui_auth_ret) { ! char *fwp_dpyname = NULL; XSecurityAuthorization dum; char *x_ui_auth = NULL; Display *rdpy; *************** *** 141,147 **** } /* let's see whether we have a firewall proxy */ ! fwp_dpyname = use_fwp ? GetXFwpDisplayName(DisplayString(rdpy)) : NULL; if (fwp_dpyname != NULL) { out->ui = GetXUrl(fwp_dpyname, x_ui_auth, in->action); --- 141,156 ---- } /* let's see whether we have a firewall proxy */ ! if (use_fwp) { ! fwp_dpyname = GetXFwpDisplayName(DisplayString(rdpy)); ! if (fwp_dpyname == NULL) ! /* ! * We were supposed to use the firewall proxy but we ! * couldn't get a connection. There is no need to ! * continue. ! */ ! return 1; ! } if (fwp_dpyname != NULL) { out->ui = GetXUrl(fwp_dpyname, x_ui_auth, in->action); *************** *** 180,189 **** XCloseDisplay(rdpy); *x_ui_auth_ret = x_ui_auth; } ! static void ProcessPrintParams(Display *dpy, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char *x_ui_auth) --- 189,200 ---- XCloseDisplay(rdpy); *x_ui_auth_ret = x_ui_auth; + + return 0; } ! static int ProcessPrintParams(Display *dpy, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char *x_ui_auth) *************** *** 191,197 **** char *printer = NULL; char *auth = NULL; XSecurityAuthorization dum; ! char *pfwp_dpyname; int dummy; pdpy = OpenXPrintDisplay(dpy, &printer); --- 202,208 ---- char *printer = NULL; char *auth = NULL; XSecurityAuthorization dum; ! char *pfwp_dpyname = NULL; int dummy; pdpy = OpenXPrintDisplay(dpy, &printer); *************** *** 198,204 **** if (pdpy == NULL) { fprintf(stderr, "Warning: Cannot setup X printer as requested, \ no server found\n"); ! return; } /* create a key only when the video server is not the print --- 209,215 ---- if (pdpy == NULL) { fprintf(stderr, "Warning: Cannot setup X printer as requested, \ no server found\n"); ! return 0; } /* create a key only when the video server is not the print *************** *** 219,225 **** &auth, &print_auth_id, &dummy); } /* let's see whether we have a firewall proxy */ ! pfwp_dpyname = use_fwp ? GetXFwpDisplayName(DisplayString(pdpy)) : NULL; if (pfwp_dpyname != NULL) { out->print = GetXPrintUrl(pfwp_dpyname, printer, auth, in->action); --- 230,245 ---- &auth, &print_auth_id, &dummy); } /* let's see whether we have a firewall proxy */ ! if (use_fwp) { ! pfwp_dpyname = GetXFwpDisplayName(DisplayString(pdpy)); ! if (pfwp_dpyname == NULL) ! /* ! * We were supposed to use the firewall proxy but we ! * couldn't get a connection. There is no need to ! * continue. ! */ ! return 1; ! } if (pfwp_dpyname != NULL) { out->print = GetXPrintUrl(pfwp_dpyname, printer, auth, in->action); *************** *** 264,269 **** --- 284,291 ---- if (printer != NULL) free(printer); + + return 0; } static int *************** *** 273,278 **** --- 295,301 ---- char *x_ui_auth = NULL; char webserver[MAXHOSTNAMELEN]; Boolean trusted, use_fwp, use_lbx; + int return_value = 0; /* init return struture */ memset(out, 0, sizeof(RxReturnParams)); *************** *** 293,307 **** &trusted, &use_fwp, &use_lbx); if (in->ui[0] == XUI) /* X display needed */ ! ProcessUIParams(dpy, trusted, use_fwp, use_lbx, in, out, &x_ui_auth); if (in->print[0] == XPrint) /* XPrint server needed */ ! ProcessPrintParams(dpy, trusted, use_fwp, use_lbx, in, out, x_ui_auth); if (x_ui_auth != NULL) free(x_ui_auth); ! return 0; } #define CONTENT_TYPE "Content-type" --- 316,332 ---- &trusted, &use_fwp, &use_lbx); if (in->ui[0] == XUI) /* X display needed */ ! return_value = ProcessUIParams(dpy, trusted, use_fwp, use_lbx, ! in, out, &x_ui_auth); if (in->print[0] == XPrint) /* XPrint server needed */ ! return_value = ProcessPrintParams(dpy, trusted, use_fwp, use_lbx, ! in, out, x_ui_auth); if (x_ui_auth != NULL) free(x_ui_auth); ! return return_value; } #define CONTENT_TYPE "Content-type" *** ./programs/xrx/libxplugin/Imakefile@@/PUBLIC-LATEST Sat Dec 7 17:13:30 1996 --- xc/programs/xrx/libxplugin/Imakefile Thu Mar 5 16:52:36 1998 *************** *** 1,4 **** ! XCOMM $XConsortium: Imakefile /main/7 1996/12/07 17:06:24 kaleb $ #if defined(SGIArchitecture) && (OSMajorVersion > 5) --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/12 1998/03/05 16:51:56 kaleb $ #if defined(SGIArchitecture) && (OSMajorVersion > 5) *************** *** 36,54 **** #define ObjectCompile(options) $(_NULLCMD_) XCOMM This is only necessary until Sun and HP ship libICE. ! #if defined(SunArchitecture) || defined(HPArchitecture) ICEOBJS = accept.o authutil.o connect.o error.o getauth.o \ iceauth.o listen.o listenwk.o locking.o misc.o \ ping.o process.o protosetup.o register.o replywait.o \ setauth.o shutdown.o transport.o watch.o #endif ! EXTOBJS = XSecurity.o XAppgroup.o OBJS = $(ICEOBJS) $(EXTOBJS) NormalLibraryTarget(xplugin,$(OBJS)) XCOMM This is only necessary until Sun and HP ship libICE. ! #if defined(SunArchitecture) || defined(HPArchitecture) accept.o:: RemoveFile($@) $(LN) $(ICESRC)/$@ . --- 36,64 ---- #define ObjectCompile(options) $(_NULLCMD_) XCOMM This is only necessary until Sun and HP ship libICE. ! #if defined(HPArchitecture) || defined(SunArchitecture) ! #if defined(HPArchitecture) || \ ! (defined(SunArchitecture) && \ ! OSMajorVersion == 4 || (OSMajorVerion == 5 && OSMinorVersion < 6)) ICEOBJS = accept.o authutil.o connect.o error.o getauth.o \ iceauth.o listen.o listenwk.o locking.o misc.o \ ping.o process.o protosetup.o register.o replywait.o \ setauth.o shutdown.o transport.o watch.o #endif ! #if defined(SunArchitecture) && OSMajorVersion == 4 ! SUNOSOBJS = extutil.o globals.o ! #endif ! #endif ! EXTOBJS = XSecurity.o XAppgroup.o $(SUNOSOBJS) OBJS = $(ICEOBJS) $(EXTOBJS) NormalLibraryTarget(xplugin,$(OBJS)) XCOMM This is only necessary until Sun and HP ship libICE. ! #if defined(HPArchitecture) || defined(SunArchitecture) ! #if defined(HPArchitecture) || \ ! (defined(SunArchitecture) && \ ! OSMajorVersion == 4 || (OSMajorVersion == 5 && OSMinorVersion < 6)) accept.o:: RemoveFile($@) $(LN) $(ICESRC)/$@ . *************** *** 124,129 **** --- 134,149 ---- watch.o:: RemoveFile($@) $(LN) $(ICESRC)/$@ . + #endif + #if defined(SunArchitecture) && OSMajorVersion == 4 + extutil.o:: + RemoveFile($@) + $(LN) $(XEXTLIBSRC)/$@ . + + globals.o:: + RemoveFile($@) + $(LN) $(XEXTLIBSRC)/$@ . + #endif #endif XSecurity.o:: *** ./programs/xrx/plugin/Imakefile@@/PUBLIC-LATEST Thu Dec 11 10:40:29 1997 --- xc/programs/xrx/plugin/Imakefile Tue Mar 10 10:45:10 1998 *************** *** 1,4 **** ! XCOMM $TOG: Imakefile /main/40 1997/12/11 10:40:09 kaleb $ XCOMM This isn't an option we must build a shared lib #define DoSharedLib YES --- 1,4 ---- ! XCOMM $TOG: Imakefile /main/44 1998/03/10 10:44:27 barstow $ XCOMM This isn't an option we must build a shared lib #define DoSharedLib YES *************** *** 47,53 **** --- 47,56 ---- */ #undef DefaultCCOptions #define DefaultCCOptions -Xc + #if OSMajorVersion == 4 + FUNCPROTO_DEFINES = -DXFUNCPROTO_NOT_AVAILABLE #endif + #endif #ifdef HPArchitecture /* Even though HP ships R6 in 10.20, Netscape 3.x is built on HPUX 9 and is *************** *** 69,75 **** #endif #ifdef IBMArchitecture ! # No clue when IBM might ship R6 XT_DEFINES = -DXUSE_XTREGISTERWINDOW #endif --- 72,78 ---- #endif #ifdef IBMArchitecture ! /* No clue when IBM might ship R6 */ XT_DEFINES = -DXUSE_XTREGISTERWINDOW #endif *************** *** 76,82 **** PLUGIN_DEFINES = -DXP_UNIX PLUGIN_INCLUDES = -I./include ! DEFINES = StrcasecmpDefines -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) $(XT_DEFINES) $(SOCKET_DEFINES) INCLUDES = -I. $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES) PARAMS_SRCS = PRead.c PParse.c BuildReq.c --- 79,85 ---- PLUGIN_DEFINES = -DXP_UNIX PLUGIN_INCLUDES = -I./include ! DEFINES = StrcasecmpDefines -DNETSCAPE_PLUGIN $(PLUGIN_DEFINES) $(XT_DEFINES) $(SOCKET_DEFINES) $(FUNCPROTO_DEFINES) INCLUDES = -I. $(PLUGIN_INCLUDES) $(RX_INCLUDES) $(VENDOR_INCLUDES) PARAMS_SRCS = PRead.c PParse.c BuildReq.c *************** *** 97,103 **** --- 100,112 ---- #ifdef SunArchitecture PLUGIN_LDOPTIONS = -L/usr/openwin/lib CCENVSETUP = + #if OSMajorVersion == 5 && OSMinorVersion > 5 + RXICELIB = $(ICELIB) #endif + #if OSMajorVersion == 4 + EXTENSIONLIB = + #endif + #endif #ifdef HPArchitecture #if OSMajorVersion < 10 || (OSMajorVersion == 10 && OSMinorVersion < 2) LDPRELIBS = -L/usr/lib/X11 *************** *** 105,110 **** --- 114,127 ---- LDPRELIBS = -L/usr/lib/X11R5 #endif #endif + #ifdef IBMArchitecture + XTOOLONLYLIB = -lXm -lXt + EXTENSIONLIB = -lXext + XONLYLIB = -lX11 + RXICELIB = $(ICELIB) + LDPOSTLIBS = + LDPRELIBS = + #endif #else PLUGIN_LDOPTIONS = $(LDPRELIBS) #endif *************** *** 114,124 **** RXICELIB = $(ICELIB) #endif - #ifdef SunArchitecture - #if OSMajorVersion == 5 && OSMinorVersion > 5 - RXICELIB = $(ICELIB) - #endif - #endif REQUIREDLIBS = $(X11R6_3_EXTENSIONS) $(PLUGIN_LDOPTIONS) $(RXICELIB) $(XTOOLONLYLIB) $(XLIB) --- 131,136 ---- *************** *** 134,136 **** --- 146,154 ---- DependTarget() InstallManPage(libxrx,$(MANDIR)) + + #ifdef IBMArchitecture + install:: shr.o + $(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) shr.o $(DESTDIR)$(SHLIBDIR)/lib$(LIBNAME).so + $(RM) $(DESTDIR)$(SHLIBDIR)/lib$(LIBNAME).a + #endif *** ./programs/xrx/plugin/Main.c@@/PUBLIC-LATEST Tue Feb 10 18:32:32 1998 --- xc/programs/xrx/plugin/Main.c Thu Mar 5 16:18:07 1998 *************** *** 1,4 **** ! /* $TOG: Main.c /main/19 1998/02/10 18:32:51 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: Main.c /main/20 1998/03/05 16:17:28 kaleb $ */ /* Copyright 1996, 1998 The Open Group *************** *** 381,388 **** StartApplication(This); } ! #if defined(linux) ! /* deficient linker semantics */ static WidgetClass xmLabelGadgetClass; static WidgetClass xmPushButtonGadgetClass; #else --- 381,388 ---- StartApplication(This); } ! #if defined(linux) || (defined(sun) && !defined(SVR4)) ! /* deficient linux linker semantics */ static WidgetClass xmLabelGadgetClass; static WidgetClass xmPushButtonGadgetClass; #else *************** *** 416,422 **** XrmPutStringResource (&db, "*Rx_Start.labelString", "Start"); XrmPutStringResource (&db, "RxPlugin_BeenHere", "YES"); } ! #if defined(linux) /* lame loader semantics mean we have to go fishing around to come up with widget class records so we can create some widgets. --- 416,422 ---- XrmPutStringResource (&db, "*Rx_Start.labelString", "Start"); XrmPutStringResource (&db, "RxPlugin_BeenHere", "YES"); } ! #if defined(linux) || (defined(sun) && !defined(SVR4)) /* lame loader semantics mean we have to go fishing around to come up with widget class records so we can create some widgets. *** ./programs/xrx/plugin/PProcess.c@@/PUBLIC-LATEST Tue Feb 10 18:32:44 1998 --- xc/programs/xrx/plugin/PProcess.c Wed Feb 25 14:00:02 1998 *************** *** 1,4 **** ! /* $TOG: PProcess.c /main/33 1998/02/10 18:33:03 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: PProcess.c /main/34 1998/02/25 14:00:05 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 702,708 **** * Process the given RxParams and make the RxReturnParams ***********************************************************************/ ! static void ProcessUIParams(PluginInstance* This, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char **x_ui_auth_ret) --- 702,708 ---- * Process the given RxParams and make the RxReturnParams ***********************************************************************/ ! static int ProcessUIParams(PluginInstance* This, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char **x_ui_auth_ret) *************** *** 801,808 **** RxGlobal.fwp_dpyname = GetXFwpDisplayName(display_name); if (RxGlobal.fwp_dpyname != NULL) RxGlobal.has_ui_fwp = RxTrue; ! else ! RxGlobal.has_ui_fwp = RxFalse; } if (use_fwp == True && RxGlobal.has_ui_fwp == RxTrue) out->ui = GetXUrl(RxGlobal.fwp_dpyname, *x_ui_auth_ret, in->action); --- 801,814 ---- RxGlobal.fwp_dpyname = GetXFwpDisplayName(display_name); if (RxGlobal.fwp_dpyname != NULL) RxGlobal.has_ui_fwp = RxTrue; ! else { ! /* ! * We were supposed to use the firewall proxy but we ! * couldn't get a connection. There is no need to ! * continue. ! */ ! return 1; ! } } if (use_fwp == True && RxGlobal.has_ui_fwp == RxTrue) out->ui = GetXUrl(RxGlobal.fwp_dpyname, *x_ui_auth_ret, in->action); *************** *** 833,841 **** out->x_ui_lbx = RxFalse; } else /* it's either RxFalse or RxUndef */ out->x_ui_lbx = in->x_ui_lbx; } ! static void ProcessPrintParams(PluginInstance* This, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char *x_ui_auth) --- 839,849 ---- out->x_ui_lbx = RxFalse; } else /* it's either RxFalse or RxUndef */ out->x_ui_lbx = in->x_ui_lbx; + + return 0; } ! static int ProcessPrintParams(PluginInstance* This, Boolean trusted, Boolean use_fwp, Boolean use_lbx, RxParams *in, RxReturnParams *out, char *x_ui_auth) *************** *** 868,874 **** if (RxGlobal.has_printer == RxFalse) { fprintf(stderr, "Warning: Cannot setup X printer as requested, \ no server found\n"); ! return; } /* create a key only when the video server is not the print --- 876,882 ---- if (RxGlobal.has_printer == RxFalse) { fprintf(stderr, "Warning: Cannot setup X printer as requested, \ no server found\n"); ! return 0; } /* create a key only when the video server is not the print *************** *** 890,897 **** RxGlobal.pfwp_dpyname = GetXFwpDisplayName(DisplayString(RxGlobal.pdpy)); if (RxGlobal.pfwp_dpyname != NULL) RxGlobal.has_print_fwp = RxTrue; ! else ! RxGlobal.has_print_fwp = RxFalse; } if (use_fwp == True && RxGlobal.has_print_fwp == RxTrue) out->print = GetXPrintUrl(RxGlobal.pfwp_dpyname, --- 898,911 ---- RxGlobal.pfwp_dpyname = GetXFwpDisplayName(DisplayString(RxGlobal.pdpy)); if (RxGlobal.pfwp_dpyname != NULL) RxGlobal.has_print_fwp = RxTrue; ! else { ! /* ! * We were supposed to use the firewall proxy but we ! * couldn't get a connection. There is no need to ! * continue. ! */ ! return 1; ! } } if (use_fwp == True && RxGlobal.has_print_fwp == RxTrue) out->print = GetXPrintUrl(RxGlobal.pfwp_dpyname, *************** *** 946,951 **** --- 960,967 ---- out->x_print_lbx = RxFalse; } else /* it's either RxFalse or RxUndef */ out->x_print_lbx = in->x_print_lbx; + + return 0; } int *************** *** 954,959 **** --- 970,976 ---- char *x_ui_auth = NULL; char webserver[MAXHOSTNAMELEN]; Boolean trusted, use_fwp, use_lbx; + int return_value = 0; #ifdef PLUGIN_TRACE fprintf (stderr, "%s\n", "RxpProcessParams"); *************** *** 983,996 **** &trusted, &use_fwp, &use_lbx); if (in->ui[0] == XUI) /* X display needed */ ! ProcessUIParams(This, trusted, use_fwp, use_lbx, in, out, &x_ui_auth); if (in->print[0] == XPrint) /* XPrint server needed */ ! ProcessPrintParams(This, trusted, use_fwp, use_lbx, in, out, x_ui_auth); if (x_ui_auth != NULL) NPN_MemFree(x_ui_auth); ! return 0; } --- 1000,1014 ---- &trusted, &use_fwp, &use_lbx); if (in->ui[0] == XUI) /* X display needed */ ! return_value = ProcessUIParams(This, trusted, use_fwp, use_lbx, ! in, out, &x_ui_auth); if (in->print[0] == XPrint) /* XPrint server needed */ ! return_value = ProcessPrintParams(This, trusted, use_fwp, use_lbx, in, out, x_ui_auth); if (x_ui_auth != NULL) NPN_MemFree(x_ui_auth); ! return return_value; } *** ./programs/xrx/rx/XAuth.c@@/PUBLIC-LATEST Tue Feb 10 18:36:34 1998 --- xc/programs/xrx/rx/XAuth.c Tue Mar 10 10:45:01 1998 *************** *** 1,4 **** ! /* $TOG: XAuth.c /main/11 1998/02/10 18:36:53 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: XAuth.c /main/12 1998/03/10 10:44:20 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 24,32 **** --- 24,37 ---- */ #include "RxI.h" + #ifdef XFUNCPROTO_NOT_AVAILABLE + #include + #endif #include #include + #ifndef XFUNCPROTO_NOT_AVAILABLE #include + #endif static void printhexdigit(char *ptr, unsigned int d) *** ./programs/xrx/rx/XDpyName.c@@/PUBLIC-LATEST Tue Feb 10 18:36:45 1998 --- xc/programs/xrx/rx/XDpyName.c Wed Feb 25 14:00:12 1998 *************** *** 1,4 **** ! /* $TOG: XDpyName.c /main/13 1998/02/10 18:37:04 kaleb $ */ /* Copyright 1996, 1998 The Open Group --- 1,4 ---- ! /* $TOG: XDpyName.c /main/14 1998/02/25 14:00:14 barstow $ */ /* Copyright 1996, 1998 The Open Group *************** *** 213,219 **** NULL, /* authprocs */ NULL /* IceIOErrorProc */ )) < 0) { fprintf (stderr, ! "Could not register PROXY_MANAGEMENT protocol with ICE"); return 0; } --- 213,219 ---- NULL, /* authprocs */ NULL /* IceIOErrorProc */ )) < 0) { fprintf (stderr, ! "Could not register PROXY_MANAGEMENT protocol with ICE\n"); return 0; } *************** *** 220,226 **** if ((ICECONN = IceOpenConnection ( manager, NULL, 0, 0, 256, errorString)) == NULL) { fprintf (stderr, ! "Could not open ICE connection to proxy manager: %s", errorString); return 0; } --- 220,226 ---- if ((ICECONN = IceOpenConnection ( manager, NULL, 0, 0, 256, errorString)) == NULL) { fprintf (stderr, ! "Could not open ICE connection to proxy manager\n (%s)\n", errorString); return 0; } *************** *** 233,239 **** if (setupstat != IceProtocolSetupSuccess) { IceCloseConnection (ICECONN); fprintf (stderr, ! "Could not initialize proxy management protocol: %s\n", errorString); fprintf (stderr, "%d\n", setupstat); return 0; --- 233,239 ---- if (setupstat != IceProtocolSetupSuccess) { IceCloseConnection (ICECONN); fprintf (stderr, ! "Could not initialize proxy management protocol\n (%s)\n", errorString); fprintf (stderr, "%d\n", setupstat); return 0; *** ./programs/xterm/charproc.c@@/PUBLIC-LATEST Thu Apr 9 15:36:00 1998 --- xc/programs/xterm/charproc.c Tue Apr 28 19:47:45 1998 *************** *** 1,5 **** /* ! * $TOG: charproc.c /main/198 1998/04/09 15:39:26 kaleb $ */ /* --- 1,5 ---- /* ! * $TOG: charproc.c /main/199 1998/04/28 19:52:29 kaleb $ */ /* *************** *** 2778,2785 **** fprintf(stderr,"Failed to create input context\n"); XCloseIM(xim); } - - return; } --- 2778,2783 ---- *************** *** 3209,3214 **** --- 3207,3217 ---- key_resources, (Cardinal)1, NULL, (Cardinal)0 ); if (keymap != NULL) XtOverrideTranslations(w, keymap); + + if (pmapName != mapName) { + (void) free (pmapName); + (void) free (pmapClass); + } } *** ./programs/xterm/main.c@@/PUBLIC-LATEST Mon Feb 9 14:16:58 1998 --- xc/programs/xterm/main.c Thu Apr 9 15:34:19 1998 *************** *** 1,5 **** #ifndef lint ! static char *rid="$TOG: main.c /main/250 1998/02/09 14:17:13 kaleb $"; #endif /* lint */ /* --- 1,5 ---- #ifndef lint ! static char *rid="$TOG: main.c /main/252 1998/04/09 15:39:15 kaleb $"; #endif /* lint */ /* *************** *** 120,126 **** #endif #ifdef linux ! #define USE_SYSV_TERMIO #define USE_SYSV_PGRP #define USE_SYSV_UTMP #define USE_SYSV_SIGNALS --- 120,126 ---- #endif #ifdef linux ! #define USE_TERMIOS #define USE_SYSV_PGRP #define USE_SYSV_UTMP #define USE_SYSV_SIGNALS *************** *** 987,993 **** --- 987,995 ---- #ifdef USE_TERMIOS /* { */ d_tio.c_cc[VSUSP] = CSUSP; + #ifdef VDSUSP d_tio.c_cc[VDSUSP] = CDSUSP; + #endif d_tio.c_cc[VREPRINT] = CRPRNT; d_tio.c_cc[VDISCARD] = CFLUSH; d_tio.c_cc[VWERASE] = CWERASE; *************** *** 1128,1134 **** --- 1130,1138 ---- #endif /* } TIOCSLTC */ #ifdef USE_TERMIOS /* { */ d_tio.c_cc[VSUSP] = CSUSP; + #ifdef VDSUSP d_tio.c_cc[VDSUSP] = '\000'; + #endif d_tio.c_cc[VREPRINT] = '\377'; d_tio.c_cc[VDISCARD] = '\377'; d_tio.c_cc[VWERASE] = '\377'; *************** *** 3251,3282 **** } while ( (pid=nonblocking_wait()) > 0); SIGNAL_RETURN; - } - - /* VARARGS1 */ - consolepr(fmt,x0,x1,x2,x3,x4,x5,x6,x7,x8,x9) - char *fmt; - { - extern char *SysErrorMsg(); - int oerrno; - int f; - char buf[ BUFSIZ ]; - - oerrno = errno; - strcpy(buf, "xterm: "); - sprintf(buf+strlen(buf), fmt, x0,x1,x2,x3,x4,x5,x6,x7,x8,x9); - strcat(buf, ": "); - strcat(buf, SysErrorMsg (oerrno)); - strcat(buf, "\n"); - f = open("/dev/console",O_WRONLY); - write(f, buf, strlen(buf)); - close(f); - #ifdef TIOCNOTTY - if ((f = open("/dev/tty", 2)) >= 0) { - ioctl(f, TIOCNOTTY, (char *)NULL); - close(f); - } - #endif /* TIOCNOTTY */ } --- 3255,3260 ---- *** ./programs/xterm/resize.c@@/PUBLIC-LATEST Wed May 24 22:12:04 1995 --- xc/programs/xterm/resize.c Wed Mar 25 08:57:36 1998 *************** *** 1,5 **** /* ! * $XConsortium: resize.c,v 1.34 95/05/24 22:12:04 gildea Exp $ */ /* --- 1,5 ---- /* ! * $TOG: resize.c /main/40 1998/03/25 09:00:16 kaleb $ */ /* *************** *** 59,65 **** #undef SYSV /* pretend to be bsd */ #endif /* macII */ ! #if defined(SYSV) || defined(linux) #define USE_SYSV_TERMIO #define USE_SYSV_UTMP #else /* else not SYSV */ --- 59,71 ---- #undef SYSV /* pretend to be bsd */ #endif /* macII */ ! #ifdef linux ! #define USE_TERMIOS ! #define USE_TERMINFO ! #define USE_SYSV_UTMP ! #endif ! ! #if defined(SYSV) #define USE_SYSV_TERMIO #define USE_SYSV_UTMP #else /* else not SYSV */ *************** *** 70,76 **** #ifdef USE_SYSV_TERMIO #include #else /* else not USE_SYSV_TERMIO */ ! #ifndef linux #include #endif #endif /* USE_SYSV_TERMIO */ --- 76,84 ---- #ifdef USE_SYSV_TERMIO #include #else /* else not USE_SYSV_TERMIO */ ! #ifdef USE_TERMIOS ! #include ! #else #include #endif #endif /* USE_SYSV_TERMIO */ *************** *** 159,165 **** --- 167,177 ---- #ifdef USE_SYSV_TERMIO struct termio tioorig; #else /* not USE_SYSV_TERMIO */ + # ifdef USE_TERMIOS + struct termios tioorig; + # else /* not USE_TERMIOS */ struct sgttyb sgorig; + #endif #endif /* USE_SYSV_TERMIO */ char *size[EMULATIONS] = { "\033[%d;%dR", *************** *** 197,203 **** --- 209,219 ---- #ifdef USE_SYSV_TERMIO struct termio tio; #else /* not USE_SYSV_TERMIO */ + #ifdef USE_TERMIOS + struct termios tio; + #else struct sgttyb sg; + #endif #endif /* USE_SYSV_TERMIO */ #ifdef USE_TERMCAP char termcap [1024]; *************** *** 318,327 **** --- 334,353 ---- tio.c_cc[VMIN] = 6; tio.c_cc[VTIME] = 1; #else /* else not USE_SYSV_TERMIO */ + #ifdef USE_TERMIOS + tcgetattr(tty, &tioorig); + tio = tioorig; + tio.c_iflag &= ~ICRNL; + tio.c_lflag &= ~(ICANON | ECHO); + tio.c_cflag |= CS8; + tio.c_cc[VMIN] = 6; + tio.c_cc[VTIME] = 1; + #else ioctl (tty, TIOCGETP, &sgorig); sg = sgorig; sg.sg_flags |= RAW; sg.sg_flags &= ~ECHO; + #endif #endif /* USE_SYSV_TERMIO */ signal(SIGINT, onintr); signal(SIGQUIT, onintr); *************** *** 329,335 **** --- 355,365 ---- #ifdef USE_SYSV_TERMIO ioctl (tty, TCSETAW, &tio); #else /* not USE_SYSV_TERMIO */ + #ifdef USE_TERMIOS + tcsetattr(tty, TCSADRAIN, &tio); + #else ioctl (tty, TIOCSETP, &sg); + #endif #endif /* USE_SYSV_TERMIO */ if (argc == 2) { *************** *** 386,392 **** --- 416,426 ---- #ifdef USE_SYSV_TERMIO ioctl (tty, TCSETAW, &tioorig); #else /* not USE_SYSV_TERMIO */ + #ifdef USE_TERMIOS + tcsetattr(tty, TCSADRAIN, &tioorig); + #else ioctl (tty, TIOCSETP, &sgorig); + #endif #endif /* USE_SYSV_TERMIO */ signal(SIGINT, SIG_DFL); signal(SIGQUIT, SIG_DFL); *************** *** 539,545 **** --- 573,583 ---- #ifdef USE_SYSV_TERMIO ioctl (tty, TCSETAW, &tioorig); #else /* not USE_SYSV_TERMIO */ + #ifdef USE_TERMIOS + tcsetattr (tty, TCSADRAIN, &tioorig); + #else /* not USE_TERMIOS */ ioctl (tty, TIOCSETP, &sgorig); + #endif #endif /* USE_SYSV_TERMIO */ exit(1); } *** ./registry@@/PUBLIC-LATEST Sun Nov 2 08:03:46 1997 --- xc/registry Fri Jun 26 15:26:24 1998 *************** *** 1,4 **** ! /* $TOG: registry /main/120 1997/11/02 08:06:38 kaleb $ */ X Registry --- 1,4 ---- ! /* $TOG: registry /main/121 1998/06/26 15:34:21 kaleb $ */ X Registry *************** *** 708,713 **** --- 708,721 ---- ISO Latin/Hebrew alphabet "ISO8859-9" [15],[12] ISO Latin alphabet No. 5 + "ISO8859-10" [15],[12] + ISO Latin alphabet No. 6 + "FCD8859-15" [7] + ISO Latin alphabet No. 9, Final Committee Draft + "ISO10646-1" [133] + Unicode Universal Multiple-Octet Coded Character Set + "ISO10646-MES" [133] + Unicode Minimum European Subset "JISX0201.1976-0" [38],[12] 8-Bit Alphanumeric-Katakana Code "JISX0208.1983-0" [40],[12] *************** *** 724,729 **** --- 732,738 ---- Supplementary Japanese Graphic Character Set, GL encoding "KOI8-R" [119] + Cyrillic alphabet "KSC5601.1987-0" [41],[12] Korean Graphic Character Set, GL encoding *************** *** 1061,1067 **** Todd Brunhoff, Tektronix [15] ISO 8859, Information processing - 8-bit single-byte coded graphic ! character sets, parts 1 through 9 [16] Inter-Client Communication Conventions Manual The Open Group X Project Team --- 1070,1076 ---- Todd Brunhoff, Tektronix [15] ISO 8859, Information processing - 8-bit single-byte coded graphic ! character sets, parts 1 through 10 [16] Inter-Client Communication Conventions Manual The Open Group X Project Team *************** *** 1643,1648 **** 11 Cambridge Center Cambridge MA 02142 ! [132] The Open Group X Project Team ! 11 Cambridge Center ! Cambridge MA 02142 --- 1652,1662 ---- 11 Cambridge Center Cambridge MA 02142 ! [133] ISO10646 Information technology -- Universal Multiple-Octet Coded ! Character Set (UCS), part 1 ! Markus G. Kuhn ! University of Cambridge ! Computer Laboratory ! New Museums Site, Pembroke Street ! Cambridge CB2 3QG ! United Kingdom *** ./fonts/bdf/100dpi/luBIS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:12 1994 --- xc/fonts/bdf/100dpi/luBIS08.bdf Sun Apr 19 15:21:35 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS08.bdf,v 1.7 94/04/02 16:22:12 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS08.bdf /main/8 1998/04/19 15:25:36 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1396,1401 **** --- 1396,1409 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBIS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:17 1994 --- xc/fonts/bdf/100dpi/luBIS10.bdf Sun Apr 19 15:21:43 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS10.bdf,v 1.7 94/04/02 16:22:17 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS10.bdf /main/8 1998/04/19 15:25:43 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1561,1566 **** --- 1561,1574 ---- 7080 C980 8700 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBIS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:47 1994 --- xc/fonts/bdf/100dpi/luBIS12.bdf Sun Apr 19 15:21:49 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS12.bdf,v 1.7 94/04/02 16:22:47 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS12.bdf /main/8 1998/04/19 15:25:49 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1742,1747 **** --- 1742,1755 ---- 7CC0 CF80 C780 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBIS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:49 1994 --- xc/fonts/bdf/100dpi/luBIS14.bdf Sun Apr 19 15:21:56 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS14.bdf,v 1.7 94/04/02 16:22:49 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS14.bdf /main/8 1998/04/19 15:25:56 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1920,1925 **** --- 1920,1933 ---- 4F60 C3E0 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBIS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:51 1994 --- xc/fonts/bdf/100dpi/luBIS18.bdf Sun Apr 19 15:22:02 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS18.bdf,v 1.7 94/04/02 16:22:51 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS18.bdf /main/8 1998/04/19 15:26:02 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2272,2277 **** --- 2272,2285 ---- E3FC E1FC C078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 9 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBIS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:54 1994 --- xc/fonts/bdf/100dpi/luBIS19.bdf Sun Apr 19 15:22:09 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS19.bdf,v 1.4 94/04/02 16:22:54 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS19.bdf /main/5 1998/04/19 15:26:09 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2358,2363 **** --- 2358,2371 ---- E1FE E0FC 0078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 9 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBIS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:22:57 1994 --- xc/fonts/bdf/100dpi/luBIS24.bdf Sun Apr 19 15:22:16 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS24.bdf,v 1.8 94/04/02 16:22:57 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS24.bdf /main/9 1998/04/19 15:26:16 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2880,2885 **** --- 2880,2893 ---- F07FE0 E01FE0 000F80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 12 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:01 1994 --- xc/fonts/bdf/100dpi/luBS08.bdf Sun Apr 19 15:22:23 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS08.bdf,v 1.7 94/04/02 16:23:01 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS08.bdf /main/8 1998/04/19 15:26:23 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1394,1399 **** --- 1394,1407 ---- 64 B4 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:04 1994 --- xc/fonts/bdf/100dpi/luBS10.bdf Sun Apr 19 15:22:29 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS10.bdf,v 1.7 94/04/02 16:23:04 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS10.bdf /main/8 1998/04/19 15:26:29 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1557,1562 **** --- 1557,1570 ---- 61 99 86 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:06 1994 --- xc/fonts/bdf/100dpi/luBS12.bdf Sun Apr 19 15:22:35 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS12.bdf,v 1.7 94/04/02 16:23:06 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS12.bdf /main/8 1998/04/19 15:26:35 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1739,1744 **** --- 1739,1752 ---- FCC0 CFC0 C380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:09 1994 --- xc/fonts/bdf/100dpi/luBS14.bdf Sun Apr 19 15:22:42 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS14.bdf,v 1.7 94/04/02 16:23:09 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS14.bdf /main/8 1998/04/19 15:26:42 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1923,1928 **** --- 1923,1936 ---- CF30 C3E0 C1E0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:12 1994 --- xc/fonts/bdf/100dpi/luBS18.bdf Sun Apr 19 15:22:48 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS18.bdf,v 1.7 94/04/02 16:23:12 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS18.bdf /main/8 1998/04/19 15:26:48 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2268,2273 **** --- 2268,2281 ---- E7FC E1F8 E0F0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 9 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:15 1994 --- xc/fonts/bdf/100dpi/luBS19.bdf Sun Apr 19 15:22:56 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS19.bdf,v 1.4 94/04/02 16:23:15 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS19.bdf /main/5 1998/04/19 15:26:56 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2356,2361 **** --- 2356,2369 ---- E3FC E0FC E078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 9 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luBS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:19 1994 --- xc/fonts/bdf/100dpi/luBS24.bdf Sun Apr 19 15:23:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS24.bdf,v 1.8 94/04/02 16:23:19 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS24.bdf /main/9 1998/04/19 15:27:03 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2873,2878 **** --- 2873,2886 ---- F9FFE0 F03FE0 F00F80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 12 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:22 1994 --- xc/fonts/bdf/100dpi/luIS08.bdf Sun Apr 19 15:23:10 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS08.bdf,v 1.7 94/04/02 16:23:22 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS08.bdf /main/8 1998/04/19 15:27:10 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1391,1396 **** --- 1391,1404 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:25 1994 --- xc/fonts/bdf/100dpi/luIS10.bdf Sun Apr 19 15:23:16 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS10.bdf,v 1.7 94/04/02 16:23:25 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS10.bdf /main/8 1998/04/19 15:27:16 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1560,1565 **** --- 1560,1573 ---- 7080 C980 8700 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:27 1994 --- xc/fonts/bdf/100dpi/luIS12.bdf Sun Apr 19 15:23:22 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS12.bdf,v 1.7 94/04/02 16:23:27 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS12.bdf /main/8 1998/04/19 15:27:22 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1734,1739 **** --- 1734,1747 ---- 7CC0 CF80 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:30 1994 --- xc/fonts/bdf/100dpi/luIS14.bdf Sun Apr 19 15:23:29 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS14.bdf,v 1.7 94/04/02 16:23:30 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS14.bdf /main/8 1998/04/19 15:27:29 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1929,1934 **** --- 1929,1942 ---- 7E30 C7E0 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:32 1994 --- xc/fonts/bdf/100dpi/luIS18.bdf Sun Apr 19 15:23:35 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS18.bdf,v 1.7 94/04/02 16:23:32 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS18.bdf /main/8 1998/04/19 15:27:35 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2237,2242 **** --- 2237,2250 ---- 638C C1FC C078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:36 1994 --- xc/fonts/bdf/100dpi/luIS19.bdf Sun Apr 19 15:23:42 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS19.bdf,v 1.4 94/04/02 16:23:36 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS19.bdf /main/5 1998/04/19 15:27:42 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2325,2330 **** --- 2325,2338 ---- 61C6 C0FC C038 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luIS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:39 1994 --- xc/fonts/bdf/100dpi/luIS24.bdf Sun Apr 19 15:23:49 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS24.bdf,v 1.7 94/04/02 16:23:39 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS24.bdf /main/8 1998/04/19 15:27:49 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2859,2864 **** --- 2859,2872 ---- 607FE0 E01FE0 000780 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:42 1994 --- xc/fonts/bdf/100dpi/luRS08.bdf Sun Apr 19 15:23:57 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS08.bdf,v 1.7 94/04/02 16:23:42 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS08.bdf /main/8 1998/04/19 15:27:57 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1388,1393 **** --- 1388,1401 ---- 64 B4 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:45 1994 --- xc/fonts/bdf/100dpi/luRS10.bdf Sun Apr 19 15:24:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS10.bdf,v 1.7 94/04/02 16:23:45 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS10.bdf /main/8 1998/04/19 15:28:03 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1552,1557 **** --- 1552,1565 ---- 61 99 86 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:48 1994 --- xc/fonts/bdf/100dpi/luRS12.bdf Sun Apr 19 15:24:08 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS12.bdf,v 1.7 94/04/02 16:23:48 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS12.bdf /main/8 1998/04/19 15:28:09 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1731,1736 **** --- 1731,1744 ---- FCC0 CFC0 C380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:51 1994 --- xc/fonts/bdf/100dpi/luRS14.bdf Sun Apr 19 15:24:15 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS14.bdf,v 1.7 94/04/02 16:23:51 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS14.bdf /main/8 1998/04/19 15:28:15 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1915,1920 **** --- 1915,1928 ---- FE30 C7E0 C1E0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:54 1994 --- xc/fonts/bdf/100dpi/luRS18.bdf Sun Apr 19 15:24:21 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS18.bdf,v 1.7 94/04/02 16:23:54 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS18.bdf /main/8 1998/04/19 15:28:21 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2233,2238 **** --- 2233,2246 ---- C398 C1F8 C070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:23:58 1994 --- xc/fonts/bdf/100dpi/luRS19.bdf Sun Apr 19 15:24:28 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS19.bdf,v 1.4 94/04/02 16:23:58 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS19.bdf /main/5 1998/04/19 15:28:28 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2319,2324 **** --- 2319,2332 ---- C3CC C0FC C078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/luRS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:02 1994 --- xc/fonts/bdf/100dpi/luRS24.bdf Sun Apr 19 15:24:35 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS24.bdf,v 1.8 94/04/02 16:24:02 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS24.bdf /main/9 1998/04/19 15:28:35 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2851,2856 **** --- 2851,2864 ---- E07FE0 E01FC0 000F80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:05 1994 --- xc/fonts/bdf/100dpi/lubB08.bdf Sun Apr 19 15:24:42 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB08.bdf,v 1.10 94/04/02 16:24:05 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB08.bdf /main/11 1998/04/19 15:28:42 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1456,1461 **** --- 1456,1469 ---- 64 B4 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:08 1994 --- xc/fonts/bdf/100dpi/lubB10.bdf Sun Apr 19 15:24:48 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB10.bdf,v 1.10 94/04/02 16:24:08 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB10.bdf /main/11 1998/04/19 15:28:48 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1557,1562 **** --- 1557,1570 ---- 61 99 86 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:10 1994 --- xc/fonts/bdf/100dpi/lubB12.bdf Sun Apr 19 15:24:55 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB12.bdf,v 1.10 94/04/02 16:24:10 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB12.bdf /main/11 1998/04/19 15:28:55 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1795,1800 **** --- 1795,1808 ---- 8840 8440 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:13 1994 --- xc/fonts/bdf/100dpi/lubB14.bdf Sun Apr 19 15:25:02 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB14.bdf,v 1.10 94/04/02 16:24:13 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB14.bdf /main/11 1998/04/19 15:29:02 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1979,1984 **** --- 1979,1992 ---- 4C10 8320 81E0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:16 1994 --- xc/fonts/bdf/100dpi/lubB18.bdf Sun Apr 19 15:25:09 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB18.bdf,v 1.10 94/04/02 16:24:16 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB18.bdf /main/11 1998/04/19 15:29:08 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2254,2259 **** --- 2254,2267 ---- 8388 81F8 8070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:19 1994 --- xc/fonts/bdf/100dpi/lubB19.bdf Sun Apr 19 15:25:16 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB19.bdf,v 1.4 94/04/02 16:24:19 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB19.bdf /main/5 1998/04/19 15:29:16 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2341,2346 **** --- 2341,2354 ---- C7C6 81FC 8078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubB24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:23 1994 --- xc/fonts/bdf/100dpi/lubB24.bdf Sun Apr 19 15:25:23 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB24.bdf,v 1.11 94/04/02 16:24:23 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB24.bdf /main/12 1998/04/19 15:29:23 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2858,2863 **** --- 2858,2871 ---- C07FE0 C01FC0 000F80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:29 1994 --- xc/fonts/bdf/100dpi/lubBI08.bdf Sun Apr 19 15:25:30 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI08.bdf,v 1.10 94/04/02 16:24:29 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI08.bdf /main/11 1998/04/19 15:29:30 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1459,1464 **** --- 1459,1472 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:32 1994 --- xc/fonts/bdf/100dpi/lubBI10.bdf Sun Apr 19 15:25:36 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI10.bdf,v 1.10 94/04/02 16:24:32 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI10.bdf /main/11 1998/04/19 15:29:36 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1561,1566 **** --- 1561,1574 ---- 71 99 8E + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:34 1994 --- xc/fonts/bdf/100dpi/lubBI12.bdf Sun Apr 19 15:25:42 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI12.bdf,v 1.10 94/04/02 16:24:34 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI12.bdf /main/11 1998/04/19 15:29:42 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1803,1808 **** --- 1803,1816 ---- 9840 8440 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:37 1994 --- xc/fonts/bdf/100dpi/lubBI14.bdf Sun Apr 19 15:25:49 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI14.bdf,v 1.10 94/04/02 16:24:37 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI14.bdf /main/11 1998/04/19 15:29:49 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1995,2000 **** --- 1995,2008 ---- 8610 8320 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:40 1994 --- xc/fonts/bdf/100dpi/lubBI18.bdf Sun Apr 19 15:25:56 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI18.bdf,v 1.11 94/04/02 16:24:40 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI18.bdf /main/12 1998/04/19 15:29:56 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2246,2251 **** --- 2246,2259 ---- 4184 81C8 8070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:43 1994 --- xc/fonts/bdf/100dpi/lubBI19.bdf Sun Apr 19 15:26:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI19.bdf,v 1.4 94/04/02 16:24:43 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI19.bdf /main/5 1998/04/19 15:30:03 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2351,2356 **** --- 2351,2364 ---- 41C2 80E4 8078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubBI24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:46 1994 --- xc/fonts/bdf/100dpi/lubBI24.bdf Sun Apr 19 15:26:10 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI24.bdf,v 1.11 94/04/02 16:24:46 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI24.bdf /main/12 1998/04/19 15:30:10 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2866,2871 **** --- 2866,2879 ---- 403C20 C01FE0 C00F80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:50 1994 --- xc/fonts/bdf/100dpi/lubI08.bdf Sun Apr 19 15:26:17 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI08.bdf,v 1.9 94/04/02 16:24:50 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI08.bdf /main/10 1998/04/19 15:30:17 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1458,1463 **** --- 1458,1471 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:53 1994 --- xc/fonts/bdf/100dpi/lubI10.bdf Sun Apr 19 15:26:24 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI10.bdf,v 1.9 94/04/02 16:24:53 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI10.bdf /main/10 1998/04/19 15:30:24 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1560,1565 **** --- 1560,1573 ---- 7080 9880 8700 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:55 1994 --- xc/fonts/bdf/100dpi/lubI12.bdf Sun Apr 19 15:26:31 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI12.bdf,v 1.9 94/04/02 16:24:55 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI12.bdf /main/10 1998/04/19 15:30:31 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1796,1801 **** --- 1796,1809 ---- 9840 8E40 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:24:58 1994 --- xc/fonts/bdf/100dpi/lubI14.bdf Sun Apr 19 15:26:37 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI14.bdf,v 1.9 94/04/02 16:24:58 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI14.bdf /main/10 1998/04/19 15:30:37 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1994,1999 **** --- 1994,2007 ---- 8610 8320 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:01 1994 --- xc/fonts/bdf/100dpi/lubI18.bdf Sun Apr 19 15:26:43 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI18.bdf,v 1.9 94/04/02 16:25:01 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI18.bdf /main/10 1998/04/19 15:30:44 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2236,2241 **** --- 2236,2249 ---- 83C4 80FC 8078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:04 1994 --- xc/fonts/bdf/100dpi/lubI19.bdf Sun Apr 19 15:26:50 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI19.bdf,v 1.4 94/04/02 16:25:04 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI19.bdf /main/5 1998/04/19 15:30:50 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2325,2330 **** --- 2325,2338 ---- 41C2 80FC 8038 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubI24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:08 1994 --- xc/fonts/bdf/100dpi/lubI24.bdf Sun Apr 19 15:26:57 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI24.bdf,v 1.10 94/04/02 16:25:08 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI24.bdf /main/11 1998/04/19 15:30:57 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2858,2863 **** --- 2858,2871 ---- C03C20 801FE0 800780 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 10 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:11 1994 --- xc/fonts/bdf/100dpi/lubR08.bdf Sun Apr 19 15:27:05 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR08.bdf,v 1.9 94/04/02 16:25:11 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR08.bdf /main/10 1998/04/19 15:31:04 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1454,1459 **** --- 1454,1467 ---- 64 B4 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:14 1994 --- xc/fonts/bdf/100dpi/lubR10.bdf Sun Apr 19 15:27:10 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR10.bdf,v 1.9 94/04/02 16:25:14 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR10.bdf /main/10 1998/04/19 15:31:10 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1554,1559 **** --- 1554,1567 ---- 61 99 86 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:16 1994 --- xc/fonts/bdf/100dpi/lubR12.bdf Sun Apr 19 15:27:16 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR12.bdf,v 1.9 94/04/02 16:25:16 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR12.bdf /main/10 1998/04/19 15:31:16 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1790,1795 **** --- 1790,1803 ---- 9840 8440 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:19 1994 --- xc/fonts/bdf/100dpi/lubR14.bdf Sun Apr 19 15:27:23 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR14.bdf,v 1.9 94/04/02 16:25:19 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR14.bdf /main/10 1998/04/19 15:31:23 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1977,1982 **** --- 1977,1990 ---- 8C10 8310 81E0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:22 1994 --- xc/fonts/bdf/100dpi/lubR18.bdf Sun Apr 19 15:27:29 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR18.bdf,v 1.9 94/04/02 16:25:22 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR18.bdf /main/10 1998/04/19 15:31:29 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2232,2237 **** --- 2232,2245 ---- 83C6 80FC 8078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:25 1994 --- xc/fonts/bdf/100dpi/lubR19.bdf Sun Apr 19 15:27:36 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR19.bdf,v 1.4 94/04/02 16:25:25 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR19.bdf /main/5 1998/04/19 15:31:35 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2321,2326 **** --- 2321,2334 ---- 83C6 80FC 8078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lubR24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:29 1994 --- xc/fonts/bdf/100dpi/lubR24.bdf Sun Apr 19 15:27:42 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR24.bdf,v 1.10 94/04/02 16:25:29 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR24.bdf /main/11 1998/04/19 15:31:42 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2847,2852 **** --- 2847,2860 ---- C03860 801FE0 800780 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 10 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:34 1994 --- xc/fonts/bdf/100dpi/lutBS08.bdf Sun Apr 19 15:27:49 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS08.bdf,v 1.8 94/04/02 16:25:34 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-11-80-100-100-M-70-ISO8859-1 SIZE 8 100 100 FONTBOUNDINGBOX 7 11 3 -2 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS08.bdf /main/9 1998/04/19 15:31:49 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-11-80-100-100-M-70-ISO8859-1 SIZE 8 100 100 FONTBOUNDINGBOX 7 11 3 -2 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1379,1384 **** --- 1379,1392 ---- BITMAP 64 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:37 1994 --- xc/fonts/bdf/100dpi/lutBS10.bdf Sun Apr 19 15:27:56 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS10.bdf,v 1.8 94/04/02 16:25:37 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-14-100-100-100-M-80-ISO8859-1 SIZE 10 100 100 FONTBOUNDINGBOX 9 16 4 -3 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS10.bdf /main/9 1998/04/19 15:31:55 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-14-100-100-100-M-80-ISO8859-1 SIZE 10 100 100 FONTBOUNDINGBOX 9 16 4 -3 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1547,1552 **** --- 1547,1560 ---- 62 92 8c + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:40 1994 --- xc/fonts/bdf/100dpi/lutBS12.bdf Sun Apr 19 15:28:01 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS12.bdf,v 1.8 94/04/02 16:25:40 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-17-120-100-100-M-100-ISO8859-1 SIZE 12 100 100 FONTBOUNDINGBOX 11 18 4 -3 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS12.bdf /main/9 1998/04/19 15:32:01 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-17-120-100-100-M-100-ISO8859-1 SIZE 12 100 100 FONTBOUNDINGBOX 11 18 4 -3 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1724,1729 **** --- 1724,1737 ---- 7980 ff80 cf00 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 10 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:42 1994 --- xc/fonts/bdf/100dpi/lutBS14.bdf Sun Apr 19 15:28:08 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS14.bdf,v 1.8 94/04/02 16:25:42 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-20-140-100-100-M-120-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 13 22 5 -4 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS14.bdf /main/9 1998/04/19 15:32:08 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-20-140-100-100-M-120-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 13 22 5 -4 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1907,1912 **** --- 1907,1920 ---- dec0 c780 c380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 12 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:45 1994 --- xc/fonts/bdf/100dpi/lutBS18.bdf Sun Apr 19 15:28:14 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS18.bdf,v 1.8 94/04/02 16:25:45 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-25-180-100-100-M-150-ISO8859-1 SIZE 18 100 100 FONTBOUNDINGBOX 17 28 6 -5 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS18.bdf /main/9 1998/04/19 15:32:14 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-25-180-100-100-M-150-ISO8859-1 SIZE 18 100 100 FONTBOUNDINGBOX 17 28 6 -5 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2246,2251 **** --- 2246,2259 ---- fff8 e7f0 e1e0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 15 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:47 1994 --- xc/fonts/bdf/100dpi/lutBS19.bdf Sun Apr 19 15:28:21 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS19.bdf,v 1.4 94/04/02 16:25:47 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-26-190-100-100-M-159-ISO8859-1 SIZE 19 100 100 FONTBOUNDINGBOX 17 29 6 -5 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS19.bdf /main/5 1998/04/19 15:32:21 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-26-190-100-100-M-159-ISO8859-1 SIZE 19 100 100 FONTBOUNDINGBOX 17 29 6 -5 *************** *** 25,31 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2336,2341 **** --- 2336,2349 ---- e7f0 e3f0 e1e0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 16 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutBS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:50 1994 --- xc/fonts/bdf/100dpi/lutBS24.bdf Sun Apr 19 15:28:29 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS24.bdf,v 1.8 94/04/02 16:25:50 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-34-240-100-100-M-200-ISO8859-1 SIZE 24 100 100 FONTBOUNDINGBOX 22 38 8 -7 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS24.bdf /main/9 1998/04/19 15:32:29 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-34-240-100-100-M-200-ISO8859-1 SIZE 24 100 100 FONTBOUNDINGBOX 22 38 8 -7 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2848,2853 **** --- 2848,2861 ---- e0ff80 e03f00 e01e00 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 20 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/100dpi/lutRS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:52 1994 --- xc/fonts/bdf/100dpi/lutRS08.bdf Sun Apr 19 16:04:53 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS08.bdf,v 1.8 94/04/02 16:25:52 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-11-80-100-100-M-70-ISO8859-1 SIZE 8 100 100 FONTBOUNDINGBOX 7 12 3 -2 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS08.bdf /main/10 1998/04/19 16:08:56 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-11-80-100-100-M-70-ISO8859-1 SIZE 8 100 100 FONTBOUNDINGBOX 7 12 3 -2 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1380,1385 **** --- 1380,1393 ---- 64 98 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2137,2144 **** 48 78 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 7 0 BBX 5 6 1 0 --- 2145,2152 ---- 48 78 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 7 0 BBX 5 6 1 0 *************** *** 2600,2607 **** cc 78 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 7 0 BBX 6 6 0 0 --- 2608,2615 ---- cc 78 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 7 0 BBX 6 6 0 0 *** ./fonts/bdf/100dpi/lutRS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:55 1994 --- xc/fonts/bdf/100dpi/lutRS10.bdf Sun Apr 19 16:05:04 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS10.bdf,v 1.8 94/04/02 16:25:55 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-14-100-100-100-M-80-ISO8859-1 SIZE 10 100 100 FONTBOUNDINGBOX 9 16 4 -3 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS10.bdf /main/10 1998/04/19 16:09:04 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-14-100-100-100-M-80-ISO8859-1 SIZE 10 100 100 FONTBOUNDINGBOX 9 16 4 -3 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1545,1550 **** --- 1545,1558 ---- 92 8c ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2409,2416 **** 42 3c ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 8 0 BBX 7 7 1 0 --- 2417,2424 ---- 42 3c ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 8 0 BBX 7 7 1 0 *************** *** 2939,2946 **** 44 38 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 8 0 BBX 7 7 1 0 --- 2947,2954 ---- 44 38 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 8 0 BBX 7 7 1 0 *** ./fonts/bdf/100dpi/lutRS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:25:57 1994 --- xc/fonts/bdf/100dpi/lutRS12.bdf Sun Apr 19 16:05:10 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS12.bdf,v 1.8 94/04/02 16:25:57 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-17-120-100-100-M-100-ISO8859-1 SIZE 12 100 100 FONTBOUNDINGBOX 11 18 5 -3 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS12.bdf /main/10 1998/04/19 16:09:10 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-17-120-100-100-M-100-ISO8859-1 SIZE 12 100 100 FONTBOUNDINGBOX 11 18 5 -3 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1710,1715 **** --- 1710,1723 ---- 8880 8700 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 10 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2666,2673 **** 6300 3e00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 10 0 BBX 7 9 2 0 --- 2674,2681 ---- 6300 3e00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 10 0 BBX 7 9 2 0 *************** *** 3276,3283 **** 6300 3e00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 10 0 BBX 9 9 1 0 --- 3284,3291 ---- 6300 3e00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 10 0 BBX 9 9 1 0 *** ./fonts/bdf/100dpi/lutRS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:26:00 1994 --- xc/fonts/bdf/100dpi/lutRS14.bdf Sun Apr 19 16:05:17 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS14.bdf,v 1.8 94/04/02 16:26:00 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-20-140-100-100-M-120-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 12 22 5 -4 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS14.bdf /main/10 1998/04/19 16:09:17 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-20-140-100-100-M-120-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 12 22 5 -4 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1899,1904 **** --- 1899,1912 ---- 8680 8380 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 12 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2969,2976 **** 3180 1f00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 12 0 BBX 10 11 1 0 --- 2977,2984 ---- 3180 1f00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 12 0 BBX 10 11 1 0 *************** *** 3665,3672 **** 7380 1e00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 12 0 BBX 10 11 1 0 --- 3673,3680 ---- 7380 1e00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 12 0 BBX 10 11 1 0 *** ./fonts/bdf/100dpi/lutRS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:26:03 1994 --- xc/fonts/bdf/100dpi/lutRS18.bdf Sun Apr 19 16:05:23 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS18.bdf,v 1.8 94/04/02 16:26:03 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-25-180-100-100-M-150-ISO8859-1 SIZE 18 100 100 FONTBOUNDINGBOX 16 28 6 -5 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS18.bdf /main/10 1998/04/19 16:09:23 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-25-180-100-100-M-150-ISO8859-1 SIZE 18 100 100 FONTBOUNDINGBOX 16 28 6 -5 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2218,2223 **** --- 2218,2231 ---- c3f0 c0e0 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 15 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 3481,3488 **** 1fe0 0fc0 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 15 0 BBX 13 13 1 0 --- 3489,3496 ---- 1fe0 0fc0 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 15 0 BBX 13 13 1 0 *************** *** 4284,4291 **** 3fe0 0f80 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 15 0 BBX 13 13 1 0 --- 4292,4299 ---- 3fe0 0f80 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 15 0 BBX 13 13 1 0 *** ./fonts/bdf/100dpi/lutRS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:26:06 1994 --- xc/fonts/bdf/100dpi/lutRS19.bdf Sun Apr 19 16:05:30 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS19.bdf,v 1.4 94/04/02 16:26:06 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-26-190-100-100-M-159-ISO8859-1 SIZE 19 100 100 FONTBOUNDINGBOX 16 29 7 -5 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS19.bdf /main/6 1998/04/19 16:09:30 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-26-190-100-100-M-159-ISO8859-1 SIZE 19 100 100 FONTBOUNDINGBOX 16 29 7 -5 *************** *** 25,31 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2304,2309 **** --- 2304,2317 ---- c3f0 c0e0 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 16 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 3608,3615 **** 1fe0 0fc0 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 16 0 BBX 13 14 1 0 --- 3616,3623 ---- 1fe0 0fc0 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 16 0 BBX 13 14 1 0 *************** *** 4443,4450 **** 3fe0 0f80 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 16 0 BBX 13 14 1 0 --- 4451,4458 ---- 3fe0 0f80 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 16 0 BBX 13 14 1 0 *** ./fonts/bdf/100dpi/lutRS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:26:09 1994 --- xc/fonts/bdf/100dpi/lutRS24.bdf Sun Apr 19 16:05:37 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS24.bdf,v 1.8 94/04/02 16:26:09 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-34-240-100-100-M-200-ISO8859-1 SIZE 24 100 100 FONTBOUNDINGBOX 20 38 9 -7 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS24.bdf /main/10 1998/04/19 16:09:37 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-34-240-100-100-M-200-ISO8859-1 SIZE 24 100 100 FONTBOUNDINGBOX 20 38 9 -7 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2830,2835 **** --- 2830,2843 ---- c07f80 c01e00 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 20 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 4414,4421 **** 0ffc00 03f000 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 20 0 BBX 17 18 2 0 --- 4422,4429 ---- 0ffc00 03f000 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 20 0 BBX 17 18 2 0 *************** *** 5416,5423 **** 1ffc00 07f000 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 20 0 BBX 18 18 1 0 --- 5424,5431 ---- 1ffc00 07f000 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 20 0 BBX 18 18 1 0 *** ./fonts/bdf/100dpi/ncenBI14.bdf@@/PUBLIC-LATEST Thu Jan 26 17:56:20 1995 --- xc/fonts/bdf/100dpi/ncenBI14.bdf Sun Apr 19 15:29:22 1998 *************** *** 2,8 **** FONT -Adobe-New Century Schoolbook-Bold-I-Normal--20-140-100-100-P-111-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 26 23 -5 -4 ! COMMENT $XConsortium: ncenBI14.bdf,v 1.7 95/01/26 17:56:20 gildea Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. --- 2,8 ---- FONT -Adobe-New Century Schoolbook-Bold-I-Normal--20-140-100-100-P-111-ISO8859-1 SIZE 14 100 100 FONTBOUNDINGBOX 26 23 -5 -4 ! COMMENT $TOG: ncenBI14.bdf /main/8 1998/04/19 15:33:22 kaleb $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. *************** *** 53,59 **** X_HEIGHT 9 _DEC_DEVICE_FONTNAMES "PS=NewCentruySchlbk-BoldItalic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 287 0 --- 53,59 ---- X_HEIGHT 9 _DEC_DEVICE_FONTNAMES "PS=NewCentruySchlbk-BoldItalic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 287 0 *************** *** 1878,1883 **** --- 1878,1891 ---- 78C0 FFC0 C780 + ENDCHAR + STARTCHAR noblankspace + ENCODING 160 + SWIDTH 287 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:38 1994 --- xc/fonts/bdf/75dpi/luBIS08.bdf Sun Apr 19 15:29:28 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS08.bdf,v 1.7 94/04/02 16:10:38 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS08.bdf /main/8 1998/04/19 15:33:28 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1219,1224 **** --- 1219,1232 ---- BITMAP E8 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS10.bdf@@/PUBLIC-LATEST Sat Apr 2 15:58:30 1994 --- xc/fonts/bdf/75dpi/luBIS10.bdf Sun Apr 19 15:29:34 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS10.bdf,v 1.8 94/04/02 15:58:30 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS10.bdf /main/9 1998/04/19 15:33:34 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1326,1331 **** --- 1326,1339 ---- BITMAP 74 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS12.bdf@@/PUBLIC-LATEST Sat Apr 2 15:58:32 1994 --- xc/fonts/bdf/75dpi/luBIS12.bdf Sun Apr 19 15:29:40 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS12.bdf,v 1.8 94/04/02 15:58:32 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS12.bdf /main/9 1998/04/19 15:33:39 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1486,1491 **** --- 1486,1499 ---- 72 FE 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS14.bdf@@/PUBLIC-LATEST Sat Apr 2 15:58:33 1994 --- xc/fonts/bdf/75dpi/luBIS14.bdf Sun Apr 19 15:29:45 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS14.bdf,v 1.8 94/04/02 15:58:33 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS14.bdf /main/9 1998/04/19 15:33:45 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1563,1568 **** --- 1563,1576 ---- 31 7E 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS18.bdf@@/PUBLIC-LATEST Sat Apr 2 15:58:34 1994 --- xc/fonts/bdf/75dpi/luBIS18.bdf Sun Apr 19 15:29:51 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS18.bdf,v 1.7 94/04/02 15:58:34 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS18.bdf /main/8 1998/04/19 15:33:51 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1819,1824 **** --- 1819,1832 ---- 78C0 FFC0 C780 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS19.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:22 1994 --- xc/fonts/bdf/75dpi/luBIS19.bdf Sun Apr 19 15:29:58 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS19.bdf,v 1.3 94/04/02 15:59:22 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS19.bdf /main/4 1998/04/19 15:33:58 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1898,1903 **** --- 1898,1911 ---- 4620 8360 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBIS24.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:24 1994 --- xc/fonts/bdf/75dpi/luBIS24.bdf Sun Apr 19 15:30:05 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBIS24.bdf,v 1.8 94/04/02 15:59:24 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBIS24.bdf /main/9 1998/04/19 15:34:04 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2206,2211 **** --- 2206,2219 ---- E3FC E1FC C078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS08.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:26 1994 --- xc/fonts/bdf/75dpi/luBS08.bdf Sun Apr 19 15:30:11 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS08.bdf,v 1.7 94/04/02 15:59:26 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS08.bdf /main/8 1998/04/19 15:34:11 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1216,1221 **** --- 1216,1229 ---- BITMAP E8 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS10.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:28 1994 --- xc/fonts/bdf/75dpi/luBS10.bdf Sun Apr 19 15:30:17 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS10.bdf,v 1.7 94/04/02 15:59:28 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS10.bdf /main/8 1998/04/19 15:34:16 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1331,1336 **** --- 1331,1344 ---- BITMAP 74 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS12.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:31 1994 --- xc/fonts/bdf/75dpi/luBS12.bdf Sun Apr 19 15:30:22 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS12.bdf,v 1.7 94/04/02 15:59:31 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS12.bdf /main/8 1998/04/19 15:34:22 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1480,1485 **** --- 1480,1493 ---- BITMAP 74 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS14.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:33 1994 --- xc/fonts/bdf/75dpi/luBS14.bdf Sun Apr 19 15:30:28 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS14.bdf,v 1.7 94/04/02 15:59:33 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS14.bdf /main/8 1998/04/19 15:34:28 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1560,1565 **** --- 1560,1573 ---- 72 BA 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS18.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:36 1994 --- xc/fonts/bdf/75dpi/luBS18.bdf Sun Apr 19 15:30:34 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS18.bdf,v 1.7 94/04/02 15:59:36 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS18.bdf /main/8 1998/04/19 15:34:34 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1823,1828 **** --- 1823,1836 ---- 7CC0 FFC0 CF80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS19.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:38 1994 --- xc/fonts/bdf/75dpi/luBS19.bdf Sun Apr 19 15:30:40 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS19.bdf,v 1.3 94/04/02 15:59:38 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS19.bdf /main/4 1998/04/19 15:34:40 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 1911,1916 **** --- 1911,1924 ---- CE60 C7C0 C3C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luBS24.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:41 1994 --- xc/fonts/bdf/75dpi/luBS24.bdf Sun Apr 19 15:30:47 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luBS24.bdf,v 1.7 94/04/02 15:59:41 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luBS24.bdf /main/8 1998/04/19 15:34:47 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 343 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 343 0 *************** *** 2201,2206 **** --- 2201,2214 ---- E7FC E1F8 E0F0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 343 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS08.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:44 1994 --- xc/fonts/bdf/75dpi/luIS08.bdf Sun Apr 19 15:30:53 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS08.bdf,v 1.7 94/04/02 15:59:44 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS08.bdf /main/8 1998/04/19 15:34:54 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1217,1222 **** --- 1217,1230 ---- BITMAP 68 B0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS10.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:46 1994 --- xc/fonts/bdf/75dpi/luIS10.bdf Sun Apr 19 15:30:59 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS10.bdf,v 1.7 94/04/02 15:59:46 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS10.bdf /main/8 1998/04/19 15:34:59 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1327,1332 **** --- 1327,1340 ---- BITMAP 64 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS12.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:48 1994 --- xc/fonts/bdf/75dpi/luIS12.bdf Sun Apr 19 15:31:05 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS12.bdf,v 1.7 94/04/02 15:59:48 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS12.bdf /main/8 1998/04/19 15:35:05 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1477,1482 **** --- 1477,1490 ---- BITMAP 72 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS14.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:51 1994 --- xc/fonts/bdf/75dpi/luIS14.bdf Sun Apr 19 15:31:11 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS14.bdf,v 1.7 94/04/02 15:59:51 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS14.bdf /main/8 1998/04/19 15:35:11 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1563,1568 **** --- 1563,1576 ---- 32 54 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS18.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:54 1994 --- xc/fonts/bdf/75dpi/luIS18.bdf Sun Apr 19 15:31:17 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS18.bdf,v 1.7 94/04/02 15:59:54 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS18.bdf /main/8 1998/04/19 15:35:17 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1813,1818 **** --- 1813,1826 ---- 7840 CCC0 8780 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS19.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:56 1994 --- xc/fonts/bdf/75dpi/luIS19.bdf Sun Apr 19 15:31:24 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS19.bdf,v 1.3 94/04/02 15:59:56 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS19.bdf /main/4 1998/04/19 15:35:24 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1908,1913 **** --- 1908,1921 ---- 4F20 C3E0 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luIS24.bdf@@/PUBLIC-LATEST Sat Apr 2 15:59:58 1994 --- xc/fonts/bdf/75dpi/luIS24.bdf Sun Apr 19 15:31:31 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luIS24.bdf,v 1.7 94/04/02 15:59:58 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luIS24.bdf /main/8 1998/04/19 15:35:31 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2176,2181 **** --- 2176,2189 ---- 41CC C0F8 C070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:02 1994 --- xc/fonts/bdf/75dpi/luRS08.bdf Sun Apr 19 15:31:37 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS08.bdf,v 1.7 94/04/02 16:00:02 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS08.bdf /main/8 1998/04/19 15:35:37 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1213,1218 **** --- 1213,1226 ---- BITMAP E8 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:04 1994 --- xc/fonts/bdf/75dpi/luRS10.bdf Sun Apr 19 15:31:43 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS10.bdf,v 1.7 94/04/02 16:00:04 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS10.bdf /main/8 1998/04/19 15:35:43 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1328,1333 **** --- 1328,1341 ---- BITMAP 64 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:06 1994 --- xc/fonts/bdf/75dpi/luRS12.bdf Sun Apr 19 15:31:49 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS12.bdf,v 1.7 94/04/02 16:00:06 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS12.bdf /main/8 1998/04/19 15:35:49 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1474,1479 **** --- 1474,1487 ---- BITMAP 72 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:09 1994 --- xc/fonts/bdf/75dpi/luRS14.bdf Sun Apr 19 15:31:55 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS14.bdf,v 1.7 94/04/02 16:00:09 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS14.bdf /main/8 1998/04/19 15:35:55 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1559,1564 **** --- 1559,1572 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:11 1994 --- xc/fonts/bdf/75dpi/luRS18.bdf Sun Apr 19 15:32:01 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS18.bdf,v 1.7 94/04/02 16:00:11 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS18.bdf /main/8 1998/04/19 15:36:01 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1809,1814 **** --- 1809,1822 ---- 7080 9C80 8700 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:14 1994 --- xc/fonts/bdf/75dpi/luRS19.bdf Sun Apr 19 15:32:08 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS19.bdf,v 1.3 94/04/02 16:00:14 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS19.bdf /main/4 1998/04/19 15:36:07 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 1905,1910 **** --- 1905,1918 ---- CE60 C7C0 C1C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/luRS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:17 1994 --- xc/fonts/bdf/75dpi/luRS24.bdf Sun Apr 19 15:32:13 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: luRS24.bdf,v 1.7 94/04/02 16:00:17 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: luRS24.bdf /main/8 1998/04/19 15:36:13 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 316 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 316 0 *************** *** 2170,2175 **** --- 2170,2183 ---- C398 C1F8 C070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 316 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:19 1994 --- xc/fonts/bdf/75dpi/lubB08.bdf Sun Apr 19 15:32:20 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB08.bdf,v 1.10 94/04/02 16:00:19 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB08.bdf /main/11 1998/04/19 15:36:20 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1215,1220 **** --- 1215,1228 ---- BITMAP E8 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:21 1994 --- xc/fonts/bdf/75dpi/lubB10.bdf Sun Apr 19 15:32:26 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB10.bdf,v 1.10 94/04/02 16:00:21 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB10.bdf /main/11 1998/04/19 15:36:26 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1369,1374 **** --- 1369,1382 ---- BITMAP E4 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:24 1994 --- xc/fonts/bdf/75dpi/lubB12.bdf Sun Apr 19 15:32:31 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB12.bdf,v 1.10 94/04/02 16:00:24 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB12.bdf /main/11 1998/04/19 15:36:31 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1455,1460 **** --- 1455,1468 ---- BITMAP 72 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:26 1994 --- xc/fonts/bdf/75dpi/lubB14.bdf Sun Apr 19 15:32:37 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB14.bdf,v 1.10 94/04/02 16:00:26 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB14.bdf /main/11 1998/04/19 15:36:37 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1557,1562 **** --- 1557,1570 ---- 61 99 86 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:28 1994 --- xc/fonts/bdf/75dpi/lubB18.bdf Sun Apr 19 15:32:43 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB18.bdf,v 1.10 94/04/02 16:00:28 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB18.bdf /main/11 1998/04/19 15:36:43 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1798,1803 **** --- 1798,1811 ---- 8840 8440 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:31 1994 --- xc/fonts/bdf/75dpi/lubB19.bdf Sun Apr 19 15:32:50 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB19.bdf,v 1.3 94/04/02 16:00:31 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB19.bdf /main/4 1998/04/19 15:36:50 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1902,1907 **** --- 1902,1915 ---- 4C20 8640 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubB24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:34 1994 --- xc/fonts/bdf/75dpi/lubB24.bdf Sun Apr 19 15:32:57 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubB24.bdf,v 1.10 94/04/02 16:00:34 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubB24.bdf /main/11 1998/04/19 15:36:57 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2188,2193 **** --- 2188,2201 ---- 8388 81F8 8070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:37 1994 --- xc/fonts/bdf/75dpi/lubBI08.bdf Sun Apr 19 15:33:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI08.bdf,v 1.10 94/04/02 16:00:37 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI08.bdf /main/11 1998/04/19 15:37:03 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1217,1222 **** --- 1217,1230 ---- BITMAP 62 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:39 1994 --- xc/fonts/bdf/75dpi/lubBI10.bdf Sun Apr 19 15:33:09 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI10.bdf,v 1.10 94/04/02 16:00:39 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI10.bdf /main/11 1998/04/19 15:37:09 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1370,1375 **** --- 1370,1383 ---- BITMAP 44 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:42 1994 --- xc/fonts/bdf/75dpi/lubBI12.bdf Sun Apr 19 15:33:15 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI12.bdf,v 1.10 94/04/02 16:00:42 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI12.bdf /main/11 1998/04/19 15:37:14 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1458,1463 **** --- 1458,1471 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:44 1994 --- xc/fonts/bdf/75dpi/lubBI14.bdf Sun Apr 19 15:33:20 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI14.bdf,v 1.10 94/04/02 16:00:44 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI14.bdf /main/11 1998/04/19 15:37:20 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1561,1566 **** --- 1561,1574 ---- 71 99 8E + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:46 1994 --- xc/fonts/bdf/75dpi/lubBI18.bdf Sun Apr 19 15:33:26 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI18.bdf,v 1.10 94/04/02 16:00:46 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI18.bdf /main/11 1998/04/19 15:37:26 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1802,1807 **** --- 1802,1815 ---- 4C20 8640 8380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:48 1994 --- xc/fonts/bdf/75dpi/lubBI19.bdf Sun Apr 19 15:33:32 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI19.bdf,v 1.3 94/04/02 16:00:48 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI19.bdf /main/4 1998/04/19 15:37:32 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1909,1914 **** --- 1909,1922 ---- 8610 8320 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubBI24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:51 1994 --- xc/fonts/bdf/75dpi/lubBI24.bdf Sun Apr 19 15:33:38 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubBI24.bdf,v 1.10 94/04/02 16:00:51 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubBI24.bdf /main/11 1998/04/19 15:37:38 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Demibold Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2183,2188 **** --- 2183,2196 ---- 4184 80C8 8070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 8 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:53 1994 --- xc/fonts/bdf/75dpi/lubI08.bdf Sun Apr 19 15:33:45 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI08.bdf,v 1.9 94/04/02 16:00:53 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI08.bdf /main/10 1998/04/19 15:37:45 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1216,1221 **** --- 1216,1229 ---- BITMAP 64 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 2 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:55 1994 --- xc/fonts/bdf/75dpi/lubI10.bdf Sun Apr 19 15:33:51 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI10.bdf,v 1.9 94/04/02 16:00:55 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI10.bdf /main/10 1998/04/19 15:37:51 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1368,1373 **** --- 1368,1381 ---- BITMAP 71 8E + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:57 1994 --- xc/fonts/bdf/75dpi/lubI12.bdf Sun Apr 19 15:33:57 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI12.bdf,v 1.9 94/04/02 16:00:57 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI12.bdf /main/10 1998/04/19 15:37:56 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1453,1458 **** --- 1453,1466 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:00:59 1994 --- xc/fonts/bdf/75dpi/lubI14.bdf Sun Apr 19 15:34:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI14.bdf,v 1.9 94/04/02 16:00:59 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI14.bdf /main/10 1998/04/19 15:38:02 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1560,1565 **** --- 1560,1573 ---- 7080 9880 8700 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:41 1994 --- xc/fonts/bdf/75dpi/lubI18.bdf Sun Apr 19 15:34:08 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI18.bdf,v 1.9 94/04/02 16:10:41 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI18.bdf /main/10 1998/04/19 15:38:08 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1798,1803 **** --- 1798,1811 ---- 8C20 8640 83C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:43 1994 --- xc/fonts/bdf/75dpi/lubI19.bdf Sun Apr 19 15:34:14 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI19.bdf,v 1.3 94/04/02 16:10:43 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI19.bdf /main/4 1998/04/19 15:38:14 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1905,1910 **** --- 1905,1918 ---- 8610 8320 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubI24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:46 1994 --- xc/fonts/bdf/75dpi/lubI24.bdf Sun Apr 19 15:34:20 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubI24.bdf,v 1.9 94/04/02 16:10:46 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubI24.bdf /main/10 1998/04/19 15:38:21 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright Italic" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2175,2180 **** --- 2175,2188 ---- 81C4 80FC 8078 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:49 1994 --- xc/fonts/bdf/75dpi/lubR08.bdf Sun Apr 19 15:34:28 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR08.bdf,v 1.9 94/04/02 16:10:49 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR08.bdf /main/10 1998/04/19 15:38:28 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1214,1219 **** --- 1214,1227 ---- BITMAP E8 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 2 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:52 1994 --- xc/fonts/bdf/75dpi/lubR10.bdf Sun Apr 19 15:34:33 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR10.bdf,v 1.9 94/04/02 16:10:52 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR10.bdf /main/10 1998/04/19 15:38:33 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1366,1371 **** --- 1366,1379 ---- BITMAP 72 8E + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:54 1994 --- xc/fonts/bdf/75dpi/lubR12.bdf Sun Apr 19 15:34:39 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR12.bdf,v 1.9 94/04/02 16:10:54 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR12.bdf /main/10 1998/04/19 15:38:39 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1450,1455 **** --- 1450,1463 ---- 62 92 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:57 1994 --- xc/fonts/bdf/75dpi/lubR14.bdf Sun Apr 19 15:34:45 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR14.bdf,v 1.9 94/04/02 16:10:57 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR14.bdf /main/10 1998/04/19 15:38:45 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1554,1559 **** --- 1554,1567 ---- 61 99 86 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:10:59 1994 --- xc/fonts/bdf/75dpi/lubR18.bdf Sun Apr 19 15:34:50 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR18.bdf,v 1.9 94/04/02 16:10:59 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR18.bdf /main/10 1998/04/19 15:38:50 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1795,1800 **** --- 1795,1808 ---- 8C20 8620 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:02 1994 --- xc/fonts/bdf/75dpi/lubR19.bdf Sun Apr 19 15:34:57 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR19.bdf,v 1.3 94/04/02 16:11:02 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR19.bdf /main/4 1998/04/19 15:38:57 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 1901,1906 **** --- 1901,1914 ---- 8420 8220 81C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lubR24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:05 1994 --- xc/fonts/bdf/75dpi/lubR24.bdf Sun Apr 19 15:35:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lubR24.bdf,v 1.9 94/04/02 16:11:05 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lubR24.bdf /main/10 1998/04/19 15:39:03 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 30,36 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 333 0 --- 30,36 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Bright" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 333 0 *************** *** 2165,2170 **** --- 2165,2178 ---- 8104 8088 8070 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 333 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:33 1994 --- xc/fonts/bdf/75dpi/lutBS08.bdf Sun Apr 19 15:35:09 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS08.bdf,v 1.9 94/04/02 16:11:33 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-8-80-75-75-M-50-ISO8859-1 SIZE 8 72 72 FONTBOUNDINGBOX 5 10 2 -2 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS08.bdf /main/10 1998/04/19 15:39:09 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-8-80-75-75-M-50-ISO8859-1 SIZE 8 72 72 FONTBOUNDINGBOX 5 10 2 -2 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1207,1212 **** --- 1207,1220 ---- BITMAP d0 b0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:08 1994 --- xc/fonts/bdf/75dpi/lutBS10.bdf Sun Apr 19 15:35:15 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS10.bdf,v 1.9 94/04/02 16:11:08 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS10.bdf /main/10 1998/04/19 15:39:15 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1332,1337 **** --- 1332,1345 ---- BITMAP 74 B8 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:11 1994 --- xc/fonts/bdf/75dpi/lutBS12.bdf Sun Apr 19 15:35:20 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS12.bdf,v 1.9 94/04/02 16:11:11 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS12.bdf /main/10 1998/04/19 15:39:20 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1482,1487 **** --- 1482,1495 ---- 64 B4 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:15 1994 --- xc/fonts/bdf/75dpi/lutBS14.bdf Sun Apr 19 15:35:27 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS14.bdf,v 1.9 94/04/02 16:11:15 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS14.bdf /main/10 1998/04/19 15:39:27 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1558,1563 **** --- 1558,1571 ---- 72 BA 9C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 9 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:18 1994 --- xc/fonts/bdf/75dpi/lutBS18.bdf Sun Apr 19 15:35:32 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS18.bdf,v 1.9 94/04/02 16:11:18 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS18.bdf /main/10 1998/04/19 15:39:32 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1820,1825 **** --- 1820,1833 ---- 7CC0 DEC0 CF80 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:36 1994 --- xc/fonts/bdf/75dpi/lutBS19.bdf Sun Apr 19 15:35:39 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS19.bdf,v 1.3 94/04/02 16:11:36 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-19-190-75-75-M-110-ISO8859-1 SIZE 19 72 72 FONTBOUNDINGBOX 13 22 5 -4 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS19.bdf /main/4 1998/04/19 15:39:38 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-19-190-75-75-M-110-ISO8859-1 SIZE 19 72 72 FONTBOUNDINGBOX 13 22 5 -4 *************** *** 25,31 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1894,1899 **** --- 1894,1907 ---- 7cc0 cf80 c380 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutBS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:38 1994 --- xc/fonts/bdf/75dpi/lutBS24.bdf Sun Apr 19 15:35:45 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutBS24.bdf,v 1.9 94/04/02 16:11:38 gildea Exp $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-24-240-75-75-M-140-ISO8859-1 SIZE 24 72 72 FONTBOUNDINGBOX 15 26 6 -5 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutBS24.bdf /main/10 1998/04/19 15:39:45 kaleb $ FONT -B&H-LucidaTypewriter-Bold-R-Normal-Sans-24-240-75-75-M-140-ISO8859-1 SIZE 24 72 72 FONTBOUNDINGBOX 15 26 6 -5 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter Bold" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2180,2185 **** --- 2180,2193 ---- cf30 c3e0 c1c0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 14 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/lutRS08.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:41 1994 --- xc/fonts/bdf/75dpi/lutRS08.bdf Sun Apr 19 16:05:45 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS08.bdf,v 1.9 94/04/02 16:11:41 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-8-80-75-75-M-50-ISO8859-1 SIZE 8 72 72 FONTBOUNDINGBOX 5 10 2 -2 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS08.bdf /main/11 1998/04/19 16:09:45 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-8-80-75-75-M-50-ISO8859-1 SIZE 8 72 72 FONTBOUNDINGBOX 5 10 2 -2 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1205,1210 **** --- 1205,1218 ---- d0 b0 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 5 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 1874,1881 **** 90 60 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 5 0 BBX 5 4 0 0 --- 1882,1889 ---- 90 60 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 5 0 BBX 5 4 0 0 *************** *** 2272,2279 **** 90 60 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 5 0 BBX 4 4 0 0 --- 2280,2287 ---- 90 60 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 5 0 BBX 4 4 0 0 *** ./fonts/bdf/75dpi/lutRS10.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:22 1994 --- xc/fonts/bdf/75dpi/lutRS10.bdf Sun Apr 19 16:05:51 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS10.bdf,v 1.9 94/04/02 16:11:22 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS10.bdf /main/11 1998/04/19 16:09:51 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1329,1334 **** --- 1329,1342 ---- 64 98 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 6 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2072,2079 **** 48 30 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 6 0 BBX 5 5 1 1 --- 2080,2087 ---- 48 30 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 6 0 BBX 5 5 1 1 *************** *** 2566,2573 **** 90 60 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 6 0 BBX 5 5 1 1 --- 2574,2581 ---- 90 60 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 6 0 BBX 5 5 1 1 *** ./fonts/bdf/75dpi/lutRS12.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:24 1994 --- xc/fonts/bdf/75dpi/lutRS12.bdf Sun Apr 19 16:05:57 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS12.bdf,v 1.9 94/04/02 16:11:24 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS12.bdf /main/11 1998/04/19 16:09:57 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1474,1479 **** --- 1474,1487 ---- 72 9C ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2300,2307 **** 48 30 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 7 0 BBX 5 5 1 2 --- 2308,2315 ---- 48 30 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 7 0 BBX 5 5 1 2 *************** *** 2838,2845 **** 88 70 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 7 0 BBX 7 7 0 1 --- 2846,2853 ---- 88 70 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 7 0 BBX 7 7 0 1 *** ./fonts/bdf/75dpi/lutRS14.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:27 1994 --- xc/fonts/bdf/75dpi/lutRS14.bdf Sun Apr 19 16:06:03 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS14.bdf,v 1.9 94/04/02 16:11:27 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS14.bdf /main/11 1998/04/19 16:10:03 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1558,1563 **** --- 1558,1571 ---- 92 8C ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 9 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2449,2456 **** 44 38 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 9 0 BBX 6 6 2 2 --- 2457,2464 ---- 44 38 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 9 0 BBX 6 6 2 2 *************** *** 3024,3031 **** 44 38 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 9 0 BBX 7 7 1 1 --- 3032,3039 ---- 44 38 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 9 0 BBX 7 7 1 1 *** ./fonts/bdf/75dpi/lutRS18.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:30 1994 --- xc/fonts/bdf/75dpi/lutRS18.bdf Sun Apr 19 16:06:08 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS18.bdf,v 1.9 94/04/02 16:11:30 gildea Exp $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS18.bdf /main/11 1998/04/19 16:10:08 kaleb $ COMMENT (c) Copyright Bigelow & Holmes 1986, 1985. Lucida is a registered COMMENT trademark of Bigelow & Holmes. See LEGAL NOTICE file for terms COMMENT of the license. *************** *** 31,37 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 31,37 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1812,1817 **** --- 1812,1825 ---- 9C80 8700 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2832,2839 **** 3300 1E00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 11 0 BBX 7 7 2 2 --- 2840,2847 ---- 3300 1E00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 11 0 BBX 7 7 2 2 *************** *** 3480,3487 **** 7700 1C00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 11 0 BBX 9 9 1 1 --- 3488,3495 ---- 7700 1C00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 11 0 BBX 9 9 1 1 *** ./fonts/bdf/75dpi/lutRS19.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:44 1994 --- xc/fonts/bdf/75dpi/lutRS19.bdf Sun Apr 19 16:06:15 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS19.bdf,v 1.3 94/04/02 16:11:44 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-19-190-75-75-M-110-ISO8859-1 SIZE 19 72 72 FONTBOUNDINGBOX 12 22 5 -4 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS19.bdf /main/5 1998/04/19 16:10:15 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-19-190-75-75-M-110-ISO8859-1 SIZE 19 72 72 FONTBOUNDINGBOX 12 22 5 -4 *************** *** 25,31 **** DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- DEFAULT_CHAR 0 FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 1877,1882 **** --- 1877,1890 ---- 8480 8380 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 11 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 2928,2935 **** 3300 1e00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 11 0 BBX 10 10 1 0 --- 2936,2943 ---- 3300 1e00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 11 0 BBX 10 10 1 0 *************** *** 3584,3591 **** 6180 1e00 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 11 0 BBX 10 10 1 0 --- 3592,3599 ---- 6180 1e00 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 11 0 BBX 10 10 1 0 *** ./fonts/bdf/75dpi/lutRS24.bdf@@/PUBLIC-LATEST Sat Apr 2 16:11:46 1994 --- xc/fonts/bdf/75dpi/lutRS24.bdf Sun Apr 19 16:06:21 1998 *************** *** 1,5 **** STARTFONT 2.1 ! COMMENT $XConsortium: lutRS24.bdf,v 1.9 94/04/02 16:11:46 gildea Exp $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-24-240-75-75-M-140-ISO8859-1 SIZE 24 72 72 FONTBOUNDINGBOX 15 27 7 -5 --- 1,5 ---- STARTFONT 2.1 ! COMMENT $TOG: lutRS24.bdf /main/11 1998/04/19 16:10:21 kaleb $ FONT -B&H-LucidaTypewriter-Medium-R-Normal-Sans-24-240-75-75-M-140-ISO8859-1 SIZE 24 72 72 FONTBOUNDINGBOX 15 27 7 -5 *************** *** 25,31 **** COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 602 0 --- 25,31 ---- COPYRIGHT "Copyright Bigelow & Holmes 1986, 1985." FACE_NAME "Lucida Sans Typewriter" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 602 0 *************** *** 2153,2158 **** --- 2153,2166 ---- 8320 81c0 ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 602 0 + DWIDTH 14 0 + BBX 1 1 0 0 + BITMAP + 00 + ENDCHAR STARTCHAR exclamdown ENCODING 161 SWIDTH 602 0 *************** *** 3357,3364 **** 38e0 0f80 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 14 0 BBX 12 13 1 0 --- 3365,3372 ---- 38e0 0f80 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 14 0 BBX 12 13 1 0 *************** *** 4128,4135 **** 30c0 1f80 ENDCHAR ! STARTCHAR divide ! ENCODING 247 SWIDTH 602 0 DWIDTH 14 0 BBX 12 13 1 0 --- 4136,4143 ---- 30c0 1f80 ENDCHAR ! STARTCHAR multiply ! ENCODING 215 SWIDTH 602 0 DWIDTH 14 0 BBX 12 13 1 0 *** ./fonts/bdf/75dpi/ncenR12.bdf@@/PUBLIC-LATEST Thu Jan 26 18:04:45 1995 --- xc/fonts/bdf/75dpi/ncenR12.bdf Sun Apr 19 15:36:35 1998 *************** *** 2,8 **** FONT -Adobe-New Century Schoolbook-Medium-R-Normal--12-120-75-75-P-70-ISO8859-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 15 -2 -3 ! COMMENT $XConsortium: ncenR12.bdf,v 1.15 95/01/26 18:04:45 gildea Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. --- 2,8 ---- FONT -Adobe-New Century Schoolbook-Medium-R-Normal--12-120-75-75-P-70-ISO8859-1 SIZE 12 75 75 FONTBOUNDINGBOX 17 15 -2 -3 ! COMMENT $TOG: ncenR12.bdf /main/16 1998/04/19 15:40:35 kaleb $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. *************** *** 53,59 **** X_HEIGHT 6 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 278 0 --- 53,59 ---- X_HEIGHT 6 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 278 0 *************** *** 1462,1467 **** --- 1462,1475 ---- BITMAP 64 98 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 278 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/ncenR14.bdf@@/PUBLIC-LATEST Thu Jan 26 18:04:50 1995 --- xc/fonts/bdf/75dpi/ncenR14.bdf Sun Apr 19 15:36:42 1998 *************** *** 2,8 **** FONT -Adobe-New Century Schoolbook-Medium-R-Normal--14-140-75-75-P-82-ISO8859-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 17 -2 -3 ! COMMENT $XConsortium: ncenR14.bdf,v 1.14 95/01/26 18:04:50 gildea Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. --- 2,8 ---- FONT -Adobe-New Century Schoolbook-Medium-R-Normal--14-140-75-75-P-82-ISO8859-1 SIZE 14 75 75 FONTBOUNDINGBOX 20 17 -2 -3 ! COMMENT $TOG: ncenR14.bdf /main/15 1998/04/19 15:40:42 kaleb $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. *************** *** 53,59 **** X_HEIGHT 7 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 228 STARTCHAR space ENCODING 32 SWIDTH 278 0 --- 53,59 ---- X_HEIGHT 7 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 229 STARTCHAR space ENCODING 32 SWIDTH 278 0 *************** *** 1611,1616 **** --- 1611,1624 ---- BITMAP 72 8C + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 278 0 + DWIDTH 3 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/ncenR18.bdf@@/PUBLIC-LATEST Thu Jan 26 18:04:54 1995 --- xc/fonts/bdf/75dpi/ncenR18.bdf Sun Apr 19 15:36:49 1998 *************** *** 2,8 **** FONT -Adobe-New Century Schoolbook-Medium-R-Normal--18-180-75-75-P-103-ISO8859-1 SIZE 18 75 75 FONTBOUNDINGBOX 22 22 -3 -4 ! COMMENT $XConsortium: ncenR18.bdf,v 1.13 95/01/26 18:04:54 gildea Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. --- 2,8 ---- FONT -Adobe-New Century Schoolbook-Medium-R-Normal--18-180-75-75-P-103-ISO8859-1 SIZE 18 75 75 FONTBOUNDINGBOX 22 22 -3 -4 ! COMMENT $TOG: ncenR18.bdf /main/14 1998/04/19 15:40:49 kaleb $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. *************** *** 53,59 **** X_HEIGHT 9 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 278 0 --- 53,59 ---- X_HEIGHT 9 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 *************** *** 1861,1866 **** --- 1861,1874 ---- 38C0 6D80 C700 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 278 0 + DWIDTH 4 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/75dpi/ncenR24.bdf@@/PUBLIC-LATEST Thu Jan 26 18:04:57 1995 --- xc/fonts/bdf/75dpi/ncenR24.bdf Sun Apr 19 15:36:55 1998 *************** *** 2,8 **** FONT -Adobe-New Century Schoolbook-Medium-R-Normal--24-240-75-75-P-137-ISO8859-1 SIZE 24 75 75 FONTBOUNDINGBOX 28 28 -2 -5 ! COMMENT $XConsortium: ncenR24.bdf,v 1.13 95/01/26 18:04:57 gildea Exp $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. --- 2,8 ---- FONT -Adobe-New Century Schoolbook-Medium-R-Normal--24-240-75-75-P-137-ISO8859-1 SIZE 24 75 75 FONTBOUNDINGBOX 28 28 -2 -5 ! COMMENT $TOG: ncenR24.bdf /main/14 1998/04/19 15:40:55 kaleb $ COMMENT COMMENT + COMMENT Copyright 1984-1989, 1994 Adobe Systems Incorporated. *************** *** 53,59 **** X_HEIGHT 12 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 190 STARTCHAR space ENCODING 32 SWIDTH 278 0 --- 53,59 ---- X_HEIGHT 12 _DEC_DEVICE_FONTNAMES "PS=NewCenturySchlbk-Roman" ENDPROPERTIES ! CHARS 191 STARTCHAR space ENCODING 32 SWIDTH 278 0 *************** *** 2193,2198 **** --- 2193,2206 ---- 7E70 E7E0 C3C0 + ENDCHAR + STARTCHAR nobreakspace + ENCODING 160 + SWIDTH 278 0 + DWIDTH 7 0 + BBX 1 1 0 0 + BITMAP + 00 ENDCHAR STARTCHAR exclamdown ENCODING 161 *** ./fonts/bdf/misc/Imakefile@@/PUBLIC-LATEST Fri Oct 18 16:07:16 1996 --- xc/fonts/bdf/misc/Imakefile Wed May 20 15:04:51 1998 *************** *** 1,7 **** ! XCOMM $XConsortium: Imakefile /main/35 1996/10/18 16:05:43 rws $ OBJS = FontObj(5x7) FontObj(5x8) FontObj(6x9) FontObj(6x10) FontObj(6x12) \ ! FontObj(6x13) FontObj(6x13B) FontObj(7x13) FontObj(7x13B) FontObj(8x13) \ ! FontObj(8x13B) FontObj(9x15) FontObj(9x15B) FontObj(10x20) \ FontObj(cursor) FontObj(deccurs) FontObj(decsess) FontObj(olcursor) \ FontObj(olgl10) FontObj(olgl12) FontObj(olgl14) FontObj(olgl19) \ FontObj(nil2) FontObj(clB6x10) FontObj(clB6x12) FontObj(clB8x10) \ --- 1,8 ---- ! XCOMM $TOG: Imakefile /main/36 1998/05/20 15:10:33 kaleb $ OBJS = FontObj(5x7) FontObj(5x8) FontObj(6x9) FontObj(6x10) FontObj(6x12) \ ! FontObj(6x13) FontObj(6x13B) FontObj(7x13) FontObj(7x13B) \ ! FontObj(7x13euro) FontObj(7x13euroB) FontObj(8x13) FontObj(8x13B) \ ! FontObj(9x15) FontObj(9x15B) FontObj(10x20) \ FontObj(cursor) FontObj(deccurs) FontObj(decsess) FontObj(olcursor) \ FontObj(olgl10) FontObj(olgl12) FontObj(olgl14) FontObj(olgl19) \ FontObj(nil2) FontObj(clB6x10) FontObj(clB6x12) FontObj(clB8x10) \ *************** *** 32,37 **** --- 33,40 ---- FontTarget(6x13B) FontTarget(7x13) FontTarget(7x13B) + FontTarget(7x13euro) + FontTarget(7x13euroB) FontTarget(8x13) FontTarget(8x13B) FontTarget(9x15) *** ./fonts/bdf/misc/fonts.alias@@/PUBLIC-LATEST Mon Apr 11 12:28:00 1994 --- xc/fonts/bdf/misc/fonts.alias Wed May 20 15:04:55 1998 *************** *** 1,4 **** ! ! $XConsortium: fonts.alias,v 1.31 94/04/11 12:28:00 gildea Exp $ fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 --- 1,4 ---- ! ! $TOG: fonts.alias /main/32 1998/05/20 15:10:37 kaleb $ fixed -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 variable -*-helvetica-bold-r-normal-*-*-120-*-*-*-*-iso8859-1 5x7 -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 *************** *** 10,15 **** --- 10,17 ---- 6x13bold -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 7x13 -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 7x13bold -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 + 7x13euro -misc-fixed-medium-r-normal--13-120-75-75-c-70-fcd8859-15 + 7x13eurobold -misc-fixed-bold-r-normal--13-120-75-75-c-70-fcd8859-15 7x14 -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 7x14bold -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 8x13 -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 *** /dev/null Sat Jun 27 09:30:10 1998 --- xc/fonts/bdf/misc/7x13euro.bdf Mon Jun 15 16:51:10 1998 *************** *** 0 **** --- 1,4529 ---- + STARTFONT 2.1 + COMMENT $TOG: 7x13euro.bdf /main/3 1998/06/15 16:58:20 kaleb $ + COMMENT + COMMENT Copyright (c) 1990 Stephen Gildea + COMMENT + COMMENT Permission to use, copy, modify, and distribute this software for + COMMENT any purpose is hereby granted without fee, provided that the above + COMMENT copyright notice and this permission notice appear in all copies. + COMMENT The authors make no representations about the suitability of this + COMMENT software for any purpose. It is provided "as is" without express + COMMENT or implied warranty. + COMMENT + COMMENT Designed by Stephen Gildea + COMMENT Original design November 1989. + COMMENT Current version June 1990. + COMMENT + COMMENT Characters above 127 designed and made by + COMMENT Thomas Bagli (pyramid!pcsbst!tom@uunet.UU.NET) + COMMENT PCS Computer Systeme, West Germany + COMMENT + FONT -Misc-Fixed-Medium-R-Normal--13-120-75-75-C-70-FCD8859-15 + SIZE 13 78 78 + FONTBOUNDINGBOX 7 13 0 -2 + STARTPROPERTIES 22 + FONTNAME_REGISTRY "" + FOUNDRY "Misc" + FAMILY_NAME "Fixed" + WEIGHT_NAME "Medium" + SLANT "R" + SETWIDTH_NAME "Normal" + ADD_STYLE_NAME "" + PIXEL_SIZE 13 + POINT_SIZE 120 + RESOLUTION_X 75 + RESOLUTION_Y 75 + SPACING "C" + AVERAGE_WIDTH 70 + CHARSET_REGISTRY "FCD8859" + CHARSET_ENCODING "15" + UNDERLINE_POSITION -1 + DESTINATION 1 + DEFAULT_CHAR 0 + FONT_DESCENT 2 + FONT_ASCENT 11 + DATE "May 1998" + _XMBDFED_INFO "Edited with xmbdfed 3.0." + ENDPROPERTIES + CHARS 224 + STARTCHAR Error + ENCODING 0 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + 78 + 78 + 78 + 78 + 78 + 78 + 78 + 78 + 78 + 78 + 00 + ENDCHAR + STARTCHAR C001 + ENCODING 1 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 20 + 70 + f8 + 70 + 20 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C002 + ENCODING 2 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + a8 + 54 + a8 + 54 + a8 + 54 + a8 + 54 + a8 + 54 + a8 + 54 + ENDCHAR + STARTCHAR HT + ENCODING 3 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 90 + 90 + f0 + 90 + 90 + 1c + 08 + 08 + 08 + 08 + 00 + ENDCHAR + STARTCHAR FF + ENCODING 4 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f0 + 80 + e0 + 80 + 80 + 3c + 20 + 38 + 20 + 20 + 00 + ENDCHAR + STARTCHAR CR + ENCODING 5 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 80 + 80 + 80 + 70 + 38 + 24 + 38 + 28 + 24 + 00 + ENDCHAR + STARTCHAR LF + ENCODING 6 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 80 + 80 + 80 + 80 + f0 + 3c + 20 + 38 + 20 + 20 + 00 + ENDCHAR + STARTCHAR Degree + ENCODING 7 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 88 + 88 + 70 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR Plus/Minus + ENCODING 8 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 20 + 20 + f8 + 20 + 20 + 00 + f8 + 00 + 00 + 00 + ENDCHAR + STARTCHAR NL + ENCODING 9 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 90 + d0 + b0 + 90 + 90 + 20 + 20 + 20 + 20 + 3c + 00 + ENDCHAR + STARTCHAR VT + ENCODING 10 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 88 + 88 + 50 + 50 + 20 + 7c + 10 + 10 + 10 + 10 + 00 + ENDCHAR + STARTCHAR C013 + ENCODING 11 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + f0 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C014 + ENCODING 12 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + f0 + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR C015 + ENCODING 13 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 1e + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR C016 + ENCODING 14 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + 1e + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C017 + ENCODING 15 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + fe + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR C020 + ENCODING 16 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fe + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C021 + ENCODING 17 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + fe + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C022 + ENCODING 18 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + fe + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C023 + ENCODING 19 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + fe + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C024 + ENCODING 20 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + fe + 00 + 00 + ENDCHAR + STARTCHAR C025 + ENCODING 21 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + 1e + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR C026 + ENCODING 22 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + f0 + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR C027 + ENCODING 23 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + fe + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C030 + ENCODING 24 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + fe + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR C031 + ENCODING 25 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + ENDCHAR + STARTCHAR <= + ENCODING 26 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 04 + 18 + 60 + 80 + 60 + 18 + 04 + fc + 00 + 00 + ENDCHAR + STARTCHAR >= + ENCODING 27 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 80 + 60 + 18 + 04 + 18 + 60 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR Pi + ENCODING 28 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + fc + 48 + 48 + 48 + 48 + 88 + 00 + 00 + ENDCHAR + STARTCHAR Not Equal + ENCODING 29 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 04 + 08 + fc + 10 + 20 + fc + 40 + 80 + 00 + 00 + ENDCHAR + STARTCHAR Pound Sterling + ENCODING 30 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 44 + 40 + 40 + e0 + 40 + 40 + 44 + b8 + 00 + 00 + ENDCHAR + STARTCHAR Cdot + ENCODING 31 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 10 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR Space + ENCODING 32 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR ! + ENCODING 33 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 00 + 10 + 00 + 00 + ENDCHAR + STARTCHAR " + ENCODING 34 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 28 + 28 + 28 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR # + ENCODING 35 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 28 + 28 + 7c + 28 + 7c + 28 + 28 + 00 + 00 + 00 + ENDCHAR + STARTCHAR $ + ENCODING 36 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 10 + 3c + 50 + 38 + 14 + 78 + 10 + 00 + 00 + 00 + ENDCHAR + STARTCHAR % + ENCODING 37 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 44 + a4 + 48 + 10 + 10 + 20 + 48 + 94 + 88 + 00 + 00 + ENDCHAR + STARTCHAR & + ENCODING 38 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 60 + 90 + 90 + 60 + 94 + 88 + 74 + 00 + 00 + ENDCHAR + STARTCHAR ' + ENCODING 39 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 30 + 40 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR ( + ENCODING 40 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 08 + 10 + 10 + 20 + 20 + 20 + 10 + 10 + 08 + 00 + 00 + ENDCHAR + STARTCHAR ) + ENCODING 41 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 20 + 10 + 10 + 08 + 08 + 08 + 10 + 10 + 20 + 00 + 00 + ENDCHAR + STARTCHAR * + ENCODING 42 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 48 + 30 + fc + 30 + 48 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR + + ENCODING 43 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 10 + 10 + 7c + 10 + 10 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR , + ENCODING 44 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 38 + 30 + 40 + 00 + ENDCHAR + STARTCHAR - + ENCODING 45 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + fc + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR . + ENCODING 46 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 10 + 38 + 10 + 00 + ENDCHAR + STARTCHAR / + ENCODING 47 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 04 + 04 + 08 + 08 + 10 + 20 + 20 + 40 + 40 + 00 + 00 + ENDCHAR + STARTCHAR 0 + ENCODING 48 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 48 + 84 + 84 + 84 + 84 + 84 + 48 + 30 + 00 + 00 + ENDCHAR + STARTCHAR 1 + ENCODING 49 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 30 + 50 + 10 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 2 + ENCODING 50 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 04 + 08 + 30 + 40 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR 3 + ENCODING 51 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 04 + 08 + 10 + 38 + 04 + 04 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 4 + ENCODING 52 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 08 + 18 + 28 + 48 + 88 + 88 + fc + 08 + 08 + 00 + 00 + ENDCHAR + STARTCHAR 5 + ENCODING 53 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 80 + 80 + b8 + c4 + 04 + 04 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 6 + ENCODING 54 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 40 + 80 + 80 + b8 + c4 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 7 + ENCODING 55 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 04 + 08 + 10 + 10 + 20 + 20 + 40 + 40 + 00 + 00 + ENDCHAR + STARTCHAR 8 + ENCODING 56 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 84 + 78 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 9 + ENCODING 57 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 8c + 74 + 04 + 04 + 08 + 70 + 00 + 00 + ENDCHAR + STARTCHAR : + ENCODING 58 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 10 + 38 + 10 + 00 + 00 + 10 + 38 + 10 + 00 + ENDCHAR + STARTCHAR ; + ENCODING 59 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 10 + 38 + 10 + 00 + 00 + 38 + 30 + 40 + 00 + ENDCHAR + STARTCHAR < + ENCODING 60 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 04 + 08 + 10 + 20 + 40 + 20 + 10 + 08 + 04 + 00 + 00 + ENDCHAR + STARTCHAR = + ENCODING 61 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + fc + 00 + 00 + fc + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR > + ENCODING 62 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 40 + 20 + 10 + 08 + 04 + 08 + 10 + 20 + 40 + 00 + 00 + ENDCHAR + STARTCHAR ? + ENCODING 63 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 04 + 08 + 10 + 10 + 00 + 10 + 00 + 00 + ENDCHAR + STARTCHAR @ + ENCODING 64 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 9c + a4 + ac + 94 + 80 + 78 + 00 + 00 + ENDCHAR + STARTCHAR A + ENCODING 65 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 48 + 84 + 84 + 84 + fc + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR B + ENCODING 66 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 44 + 44 + 44 + 78 + 44 + 44 + 44 + f8 + 00 + 00 + ENDCHAR + STARTCHAR C + ENCODING 67 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 80 + 80 + 80 + 80 + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR D + ENCODING 68 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 44 + 44 + 44 + 44 + 44 + 44 + 44 + f8 + 00 + 00 + ENDCHAR + STARTCHAR E + ENCODING 69 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 80 + 80 + 80 + f0 + 80 + 80 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR F + ENCODING 70 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 80 + 80 + 80 + f0 + 80 + 80 + 80 + 80 + 00 + 00 + ENDCHAR + STARTCHAR G + ENCODING 71 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 80 + 80 + 80 + 9c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR H + ENCODING 72 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 84 + 84 + 84 + fc + 84 + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR I + ENCODING 73 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 20 + 20 + 20 + 20 + 20 + 20 + 20 + f8 + 00 + 00 + ENDCHAR + STARTCHAR J + ENCODING 74 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 1c + 08 + 08 + 08 + 08 + 08 + 08 + 88 + 70 + 00 + 00 + ENDCHAR + STARTCHAR K + ENCODING 75 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 88 + 90 + a0 + c0 + a0 + 90 + 88 + 84 + 00 + 00 + ENDCHAR + STARTCHAR L + ENCODING 76 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 80 + 80 + 80 + 80 + 80 + 80 + 80 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR M + ENCODING 77 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + cc + cc + b4 + b4 + 84 + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR N + ENCODING 78 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 84 + c4 + a4 + 94 + 8c + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR O + ENCODING 79 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR P + ENCODING 80 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 84 + 84 + 84 + f8 + 80 + 80 + 80 + 80 + 00 + 00 + ENDCHAR + STARTCHAR Q + ENCODING 81 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + a4 + 94 + 78 + 04 + 00 + ENDCHAR + STARTCHAR R + ENCODING 82 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 84 + 84 + 84 + f8 + a0 + 90 + 88 + 84 + 00 + 00 + ENDCHAR + STARTCHAR S + ENCODING 83 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 80 + 80 + 78 + 04 + 04 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR T + ENCODING 84 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 20 + 20 + 20 + 20 + 20 + 20 + 20 + 20 + 00 + 00 + ENDCHAR + STARTCHAR U + ENCODING 85 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 84 + 84 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR V + ENCODING 86 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 84 + 84 + 48 + 48 + 48 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR W + ENCODING 87 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 84 + 84 + 84 + b4 + b4 + cc + cc + 84 + 00 + 00 + ENDCHAR + STARTCHAR X + ENCODING 88 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + 84 + 48 + 48 + 30 + 48 + 48 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR Y + ENCODING 89 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 88 + 88 + 50 + 50 + 20 + 20 + 20 + 20 + 20 + 00 + 00 + ENDCHAR + STARTCHAR Z + ENCODING 90 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 04 + 08 + 10 + 30 + 20 + 40 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR [ + ENCODING 91 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 40 + 40 + 40 + 40 + 40 + 40 + 40 + 78 + 00 + 00 + ENDCHAR + STARTCHAR \ + ENCODING 92 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 40 + 40 + 20 + 20 + 10 + 08 + 08 + 04 + 04 + 00 + 00 + ENDCHAR + STARTCHAR ] + ENCODING 93 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 08 + 08 + 08 + 08 + 08 + 08 + 08 + 78 + 00 + 00 + ENDCHAR + STARTCHAR ^ + ENCODING 94 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 28 + 44 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR _ + ENCODING 95 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + fc + 00 + ENDCHAR + STARTCHAR ` + ENCODING 96 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 30 + 08 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR a + ENCODING 97 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR b + ENCODING 98 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 80 + 80 + 80 + b8 + c4 + 84 + 84 + c4 + b8 + 00 + 00 + ENDCHAR + STARTCHAR c + ENCODING 99 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 84 + 80 + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR d + ENCODING 100 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 04 + 04 + 04 + 74 + 8c + 84 + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR e + ENCODING 101 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 84 + fc + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR f + ENCODING 102 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 44 + 40 + 40 + f0 + 40 + 40 + 40 + 40 + 00 + 00 + ENDCHAR + STARTCHAR g + ENCODING 103 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 74 + 88 + 88 + 70 + 80 + 78 + 84 + 78 + ENDCHAR + STARTCHAR h + ENCODING 104 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 80 + 80 + 80 + b8 + c4 + 84 + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR i + ENCODING 105 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 20 + 00 + 60 + 20 + 20 + 20 + 20 + f8 + 00 + 00 + ENDCHAR + STARTCHAR j + ENCODING 106 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 08 + 00 + 18 + 08 + 08 + 08 + 08 + 88 + 88 + 70 + ENDCHAR + STARTCHAR k + ENCODING 107 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 80 + 80 + 80 + 88 + 90 + e0 + 90 + 88 + 84 + 00 + 00 + ENDCHAR + STARTCHAR l + ENCODING 108 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 60 + 20 + 20 + 20 + 20 + 20 + 20 + 20 + f8 + 00 + 00 + ENDCHAR + STARTCHAR m + ENCODING 109 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + d0 + a8 + a8 + a8 + a8 + 88 + 00 + 00 + ENDCHAR + STARTCHAR n + ENCODING 110 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + b8 + c4 + 84 + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR o + ENCODING 111 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR p + ENCODING 112 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + b8 + c4 + 84 + c4 + b8 + 80 + 80 + 80 + ENDCHAR + STARTCHAR q + ENCODING 113 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 74 + 8c + 84 + 8c + 74 + 04 + 04 + 04 + ENDCHAR + STARTCHAR r + ENCODING 114 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + b8 + 44 + 40 + 40 + 40 + 40 + 00 + 00 + ENDCHAR + STARTCHAR s + ENCODING 115 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 84 + 60 + 18 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR t + ENCODING 116 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 40 + 40 + f0 + 40 + 40 + 40 + 44 + 38 + 00 + 00 + ENDCHAR + STARTCHAR u + ENCODING 117 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 84 + 84 + 84 + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR v + ENCODING 118 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 88 + 88 + 88 + 50 + 50 + 20 + 00 + 00 + ENDCHAR + STARTCHAR w + ENCODING 119 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 88 + 88 + a8 + a8 + a8 + 50 + 00 + 00 + ENDCHAR + STARTCHAR x + ENCODING 120 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 84 + 48 + 30 + 30 + 48 + 84 + 00 + 00 + ENDCHAR + STARTCHAR y + ENCODING 121 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 84 + 84 + 84 + 8c + 74 + 04 + 84 + 78 + ENDCHAR + STARTCHAR z + ENCODING 122 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + fc + 08 + 10 + 20 + 40 + fc + 00 + 00 + ENDCHAR + STARTCHAR { + ENCODING 123 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 1c + 20 + 20 + 10 + 60 + 10 + 20 + 20 + 1c + 00 + 00 + ENDCHAR + STARTCHAR | + ENCODING 124 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 00 + 00 + ENDCHAR + STARTCHAR } + ENCODING 125 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 08 + 08 + 10 + 0c + 10 + 08 + 08 + 70 + 00 + 00 + ENDCHAR + STARTCHAR ~ + ENCODING 126 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 24 + 54 + 48 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR (Blank) + ENCODING 127 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a0 + ENCODING 160 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a1 + ENCODING 161 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 00 + 10 + 10 + 10 + 10 + 10 + 10 + 10 + 00 + 00 + ENDCHAR + STARTCHAR 00a2 + ENCODING 162 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 38 + 54 + 50 + 50 + 54 + 38 + 10 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a3 + ENCODING 163 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 44 + 40 + 40 + e0 + 40 + 40 + 44 + b8 + 00 + 00 + ENDCHAR + STARTCHAR Euro + ENCODING 164 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 1C + 22 + 20 + F8 + 20 + F8 + 20 + 22 + 1C + 00 + 00 + ENDCHAR + STARTCHAR 00a5 + ENCODING 165 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 88 + 88 + 50 + 50 + f8 + 20 + f8 + 20 + 20 + 00 + 00 + ENDCHAR + STARTCHAR Scaron + ENCODING 166 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 28 + 10 + 00 + 38 + 44 + 40 + 38 + 04 + 44 + 38 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a7 + ENCODING 167 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 40 + 30 + 48 + 48 + 30 + 08 + 48 + 30 + 00 + 00 + ENDCHAR + STARTCHAR scaron + ENCODING 168 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 28 + 10 + 00 + 38 + 40 + 30 + 08 + 08 + 70 + 00 + 00 + ENDCHAR + STARTCHAR 00a9 + ENCODING 169 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + 84 + b4 + a4 + a4 + a4 + b4 + 84 + 78 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00aa + ENCODING 170 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 04 + 3c + 44 + 3c + 00 + 7c + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ab + ENCODING 171 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 14 + 28 + 50 + a0 + 50 + 28 + 14 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ac + ENCODING 172 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 7c + 04 + 04 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ad + ENCODING 173 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 7c + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ae + ENCODING 174 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + 84 + b4 + ac + ac + b4 + ac + 84 + 78 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00af + ENCODING 175 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 7c + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b0 + ENCODING 176 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 48 + 48 + 30 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b1 + ENCODING 177 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 10 + 10 + 7c + 10 + 10 + 00 + 7c + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b2 + ENCODING 178 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 40 + a0 + 20 + 40 + 80 + e0 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b3 + ENCODING 179 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + e0 + 20 + 40 + 20 + a0 + 40 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR Zcaron + ENCODING 180 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 10 + 00 + 7C + 04 + 08 + 10 + 20 + 40 + 7C + 00 + 00 + ENDCHAR + STARTCHAR 00b5 + ENCODING 181 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 84 + 84 + 84 + 84 + cc + b4 + 80 + 00 + ENDCHAR + STARTCHAR 00b6 + ENCODING 182 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 7c + e8 + e8 + e8 + 68 + 28 + 28 + 28 + 28 + 00 + 00 + ENDCHAR + STARTCHAR 00b7 + ENCODING 183 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 30 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR zcaron + ENCODING 184 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 50 + 20 + 00 + 78 + 08 + 10 + 20 + 40 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00b9 + ENCODING 185 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 40 + c0 + 40 + 40 + 40 + e0 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ba + ENCODING 186 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 48 + 48 + 30 + 00 + 78 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00bb + ENCODING 187 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + a0 + 50 + 28 + 14 + 28 + 50 + a0 + 00 + 00 + 00 + ENDCHAR + STARTCHAR OE ligature + ENCODING 188 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 1F + 28 + 48 + 48 + 4E + 48 + 48 + 28 + 1F + 00 + 00 + ENDCHAR + STARTCHAR oe ligature + ENCODING 189 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 68 + 94 + 9C + 90 + 94 + 68 + 00 + 00 + ENDCHAR + STARTCHAR Ydiaeresis + ENCODING 190 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 50 + 50 + 00 + 88 + 88 + 50 + 20 + 20 + 20 + 20 + 00 + 00 + ENDCHAR + STARTCHAR 00bf + ENCODING 191 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 20 + 00 + 20 + 20 + 40 + 80 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00c0 + ENCODING 192 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 30 + 48 + 84 + 84 + fc + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00c1 + ENCODING 193 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 30 + 48 + 84 + 84 + fc + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00c2 + ENCODING 194 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 30 + 48 + 84 + 84 + fc + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00c3 + ENCODING 195 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 50 + 00 + 30 + 48 + 84 + 84 + fc + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00c4 + ENCODING 196 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 30 + 48 + 84 + 84 + fc + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00c5 + ENCODING 197 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 30 + 30 + 48 + 84 + 84 + fc + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00c6 + ENCODING 198 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 5c + a0 + a0 + a0 + b8 + e0 + a0 + a0 + bc + 00 + 00 + ENDCHAR + STARTCHAR 00c7 + ENCODING 199 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 84 + 80 + 80 + 80 + 80 + 80 + 84 + 78 + 10 + 20 + ENDCHAR + STARTCHAR 00c8 + ENCODING 200 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + fc + 80 + 80 + f0 + 80 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00c9 + ENCODING 201 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + fc + 80 + 80 + f0 + 80 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00ca + ENCODING 202 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + fc + 80 + 80 + f0 + 80 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00cb + ENCODING 203 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + fc + 80 + 80 + f0 + 80 + 80 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00cc + ENCODING 204 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 7c + 10 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00cd + ENCODING 205 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 7c + 10 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00ce + ENCODING 206 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 7c + 10 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00cf + ENCODING 207 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 28 + 00 + 7c + 10 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00d0 + ENCODING 208 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 44 + 44 + 44 + e4 + 44 + 44 + 44 + f8 + 00 + 00 + ENDCHAR + STARTCHAR 00d1 + ENCODING 209 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 50 + 00 + 84 + c4 + a4 + a4 + 94 + 8c + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00d2 + ENCODING 210 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d3 + ENCODING 211 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d4 + ENCODING 212 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d5 + ENCODING 213 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 50 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d6 + ENCODING 214 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 78 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d7 + ENCODING 215 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 84 + 48 + 30 + 30 + 48 + 84 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00d8 + ENCODING 216 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 04 + 78 + 8c + 94 + 94 + a4 + a4 + a4 + c4 + 78 + 80 + 00 + ENDCHAR + STARTCHAR 00d9 + ENCODING 217 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 84 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00da + ENCODING 218 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 84 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00db + ENCODING 219 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 84 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00dc + ENCODING 220 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 84 + 84 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00dd + ENCODING 221 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 44 + 44 + 28 + 10 + 10 + 10 + 10 + 00 + 00 + ENDCHAR + STARTCHAR 00de + ENCODING 222 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 80 + f8 + 84 + 84 + 84 + f8 + 80 + 80 + 80 + 00 + 00 + ENDCHAR + STARTCHAR 00df + ENCODING 223 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 78 + 84 + 84 + f8 + 84 + 84 + c4 + b8 + 80 + 00 + ENDCHAR + STARTCHAR 00e0 + ENCODING 224 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00e1 + ENCODING 225 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00e2 + ENCODING 226 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00e3 + ENCODING 227 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 50 + 00 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00e4 + ENCODING 228 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00e5 + ENCODING 229 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 30 + 00 + 78 + 04 + 7c + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00e6 + ENCODING 230 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 68 + 14 + 7c + 90 + 94 + 68 + 00 + 00 + ENDCHAR + STARTCHAR 00e7 + ENCODING 231 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 84 + 80 + 80 + 84 + 78 + 10 + 20 + ENDCHAR + STARTCHAR 00e8 + ENCODING 232 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 00 + 78 + 84 + fc + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00e9 + ENCODING 233 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 00 + 78 + 84 + fc + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ea + ENCODING 234 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 00 + 78 + 84 + fc + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00eb + ENCODING 235 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 00 + 78 + 84 + fc + 80 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ec + ENCODING 236 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 00 + 30 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00ed + ENCODING 237 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 00 + 30 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00ee + ENCODING 238 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 00 + 30 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00ef + ENCODING 239 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 00 + 30 + 10 + 10 + 10 + 10 + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00f0 + ENCODING 240 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 30 + 50 + 08 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f1 + ENCODING 241 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 50 + 00 + 00 + b8 + c4 + 84 + 84 + 84 + 84 + 00 + 00 + ENDCHAR + STARTCHAR 00f2 + ENCODING 242 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f3 + ENCODING 243 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f4 + ENCODING 244 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f5 + ENCODING 245 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 50 + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f6 + ENCODING 246 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 00 + 78 + 84 + 84 + 84 + 84 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f7 + ENCODING 247 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 10 + 10 + 00 + 7c + 00 + 10 + 10 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00f8 + ENCODING 248 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 04 + 78 + 8c + 94 + a4 + c4 + 78 + 80 + 00 + ENDCHAR + STARTCHAR 00f9 + ENCODING 249 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 20 + 10 + 00 + 00 + 84 + 84 + 84 + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00fa + ENCODING 250 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 00 + 84 + 84 + 84 + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00fb + ENCODING 251 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 48 + 00 + 00 + 84 + 84 + 84 + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00fc + ENCODING 252 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 00 + 84 + 84 + 84 + 84 + 8c + 74 + 00 + 00 + ENDCHAR + STARTCHAR 00fd + ENCODING 253 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 10 + 20 + 00 + 00 + 84 + 84 + 84 + 8c + 74 + 04 + 84 + 78 + ENDCHAR + STARTCHAR 00fe + ENCODING 254 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 80 + 80 + b8 + c4 + 84 + 84 + c4 + b8 + 80 + 80 + ENDCHAR + STARTCHAR 00ff + ENCODING 255 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 48 + 00 + 00 + 84 + 84 + 84 + 8c + 74 + 04 + 84 + 78 + ENDCHAR + ENDFONT *** /dev/null Sat Jun 27 09:30:11 1998 --- xc/fonts/bdf/misc/7x13euroB.bdf Mon Jun 15 16:51:21 1998 *************** *** 0 **** --- 1,4518 ---- + STARTFONT 2.1 + COMMENT $TOG: 7x13euroB.bdf /main/3 1998/06/15 16:58:28 kaleb $ + COMMENT "" + COMMENT Designed by Stephen Gildea from original designs. + COMMENT November 1989 + COMMENT "" + COMMENT Characters above 127 designed and made by + COMMENT Thomas Bagli (pyramid!pcsbst!tom@uunet.UU.NET) + COMMENT PCS Computer Systeme, West Germany + COMMENT "" + FONT -Misc-Fixed-Bold-R-Normal--13-120-75-75-C-70-FCD8859-15 + SIZE 13 78 78 + FONTBOUNDINGBOX 7 13 0 -2 + STARTPROPERTIES 21 + FONTNAME_REGISTRY "" + FOUNDRY "Misc" + FAMILY_NAME "Fixed" + WEIGHT_NAME "Bold" + SLANT "R" + SETWIDTH_NAME "Normal" + ADD_STYLE_NAME "" + PIXEL_SIZE 13 + POINT_SIZE 120 + RESOLUTION_X 75 + RESOLUTION_Y 75 + SPACING "C" + AVERAGE_WIDTH 70 + CHARSET_REGISTRY "FCD8859" + CHARSET_ENCODING "15" + UNDERLINE_POSITION -1 + DESTINATION 1 + DEFAULT_CHAR 0 + FONT_DESCENT 2 + FONT_ASCENT 11 + COPYRIGHT "Public domain font. Share and enjoy." + ENDPROPERTIES + CHARS 224 + STARTCHAR C000 + ENCODING 0 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 7c + 7c + 7c + 7c + 7c + 7c + 7c + 7c + 7c + 7c + 7c + 00 + ENDCHAR + STARTCHAR C001 + ENCODING 1 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 30 + 78 + fc + 78 + 30 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C002 + ENCODING 2 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + 30 + cc + 30 + cc + 30 + cc + 30 + cc + 30 + cc + 00 + ENDCHAR + STARTCHAR C003 + ENCODING 3 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + d8 + d8 + f8 + d8 + d8 + 00 + 3c + 18 + 18 + 18 + 18 + 00 + ENDCHAR + STARTCHAR C004 + ENCODING 4 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + f0 + c0 + e0 + c0 + c0 + 00 + 3c + 30 + 38 + 30 + 30 + 00 + ENDCHAR + STARTCHAR C005 + ENCODING 5 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + c0 + c0 + c0 + 70 + 00 + 38 + 34 + 38 + 34 + 34 + 00 + ENDCHAR + STARTCHAR C006 + ENCODING 6 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + c0 + c0 + c0 + c0 + f0 + 00 + 3c + 30 + 38 + 30 + 30 + 00 + ENDCHAR + STARTCHAR C007 + ENCODING 7 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + 78 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C010 + ENCODING 8 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 30 + fc + fc + 30 + 30 + 00 + fc + fc + 00 + 00 + ENDCHAR + STARTCHAR C011 + ENCODING 9 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + ec + fc + dc + cc + 00 + 30 + 30 + 30 + 30 + 3c + 00 + ENDCHAR + STARTCHAR C012 + ENCODING 10 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + cc + 48 + 78 + 30 + 00 + 3c + 18 + 18 + 18 + 18 + 00 + ENDCHAR + STARTCHAR C013 + ENCODING 11 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + f0 + f0 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C014 + ENCODING 12 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + f0 + f0 + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C015 + ENCODING 13 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 3e + 3e + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C016 + ENCODING 14 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + 3e + 3e + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C017 + ENCODING 15 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + fe + fe + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C020 + ENCODING 16 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fe + fe + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C021 + ENCODING 17 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + fe + fe + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C022 + ENCODING 18 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + fe + fe + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C023 + ENCODING 19 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + fe + fe + 00 + 00 + 00 + ENDCHAR + STARTCHAR C024 + ENCODING 20 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + fe + fe + 00 + ENDCHAR + STARTCHAR C025 + ENCODING 21 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + 3e + 3e + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C026 + ENCODING 22 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + f0 + f0 + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C027 + ENCODING 23 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + fe + fe + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C030 + ENCODING 24 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + fe + fe + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C031 + ENCODING 25 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + ENDCHAR + STARTCHAR C032 + ENCODING 26 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 18 + 60 + c0 + 60 + 18 + 0c + fc + fc + 00 + 00 + ENDCHAR + STARTCHAR C033 + ENCODING 27 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + 60 + 18 + 0c + 18 + 60 + c0 + fc + fc + 00 + 00 + ENDCHAR + STARTCHAR C034 + ENCODING 28 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + fc + 6c + 6c + 6c + ec + cc + 00 + 00 + ENDCHAR + STARTCHAR C035 + ENCODING 29 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 04 + 0c + fc + fc + 30 + fc + fc + c0 + 80 + 00 + 00 + ENDCHAR + STARTCHAR C036 + ENCODING 30 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 6c + 60 + 60 + f8 + 60 + 60 + 6c + b8 + 00 + 00 + ENDCHAR + STARTCHAR C037 + ENCODING 31 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 30 + 30 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C040 + ENCODING 32 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR ! + ENCODING 33 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 30 + 30 + 30 + 30 + 30 + 00 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR " + ENCODING 34 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 6c + 6c + 6c + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR # + ENCODING 35 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 28 + 28 + 7c + 7c + 28 + 7c + 7c + 28 + 28 + 00 + 00 + ENDCHAR + STARTCHAR $ + ENCODING 36 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 78 + b4 + b0 + 78 + 34 + b4 + 78 + 30 + 00 + 00 + ENDCHAR + STARTCHAR % + ENCODING 37 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + e4 + ac + e8 + 18 + 30 + 60 + 5c + d4 + 9c + 00 + 00 + ENDCHAR + STARTCHAR & + ENCODING 38 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + d8 + d8 + d8 + 70 + d4 + dc + d8 + 74 + 00 + 00 + ENDCHAR + STARTCHAR ' + ENCODING 39 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 38 + 30 + 60 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR ( + ENCODING 40 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 18 + 30 + 30 + 60 + 60 + 60 + 30 + 30 + 18 + 00 + 00 + ENDCHAR + STARTCHAR ) + ENCODING 41 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 60 + 30 + 30 + 18 + 18 + 18 + 30 + 30 + 60 + 00 + 00 + ENDCHAR + STARTCHAR * + ENCODING 42 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 48 + 30 + fc + fc + 30 + 48 + 00 + 00 + 00 + ENDCHAR + STARTCHAR + + ENCODING 43 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 30 + 30 + fc + fc + 30 + 30 + 00 + 00 + 00 + ENDCHAR + STARTCHAR , + ENCODING 44 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 38 + 38 + 30 + 60 + 00 + ENDCHAR + STARTCHAR - + ENCODING 45 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + fc + fc + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR . + ENCODING 46 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 30 + 78 + 30 + 00 + ENDCHAR + STARTCHAR / + ENCODING 47 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 0c + 18 + 18 + 30 + 60 + 60 + c0 + c0 + 00 + 00 + ENDCHAR + STARTCHAR 0 + ENCODING 48 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 48 + cc + cc + cc + cc + cc + 48 + 30 + 00 + 00 + ENDCHAR + STARTCHAR 1 + ENCODING 49 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 70 + b0 + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR 2 + ENCODING 50 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + 0c + 38 + 60 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR 3 + ENCODING 51 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 0c + 18 + 30 + 78 + 0c + 0c + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 4 + ENCODING 52 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 1c + 3c + 6c + cc + cc + fc + 0c + 0c + 00 + 00 + ENDCHAR + STARTCHAR 5 + ENCODING 53 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + c0 + c0 + f8 + cc + 0c + 0c + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 6 + ENCODING 54 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + c0 + c0 + f8 + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 7 + ENCODING 55 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 0c + 0c + 18 + 18 + 30 + 30 + 60 + 60 + 00 + 00 + ENDCHAR + STARTCHAR 8 + ENCODING 56 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + cc + 78 + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 9 + ENCODING 57 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + cc + 7c + 0c + 0c + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR : + ENCODING 58 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 30 + 78 + 30 + 00 + 00 + 30 + 78 + 30 + 00 + ENDCHAR + STARTCHAR ; + ENCODING 59 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 30 + 78 + 30 + 00 + 38 + 38 + 30 + 60 + 00 + ENDCHAR + STARTCHAR < + ENCODING 60 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 18 + 30 + 60 + c0 + 60 + 30 + 18 + 0c + 00 + 00 + ENDCHAR + STARTCHAR = + ENCODING 61 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + fc + fc + 00 + fc + fc + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR > + ENCODING 62 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + 60 + 30 + 18 + 0c + 18 + 30 + 60 + c0 + 00 + 00 + ENDCHAR + STARTCHAR ? + ENCODING 63 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + 0c + 38 + 30 + 00 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR @ + ENCODING 64 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 8c + 8c + bc + ac + bc + 80 + 8c + 78 + 00 + 00 + ENDCHAR + STARTCHAR A + ENCODING 65 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + cc + fc + cc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR B + ENCODING 66 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + cc + cc + cc + f8 + cc + cc + cc + f8 + 00 + 00 + ENDCHAR + STARTCHAR C + ENCODING 67 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + c0 + c0 + c0 + c0 + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR D + ENCODING 68 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + cc + cc + cc + cc + cc + cc + cc + f8 + 00 + 00 + ENDCHAR + STARTCHAR E + ENCODING 69 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + c0 + c0 + c0 + f8 + c0 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR F + ENCODING 70 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + c0 + c0 + c0 + f8 + c0 + c0 + c0 + c0 + 00 + 00 + ENDCHAR + STARTCHAR G + ENCODING 71 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + c0 + c0 + dc + cc + cc + cc + 7c + 00 + 00 + ENDCHAR + STARTCHAR H + ENCODING 72 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + cc + cc + fc + cc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR I + ENCODING 73 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 30 + 30 + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR J + ENCODING 74 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 0c + 0c + 0c + 0c + 0c + 0c + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR K + ENCODING 75 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c4 + cc + d8 + f0 + e0 + f0 + d8 + cc + c4 + 00 + 00 + ENDCHAR + STARTCHAR L + ENCODING 76 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + c0 + c0 + c0 + c0 + c0 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR M + ENCODING 77 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + cc + fc + fc + cc + cc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR N + ENCODING 78 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + ec + ec + fc + dc + dc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR O + ENCODING 79 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR P + ENCODING 80 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + cc + cc + cc + f8 + c0 + c0 + c0 + c0 + 00 + 00 + ENDCHAR + STARTCHAR Q + ENCODING 81 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + cc + cc + cc + ec + dc + 78 + 0c + 00 + ENDCHAR + STARTCHAR R + ENCODING 82 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + cc + cc + cc + f8 + f0 + d8 + cc + c4 + 00 + 00 + ENDCHAR + STARTCHAR S + ENCODING 83 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + c0 + c0 + 78 + 0c + 0c + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR T + ENCODING 84 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR U + ENCODING 85 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + cc + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR V + ENCODING 86 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + cc + 48 + 48 + 78 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR W + ENCODING 87 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + cc + cc + cc + fc + fc + cc + 84 + 00 + 00 + ENDCHAR + STARTCHAR X + ENCODING 88 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 84 + cc + 48 + 78 + 30 + 78 + 48 + cc + 84 + 00 + 00 + ENDCHAR + STARTCHAR Y + ENCODING 89 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + 78 + 78 + 30 + 30 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR Z + ENCODING 90 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + fc + 0c + 0c + 18 + 30 + 60 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR [ + ENCODING 91 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 60 + 60 + 60 + 60 + 60 + 60 + 60 + 78 + 00 + 00 + ENDCHAR + STARTCHAR \ + ENCODING 92 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + c0 + 60 + 60 + 30 + 18 + 18 + 0c + 0c + 00 + 00 + ENDCHAR + STARTCHAR ] + ENCODING 93 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 18 + 18 + 18 + 18 + 18 + 18 + 18 + 78 + 00 + 00 + ENDCHAR + STARTCHAR ^ + ENCODING 94 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 78 + cc + 84 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR _ + ENCODING 95 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + fc + fc + 00 + ENDCHAR + STARTCHAR ` + ENCODING 96 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 70 + 30 + 18 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR a + ENCODING 97 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 0c + 7c + cc + cc + 7c + 00 + 00 + ENDCHAR + STARTCHAR b + ENCODING 98 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + c0 + c0 + f8 + cc + cc + cc + cc + f8 + 00 + 00 + ENDCHAR + STARTCHAR c + ENCODING 99 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + cc + c0 + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR d + ENCODING 100 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 0c + 0c + 7c + cc + cc + cc + cc + 7c + 00 + 00 + ENDCHAR + STARTCHAR e + ENCODING 101 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + cc + fc + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR f + ENCODING 102 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 6c + 60 + 60 + f0 + 60 + 60 + 60 + 60 + 00 + 00 + ENDCHAR + STARTCHAR g + ENCODING 103 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 74 + cc + cc + 78 + c0 + 78 + cc + 78 + ENDCHAR + STARTCHAR h + ENCODING 104 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + c0 + c0 + f8 + cc + cc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR i + ENCODING 105 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 30 + 00 + 70 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR j + ENCODING 106 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 0c + 0c + 00 + 0c + 0c + 0c + 0c + 0c + 0c + cc + 78 + ENDCHAR + STARTCHAR k + ENCODING 107 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + c0 + c0 + cc + d8 + f0 + f0 + d8 + cc + 00 + 00 + ENDCHAR + STARTCHAR l + ENCODING 108 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR m + ENCODING 109 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + d8 + fc + fc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR n + ENCODING 110 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + f8 + cc + cc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR o + ENCODING 111 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR p + ENCODING 112 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + f8 + cc + cc + cc + f8 + c0 + c0 + c0 + ENDCHAR + STARTCHAR q + ENCODING 113 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 7c + cc + cc + cc + 7c + 0c + 0c + 0c + ENDCHAR + STARTCHAR r + ENCODING 114 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + f8 + cc + c0 + c0 + c0 + c0 + 00 + 00 + ENDCHAR + STARTCHAR s + ENCODING 115 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + cc + 60 + 18 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR t + ENCODING 116 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 60 + 60 + f8 + 60 + 60 + 60 + 6c + 38 + 00 + 00 + ENDCHAR + STARTCHAR u + ENCODING 117 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + cc + cc + cc + cc + 7c + 00 + 00 + ENDCHAR + STARTCHAR v + ENCODING 118 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + cc + cc + 78 + 78 + 30 + 00 + 00 + ENDCHAR + STARTCHAR w + ENCODING 119 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + cc + cc + fc + fc + 48 + 00 + 00 + ENDCHAR + STARTCHAR x + ENCODING 120 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + cc + 78 + 78 + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR y + ENCODING 121 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + cc + cc + cc + 7c + 0c + cc + 78 + ENDCHAR + STARTCHAR z + ENCODING 122 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + fc + 0c + 18 + 60 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR { + ENCODING 123 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 60 + 60 + 30 + 60 + 30 + 60 + 60 + 38 + 00 + 00 + ENDCHAR + STARTCHAR | + ENCODING 124 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR } + ENCODING 125 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 70 + 18 + 18 + 30 + 18 + 30 + 18 + 18 + 70 + 00 + 00 + ENDCHAR + STARTCHAR ~ + ENCODING 126 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 64 + fc + 98 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR C177 + ENCODING 127 + SWIDTH 570 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a0 + ENCODING 160 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a1 + ENCODING 161 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 30 + 00 + 30 + 30 + 30 + 30 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR 00a2 + ENCODING 162 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 10 + 7c + d4 + d0 + d0 + d4 + 7c + 10 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00a3 + ENCODING 163 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 38 + 6c + 60 + 60 + f8 + 60 + 60 + 6c + b8 + 00 + 00 + ENDCHAR + STARTCHAR Euro + ENCODING 164 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 1C + 36 + 30 + FC + 30 + FC + 30 + 36 + 1C + 00 + 00 + ENDCHAR + STARTCHAR 00a5 + ENCODING 165 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + cc + cc + 78 + 78 + fc + 30 + fc + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR Scaron + ENCODING 166 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 10 + 00 + 7C + C6 + C0 + 7C + 06 + C6 + 7C + 00 + 00 + ENDCHAR + STARTCHAR 00a7 + ENCODING 167 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + cc + c0 + 78 + cc + cc + 78 + 0c + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR scaron + ENCODING 168 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 28 + 10 + 00 + 7C + C6 + 70 + 1C + C6 + 7C + 00 + 00 + ENDCHAR + STARTCHAR 00a9 + ENCODING 169 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + cc + 84 + b4 + e4 + e4 + b4 + 84 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00aa + ENCODING 170 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + 0c + 7c + 4c + 7c + 00 + 7c + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ab + ENCODING 171 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 34 + 68 + d0 + a0 + d0 + 68 + 34 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ac + ENCODING 172 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + fc + fc + 04 + 04 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ad + ENCODING 173 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 7c + 7c + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ae + ENCODING 174 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + cc + 84 + bc + ac + bc + b4 + ac + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00af + ENCODING 175 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 7c + 7c + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b0 + ENCODING 176 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + cc + 78 + 00 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b1 + ENCODING 177 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 30 + 30 + fc + fc + 30 + 30 + 00 + fc + fc + 00 + 00 + ENDCHAR + STARTCHAR 00b2 + ENCODING 178 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + e0 + b0 + 30 + 60 + c0 + f0 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00b3 + ENCODING 179 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + e0 + b0 + 60 + 30 + b0 + e0 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR Zcaron + ENCODING 180 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 28 + 10 + 00 + 7C + 0C + 0C + 18 + 30 + 60 + 7C + 00 + 00 + ENDCHAR + STARTCHAR 00b5 + ENCODING 181 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + cc + cc + cc + cc + fc + 80 + 00 + ENDCHAR + STARTCHAR 00b6 + ENCODING 182 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 7c + fc + f4 + f4 + f4 + 74 + 34 + 34 + 34 + 00 + 00 + ENDCHAR + STARTCHAR 00b7 + ENCODING 183 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 30 + 30 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR zcaron + ENCODING 184 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 50 + 20 + 00 + F8 + 18 + 30 + 60 + C0 + F8 + 00 + 00 + ENDCHAR + STARTCHAR 00b9 + ENCODING 185 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 60 + e0 + 60 + 60 + 60 + f0 + 00 + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00ba + ENCODING 186 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 38 + 7c + 44 + 7c + 38 + 00 + 7c + 00 + 00 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00bb + ENCODING 187 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + b0 + 58 + 2c + 14 + 2c + 58 + b0 + 00 + 00 + 00 + ENDCHAR + STARTCHAR OE ligature + ENCODING 188 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 7E + D8 + D8 + D8 + DC + D8 + D8 + D8 + 7E + 00 + 00 + ENDCHAR + STARTCHAR oe ligature + ENCODING 189 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 6E + DB + DF + D8 + DB + 6E + 00 + 00 + ENDCHAR + STARTCHAR Y diaeresis + ENCODING 190 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + CC + CC + 00 + CC + CC + 78 + 78 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR 00bf + ENCODING 191 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 30 + 00 + 30 + 30 + 60 + c0 + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00c0 + ENCODING 192 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 30 + 78 + cc + cc + fc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00c1 + ENCODING 193 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 30 + 78 + cc + cc + fc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00c2 + ENCODING 194 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 30 + 78 + cc + cc + fc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00c3 + ENCODING 195 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 68 + b0 + 00 + 30 + 78 + cc + cc + fc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00c4 + ENCODING 196 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + cc + 00 + 30 + 78 + cc + cc + fc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00c5 + ENCODING 197 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 78 + 48 + 78 + 30 + 78 + cc + cc + fc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00c6 + ENCODING 198 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 7c + f8 + d8 + d8 + dc + f8 + d8 + d8 + dc + 00 + 00 + ENDCHAR + STARTCHAR 00c7 + ENCODING 199 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 78 + cc + c0 + c0 + c0 + c0 + c0 + cc + 78 + 30 + 60 + ENDCHAR + STARTCHAR 00c8 + ENCODING 200 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + fc + c0 + c0 + f0 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00c9 + ENCODING 201 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + fc + c0 + c0 + f0 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00ca + ENCODING 202 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + fc + c0 + c0 + f0 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00cb + ENCODING 203 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + cc + 00 + fc + c0 + c0 + f0 + c0 + c0 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00cc + ENCODING 204 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + fc + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00cd + ENCODING 205 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + fc + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00ce + ENCODING 206 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + fc + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00cf + ENCODING 207 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + cc + 00 + fc + 30 + 30 + 30 + 30 + 30 + fc + 00 + 00 + ENDCHAR + STARTCHAR 00d0 + ENCODING 208 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + f8 + 6c + 6c + 6c + ec + 6c + 6c + 6c + f8 + 00 + 00 + ENDCHAR + STARTCHAR 00d1 + ENCODING 209 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 68 + b0 + 00 + cc + cc + ec + fc + dc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00d2 + ENCODING 210 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 78 + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d3 + ENCODING 211 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 78 + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d4 + ENCODING 212 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 78 + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d5 + ENCODING 213 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 68 + b0 + 00 + 78 + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d6 + ENCODING 214 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + cc + 00 + 78 + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00d7 + ENCODING 215 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + cc + 78 + 30 + 78 + cc + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00d8 + ENCODING 216 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 04 + 78 + dc + dc + dc + ec + ec + ec + 78 + 80 + 00 + ENDCHAR + STARTCHAR 00d9 + ENCODING 217 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + cc + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00da + ENCODING 218 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + cc + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00db + ENCODING 219 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + cc + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00dc + ENCODING 220 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + cc + cc + 00 + cc + cc + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00dd + ENCODING 221 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + cc + 48 + 78 + 30 + 30 + 30 + 30 + 00 + 00 + ENDCHAR + STARTCHAR 00de + ENCODING 222 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + c0 + f8 + cc + cc + cc + f8 + c0 + c0 + c0 + 00 + 00 + ENDCHAR + STARTCHAR 00df + ENCODING 223 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 78 + cc + cc + f8 + cc + cc + cc + f8 + 80 + 00 + ENDCHAR + STARTCHAR 00e0 + ENCODING 224 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 00 + 78 + 0c + 7c + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00e1 + ENCODING 225 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 00 + 78 + 0c + 7c + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00e2 + ENCODING 226 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 00 + 78 + 0c + 7c + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00e3 + ENCODING 227 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 68 + b0 + 00 + 00 + 78 + 0c + 7c + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00e4 + ENCODING 228 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 6c + 6c + 00 + 00 + 78 + 0c + 7c + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00e5 + ENCODING 229 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 38 + 28 + 38 + 00 + 78 + 0c + 7c + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00e6 + ENCODING 230 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + 34 + 7c + b0 + b4 + 68 + 00 + 00 + ENDCHAR + STARTCHAR 00e7 + ENCODING 231 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 00 + 00 + 78 + cc + c0 + c0 + cc + 78 + 30 + 60 + ENDCHAR + STARTCHAR 00e8 + ENCODING 232 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 00 + 78 + cc + fc + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00e9 + ENCODING 233 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 00 + 78 + cc + fc + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ea + ENCODING 234 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 00 + 78 + cc + fc + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00eb + ENCODING 235 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 6c + 6c + 00 + 00 + 78 + cc + fc + c0 + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ec + ENCODING 236 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 00 + 70 + 30 + 30 + 30 + 30 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ed + ENCODING 237 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 00 + 70 + 30 + 30 + 30 + 30 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ee + ENCODING 238 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 00 + 70 + 30 + 30 + 30 + 30 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00ef + ENCODING 239 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 6c + 6c + 00 + 00 + 70 + 30 + 30 + 30 + 30 + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f0 + ENCODING 240 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 48 + 30 + 30 + 50 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f1 + ENCODING 241 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 68 + b0 + 00 + 00 + f8 + ec + cc + cc + cc + cc + 00 + 00 + ENDCHAR + STARTCHAR 00f2 + ENCODING 242 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 00 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f3 + ENCODING 243 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 00 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f4 + ENCODING 244 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 00 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f5 + ENCODING 245 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 68 + b0 + 00 + 00 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f6 + ENCODING 246 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 6c + 6c + 00 + 00 + 78 + cc + cc + cc + cc + 78 + 00 + 00 + ENDCHAR + STARTCHAR 00f7 + ENCODING 247 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 30 + 30 + 00 + fc + 00 + 30 + 30 + 00 + 00 + 00 + ENDCHAR + STARTCHAR 00f8 + ENCODING 248 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + 04 + 78 + cc + dc + cc + ec + cc + 78 + 80 + 00 + ENDCHAR + STARTCHAR 00f9 + ENCODING 249 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 30 + 18 + 00 + 00 + cc + cc + cc + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00fa + ENCODING 250 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 00 + cc + cc + cc + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00fb + ENCODING 251 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 70 + d8 + 00 + 00 + cc + cc + cc + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00fc + ENCODING 252 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 6c + 6c + 00 + 00 + cc + cc + cc + cc + dc + 7c + 00 + 00 + ENDCHAR + STARTCHAR 00fd + ENCODING 253 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 18 + 30 + 00 + 00 + cc + cc + cc + dc + 7c + 0c + cc + 78 + ENDCHAR + STARTCHAR 00fe + ENCODING 254 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 00 + 00 + c0 + c0 + f8 + ec + cc + cc + ec + f8 + c0 + c0 + ENDCHAR + STARTCHAR 00ff + ENCODING 255 + SWIDTH 666 0 + DWIDTH 7 0 + BBX 7 13 0 -2 + BITMAP + 00 + 6c + 6c + 00 + 00 + cc + cc + cc + dc + 7c + 0c + cc + 78 + ENDCHAR + ENDFONT *** X11.keysyms@@/PUBLIC-LATEST Sat Apr 16 16:11:46 1994 --- xc/doc/specs/XProtocol/X11.keysyms Fri Jun 26 15:47:46 1998 *************** *** 1,4 **** ! .\" $XConsortium: X11.keysyms,v 1.18 94/04/16 16:11:46 rws Exp $ \& .sp 1 .ps 11 --- 1,4 ---- ! .\" $TOG: X11.keysyms /main/19 1998/06/26 15:55:42 kaleb $ \& .sp 1 .ps 11 *************** *** 77,82 **** --- 77,90 ---- 12 Hebrew 13 Thai 14 Korean + 15 Latin-5 + 16 Latin-6 + 17 Latin-7 + 18 Latin-8 + 19 Latin-9 + 32 Currency + 253 3270 + 254 Keyboard (XKB) Extension 255 Keyboard .sp 6p _ *************** *** 1199,1204 **** --- 1207,1261 ---- 014 249 15/09 HANGUL JONG SEONG KKOGJI DALRIN IEUNG Korean 014 250 15/10 HANGUL JONG SEONG YEORIN HIEUH Korean 014 255 15/15 KOREAN WON Korean + .sp 2 + 019 188 11/12 LATIN CAPITAL DIPHTHONG OE Latin-9 + 019 189 11/13 LATIN SMALL DIPHTHONG oe Latin-9 + 019 190 11/14 LATIN CAPITAL LETTER Y WITH DIAERESIS Latin-9 + .sp 2 + 032 160 10/00 CURRENCY ECU SIGN Currency + 032 161 10/01 CURRENCY COLON SIGN Currency + 032 162 10/02 CURRENCY CRUZEIRO SIGN Currency + 032 163 10/03 CURRENCY FRENCH FRANC SIGN Currency + 032 164 10/04 CURRENCY LIRA SIGN Currency + 032 165 10/05 CURRENCY MILL SIGN Currency + 032 166 10/06 CURRENCY NAIRA SIGN Currency + 032 167 10/07 CURRENCY PESETA SIGN Currency + 032 168 10/08 CURRENCY RUPEE SIGN Currency + 032 169 10/09 CURRENCY WON SIGN Currency + 032 170 10/10 CURRENCY NEW SHEQEL SIGN Currency + 032 171 10/11 CURRENCY DONG SIGN Currency + 032 172 10/12 CURRENCY EURO SIGN Currency + .sp 2 + 253 001 00/01 3270 DUPLICATE 3270 + 253 002 00/02 3270 FIELDMARK 3270 + 253 003 00/03 3270 RIGHT2 3270 + 253 004 00/04 3270 LEFT2 3270 + 253 005 00/05 3270 BACKTAB 3270 + 253 006 00/06 3270 ERASEEOF 3270 + 253 007 00/07 3270 ERASEINPUT 3270 + 253 008 00/08 3270 RESET 3270 + 253 009 00/09 3270 QUIT 3270 + 253 010 00/10 3270 PA1 3270 + 253 011 00/11 3270 PA2 3270 + 253 012 00/12 3270 PA3 3270 + 253 013 00/13 3270 TEST 3270 + 253 014 00/14 3270 ATTN 3270 + 253 015 00/15 3270 CURSORBLINK 3270 + 253 016 01/01 3270 ALTCURSOR 3270 + 253 017 01/02 3270 KEYCLICK 3270 + 253 018 01/03 3270 JUMP 3270 + 253 019 01/04 3270 IDENT 3270 + 253 020 01/05 3270 RULE 3270 + 253 021 01/06 3270 COPY 3270 + 253 022 01/07 3270 PLAY 3270 + 253 023 01/08 3270 SETUP 3270 + 253 024 01/09 3270 RECORD 3270 + 253 025 01/10 3270 CHANGESCREEN 3270 + 253 026 01/11 3270 DELETEWORD 3270 + 253 027 01/12 3270 EXSELECT 3270 + 253 028 01/13 3270 CURSORSELECT 3270 + 253 029 01/14 3270 PRINTSCREEN 3270 + 253 030 01/15 3270 ENTER 3270 .sp 2 255 008 00/08 BACKSPACE, BACK SPACE, BACK CHAR Keyboard 255 009 00/09 TAB Keyboard