[xorg-commit-diffs] xc/programs/fonttosfnt Imakefile, 1.1.4.4, 1.1.4.5 fonttosfnt.man, 1.1.4.1, 1.1.4.2 read.c, 1.1.4.2, 1.1.4.3 write.c, 1.1.4.1, 1.1.4.2

[Egbert Eich]

Committed by: eich

Update of /cvs/xorg/xc/programs/fonttosfnt
In directory pdx:/home/eich/tstbuild/xc/programs/fonttosfnt

Modified Files:
      Tag: XORG-CURRENT
	Imakefile fonttosfnt.man read.c write.c 
Log Message:
2004-04-15  Egbert Eich  <eich at freedesktop.org>
        Merged changes from RELEASE-1 branch
	


Index: Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/fonttosfnt/Imakefile,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -d -r1.1.4.4 -r1.1.4.5
--- a/Imakefile	5 Mar 2004 13:41:13 -0000	1.1.4.4
+++ b/Imakefile	15 Apr 2004 10:17:36 -0000	1.1.4.5
@@ -18,7 +18,7 @@
 
 FONTENC_INCS = -I$(BUILDINCDIR)/X11/fonts
 
-DEFINES  = $(SETENV_DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2
+DEFINES  = $(SETENV_DEFINES) $(SNPRINTF_DEFINES) -DXFREE86_FT2 $(VENDORSUPPORDEFS)
 INCLUDES = $(FONTENC_INCS) $(FREETYPE2INCLUDES) $(SNPRINTF_INCLUDES) -I$(XBUILDINCDIR)
 LOCAL_LIBRARIES = $(FREETYPE2LIB) $(XFONTENCLIB) GzipLibrary MathLibrary
 

Index: fonttosfnt.man
===================================================================
RCS file: /cvs/xorg/xc/programs/fonttosfnt/fonttosfnt.man,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/fonttosfnt.man	5 Mar 2004 13:41:13 -0000	1.1.4.1
+++ b/fonttosfnt.man	15 Apr 2004 10:17:36 -0000	1.1.4.2
@@ -69,8 +69,10 @@
 are dummy values.
 .SH SEE ALSO
 X(7), Xserver(1), Xft(3x).
-.I Fonts in XFree86.
+.I Fonts in X.
 .SH AUTHOR
+The version of
 .B Fonttosfnt
-was written by Juliusz Chroboczek <jch at xfree86.org> for the XFree86
-project.
+included in this X.Org Foundation release
+was originally written by Juliusz Chroboczek <jch at xfree86.org>
+for the XFree86 project.

Index: read.c
===================================================================
RCS file: /cvs/xorg/xc/programs/fonttosfnt/read.c,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -d -r1.1.4.2 -r1.1.4.3
--- a/read.c	5 Mar 2004 13:41:13 -0000	1.1.4.2
+++ b/read.c	15 Apr 2004 10:17:36 -0000	1.1.4.3
@@ -1,3 +1,4 @@
+/* $XdotOrg$ */
 /*
 Copyright (c) 2002 by Juliusz Chroboczek
 
@@ -117,14 +118,17 @@
            unique; it only needs to be unique among all installed fonts on a
            Windows system.  We don't bother getting it quite right. */
         if(face->num_fixed_sizes <= 0)
-            unique_name = sprintf_reliable("%s XFree86 bitmap", full_name);
+            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT" bitmap"
+					   , full_name);
         else if(face->available_sizes[0].width == 
                 face->available_sizes[0].height)
-            unique_name = sprintf_reliable("%s XFree86 bitmap size %d",
+            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT
+					   " bitmap size %d",
                                            full_name, 
                                            face->available_sizes[0].height);
         else
-            unique_name = sprintf_reliable("%s XFree86 bitmap size %dx%d",
+            unique_name = sprintf_reliable("%s "XVENDORNAMESHORT
+					   " bitmap size %dx%d",
                                            full_name, 
                                            face->available_sizes[0].width,
                                            face->available_sizes[0].height);
@@ -178,15 +182,17 @@
         }
 
         font->names[i].nid = 10;
-        font->names[i].size = 2 * strlen("XFree86 converted bitmap font");
-        font->names[i].value = makeUTF16("XFree86 converted bitmap font");
+        font->names[i].size = 2 * strlen(XVENDORNAMESHORT
+					 " converted bitmap font");
+        font->names[i].value = makeUTF16(XVENDORNAMESHORT
+					 "X converted bitmap font");
         i++;
-
+#ifdef __VENDORWEBSUPPORT__
         font->names[i].nid = 11;
-        font->names[i].size = 2 * strlen("http://www.xfree86.org");
-        font->names[i].value = makeUTF16("http://www.xfree86.org");
+        font->names[i].size = 2 * strlen(__VENDORWEBSUPPORT__);
+        font->names[i].value = makeUTF16(__VENDORWEBSUPPORT__);
         i++;
-
+#endif
         font->numNames = i;
 
         font->flags = faceFlags(face) | (symbol ? FACE_SYMBOL : 0);

Index: write.c
===================================================================
RCS file: /cvs/xorg/xc/programs/fonttosfnt/write.c,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/write.c	5 Mar 2004 13:41:13 -0000	1.1.4.1
+++ b/write.c	15 Apr 2004 10:17:36 -0000	1.1.4.2
@@ -1030,7 +1030,7 @@
 static int 
 writePCLT(FILE* out, FontPtr font)
 {
-    char name[16] = "XFree86 font    ";
+    char name[16] = XVENDORNAME" font    ";
     char filename[6] = "X11R00";
     unsigned char charComplement[8] = 
         {0xFF, 0xFF, 0xFF, 0xFF, 0x0B, 0xFF, 0xFF, 0xFE};