Attachment 1200 Details for Bug 1703 – Prototype patch for 2004-10-31-trunk

[patch] Prototype patch for 2004-10-31-trunk

patch.gudiff (text/plain), 6.02 KB, created by Roland Mainz on 2004-11-01 00:43:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Roland Mainz

Created: 2004-11-01 00:43:18 UTC

Size: 6.02 KB

patch

obsolete

>Index: xc/fonts/encodings/Imakefile
>===================================================================
>RCS file: /cvs/xorg/xc/fonts/encodings/Imakefile,v
>retrieving revision 1.3
>diff -u -2 -0 -r1.3 Imakefile
>--- xc/fonts/encodings/Imakefile	18 Oct 2004 14:21:44 -0000	1.3
>+++ xc/fonts/encodings/Imakefile	1 Nov 2004 08:39:02 -0000
>@@ -1,65 +1,67 @@
> XCOMM $XdotOrg: xc/fonts/encodings/Imakefile,v 1.3 2004/10/18 14:21:44 eich Exp $
> XCOMM $XFree86: xc/fonts/encodings/Imakefile,v 1.10 2003/06/26 10:19:41 eich Exp $
> 
> #define IHaveSubdirs
> #define PassCDebugFlags 'CDEBUGFLAGS=$(CDEBUGFLAGS)'
> 
> SUBDIRS = large
> 
> OBJS = EncObjComp(adobe-dingbats) EncObjComp(adobe-standard) \
> 	EncObjComp(adobe-symbol) \
> 	EncObjComp(ansi-1251) \
> 	EncObjComp(armscii-8) \
>+	EncObjComp(ascii-0) \
> 	EncObjComp(dec-special) \
> 	EncObjComp(ibm-cp437) EncObjComp(ibm-cp850) \
> 	EncObjComp(ibm-cp852) EncObjComp(ibm-cp866) \
> 	EncObjComp(iso8859-6.16) EncObjComp(iso8859-6.8x) \
> 	EncObjComp(iso8859-11) EncObjComp(iso8859-13) \
> 	EncObjComp(iso8859-16) \
> 	EncObjComp(suneu-greek) \
> 	EncObjComp(microsoft-cp1250) EncObjComp(microsoft-cp1251) \
> 	EncObjComp(microsoft-cp1252) EncObjComp(microsoft-cp1253) \
> 	EncObjComp(microsoft-cp1254) EncObjComp(microsoft-cp1255) \
> 	EncObjComp(microsoft-cp1256) EncObjComp(microsoft-cp1257) \
> 	EncObjComp(microsoft-cp1258) EncObjComp(microsoft-win3.1) \
> 	EncObjComp(mulearabic-0) EncObjComp(mulearabic-1) \
> 	EncObjComp(mulearabic-2) EncObjComp(mulelao-1) \
> 	EncObjComp(tcvn-0) EncObjComp(tis620-2) EncObjComp(viscii1.1-1)
> 
> DONES = large/DONE
> 
> #if HasParallelMake
> MakeMutex($(SUBDIRS) $(DONES))
> #endif
> 
> #if HasGnuMake || HasBsdMake
> $(DONES): $(SUBDIRS)
> #endif
> 
> MakeEncodings($(SUBDIRS) $(DONES),$(ENCODINGSDIR),. large)
> 
> CompEncodingTarget(adobe-dingbats)
> CompEncodingTarget(adobe-standard)
> CompEncodingTarget(adobe-symbol)
> CompEncodingTarget(ansi-1251)
> CompEncodingTarget(armscii-8) 
>+CompEncodingTarget(ascii-0) 
> CompEncodingTarget(dec-special) 
> CompEncodingTarget(ibm-cp437) 
> CompEncodingTarget(ibm-cp850) 
> CompEncodingTarget(ibm-cp852) 
> CompEncodingTarget(ibm-cp866) 
> CompEncodingTarget(iso8859-6.16) 
> CompEncodingTarget(iso8859-6.8x) 
> CompEncodingTarget(iso8859-11) 
> CompEncodingTarget(iso8859-13) 
> CompEncodingTarget(iso8859-16) 
> CompEncodingTarget(suneu-greek)
> CompEncodingTarget(microsoft-cp1250) 
> CompEncodingTarget(microsoft-cp1251) 
> CompEncodingTarget(microsoft-cp1252) 
> CompEncodingTarget(microsoft-cp1253) 
> CompEncodingTarget(microsoft-cp1254) 
> CompEncodingTarget(microsoft-cp1255) 
> CompEncodingTarget(microsoft-cp1256) 
> CompEncodingTarget(microsoft-cp1257) 
> CompEncodingTarget(microsoft-cp1258) 
>Index: xc/fonts/encodings/ascii-0.enc
>===================================================================
>RCS file: xc/fonts/encodings/ascii-0.enc
>diff -N xc/fonts/encodings/ascii-0.enc
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ xc/fonts/encodings/ascii-0.enc	1 Nov 2004 08:39:02 -0000
>@@ -0,0 +1,101 @@
>+STARTENCODING ascii-0
>+SIZE 0x100
>+STARTMAPPING unicode
>+ 
>+0x21 0x0021
>+0x22 0x0022
>+0x23 0x0023
>+0x24 0x0024
>+0x25 0x0025
>+0x26 0x0026
>+0x27 0x0027
>+0x28 0x0028
>+0x29 0x0029
>+0x2A 0x002A
>+0x2B 0x002B
>+0x2C 0x002C
>+0x2D 0x002D
>+0x2E 0x002E
>+0x2F 0x002F
>+0x30 0x0030
>+0x31 0x0031
>+0x32 0x0032
>+0x33 0x0033
>+0x34 0x0034
>+0x35 0x0035
>+0x36 0x0036
>+0x37 0x0037
>+0x38 0x0038
>+0x39 0x0039
>+0x3A 0x003A
>+0x3B 0x003B
>+0x3C 0x003C
>+0x3D 0x003D
>+0x3E 0x003E
>+0x3F 0x003F
>+0x40 0x0040
>+0x41 0x0041
>+0x42 0x0042
>+0x43 0x0043
>+0x44 0x0044
>+0x45 0x0045
>+0x46 0x0046
>+0x47 0x0047
>+0x48 0x0048
>+0x49 0x0049
>+0x4A 0x004A
>+0x4B 0x004B
>+0x4C 0x004C
>+0x4D 0x004D
>+0x4E 0x004E
>+0x4F 0x004F
>+0x50 0x0050
>+0x51 0x0051
>+0x52 0x0052
>+0x53 0x0053
>+0x54 0x0054
>+0x55 0x0055
>+0x56 0x0056
>+0x57 0x0057
>+0x58 0x0058
>+0x59 0x0059
>+0x5A 0x005A
>+0x5B 0x005B
>+0x5C 0x005C
>+0x5D 0x005D
>+0x5E 0x005E
>+0x5F 0x005F
>+0x60 0x0060
>+0x61 0x0061
>+0x62 0x0062
>+0x63 0x0063
>+0x64 0x0064
>+0x65 0x0065
>+0x66 0x0066
>+0x67 0x0067
>+0x68 0x0068
>+0x69 0x0069
>+0x6A 0x006A
>+0x6B 0x006B
>+0x6C 0x006C
>+0x6D 0x006D
>+0x6E 0x006E
>+0x6F 0x006F
>+0x70 0x0070
>+0x71 0x0071
>+0x72 0x0072
>+0x73 0x0073
>+0x74 0x0074
>+0x75 0x0075
>+0x76 0x0076
>+0x77 0x0077
>+0x78 0x0078
>+0x79 0x0079
>+0x7A 0x007A
>+0x7B 0x007B
>+0x7C 0x007C
>+0x7D 0x007D
>+0x7E 0x007E
>+0x7F 0x0020
>+ENDMAPPING
>+ENDENCODING
>Index: xc/programs/mkfontscale/mkfontscale.c
>===================================================================
>RCS file: /cvs/xorg/xc/programs/mkfontscale/mkfontscale.c,v
>retrieving revision 1.2
>diff -u -2 -0 -r1.2 mkfontscale.c
>--- xc/programs/mkfontscale/mkfontscale.c	23 Apr 2004 19:54:36 -0000	1.2
>+++ xc/programs/mkfontscale/mkfontscale.c	1 Nov 2004 08:39:18 -0000
>@@ -46,41 +46,42 @@
> #include "hash.h"
> #include "data.h"
> #include "ident.h"
> 
> #ifdef NEED_SNPRINTF
> #undef SCOPE
> #define SCOPE static
> #include "snprintf.c"
> #endif
> 
> #define NPREFIX 1024
> 
> #ifndef MAXFONTFILENAMELEN
> #define MAXFONTFILENAMELEN 1024
> #endif
> #ifndef MAXFONTNAMELEN
> #define MAXFONTNAMELEN 1024
> #endif
> 
> char *encodings_array[] =
>-    { "iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
>+    { "ascii-0",
>+      "iso8859-1", "iso8859-2", "iso8859-3", "iso8859-4", "iso8859-5",
>       "iso8859-6", "iso8859-6.8", "iso8859-6.8x", "iso8859-6.16",
>       "iso8859-7", "iso8859-8", "iso8859-9", "iso8859-10",
>       "iso8859-11", "iso8859-12", "iso8859-13", "iso8859-14",
>       "iso8859-15", "iso8859-16",
>       "ansi-1251", "koi8-r", "koi8-u", "koi8-ru", "koi8-e", "koi8-uni",
>       "tis620-2",
>       "sun.unicode.india-0", "suneu-greek",
>       "adobe-standard", "adobe-symbol",
>       "ibm-cp437", "ibm-cp850", "ibm-cp852", "ibm-cp866", "microsoft-cp1252",
>       /* But not "adobe-dingbats", as it uses generic glyph names. */
>       "cns11643-1", "cns11643-2", "cns11643-3",
>       "jisx0201.1976-0", "jisx0208.1983-0", "jisx0208.1990-0",
>       "jisx0212.1990-0", "big5-0", "big5.eten-0", "big5hkscs-0",
>       "gb2312.1980-0", "gb18030.2000-0", "gb18030.2000-1",
>       "ksc5601.1987-0", "ksc5601.1992-3"};
> 
> char *extra_encodings_array[] =
>     { "iso10646-1", "adobe-fontspecific", "microsoft-symbol" };
> 
> ListPtr encodings, extra_encodings;

Actions: View | Splinter Review

Attachments on bug 1703: 1200 | 1226

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.