diff options
| -rw-r--r-- | fonttosfnt.man | 8 | ||||
| -rw-r--r-- | read.c | 26 | ||||
| -rw-r--r-- | write.c | 2 |
3 files changed, 22 insertions, 14 deletions
diff --git a/fonttosfnt.man b/fonttosfnt.man index 3a189cf..5bc5ef2 100644 --- a/fonttosfnt.man +++ b/fonttosfnt.man @@ -69,8 +69,10 @@ Some of the font-level values, notably sub- and superscript positions, 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@xfree86.org> for the XFree86 -project. +included in this X.Org Foundation release +was originally written by Juliusz Chroboczek <jch@xfree86.org> +for the XFree86 project. @@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* Copyright (c) 2002 by Juliusz Chroboczek @@ -19,7 +20,7 @@ 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. */ -/* $XdotOrg: xc/programs/fonttosfnt/read.c,v 1.6 2003/12/19 02:16:36 dawes Exp $ */ +/* $XdotOrg$ */ /* $XFree86: xc/programs/fonttosfnt/read.c,v 1.5 2003/12/19 02:05:39 dawes Exp $ */ #include <stdio.h> @@ -117,14 +118,17 @@ readFile(char *filename, FontPtr font) 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 @@ readFile(char *filename, FontPtr font) } 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); @@ -1030,7 +1030,7 @@ writeOS2(FILE* out, FontPtr font) 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}; |