diff options
Diffstat (limited to 'read.c')
| -rw-r--r-- | read.c | 27 |
1 files changed, 17 insertions, 10 deletions
@@ -1,3 +1,4 @@ +/* $XdotOrg$ */ /* Copyright (c) 2002 by Juliusz Chroboczek @@ -19,7 +20,8 @@ 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. */ -/* $XFree86: 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> @@ -116,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); @@ -177,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); |