Rename Wine fonts to match Windows font names
Dmitry Timoshkov
dmitry at baikal.ru
Wed Sep 7 07:19:03 CDT 2005
Hello,
Alexandre suggested to rename Wine fonts to match Windows font names
instead of providing Wine specific FontReplacements registry section.
Alexandre suggested to rename font files as well.
In order to keep this patch small I don't provide the diffs for the moved
files. You need to apply this patch and then rename files to complete
the move:
mv wine_courier.sfd courier.sfd
mv wine_marlett.sfd marlett.sfd
mv wine_sans_serif.sfd ms_sans_serif.sfd
mv wine_system.sfd system.sfd
Changelog:
Dmitry Timoshkov <dmitry at codeweavers.com>
Rename Wine fonts to match Windows font names.
diff -up cvs/hq/wine/fonts/Makefile.in wine/fonts/Makefile.in
--- cvs/hq/wine/fonts/Makefile.in 2005-08-22 11:43:36.000000000 +0900
+++ wine/fonts/Makefile.in 2005-09-07 20:53:52.000000000 +0900
@@ -6,20 +6,20 @@ MODULE = none
fontdir = $(datadir)/fonts/wine
BITMAP_FONTS = \
- wine_coure.fon \
- wine_couree.fon \
- wine_courer.fon \
- wine_sserife.fon \
- wine_sserifee.fon \
- wine_sserifer.fon \
- wine_vgasys.fon \
- wine_vgasyse.fon \
- wine_vgasysr.fon \
- wine_svgasys.fon \
- wine_cvgasys.fon
+ coure.fon \
+ couree.fon \
+ courer.fon \
+ sserife.fon \
+ sserifee.fon \
+ sserifer.fon \
+ vgasys.fon \
+ vgasyse.fon \
+ vgasysr.fon \
+ svgasys.fon \
+ cvgasys.fon
TRUETYPE_FONTS = \
- wine_marlett.ttf
+ marlett.ttf
FONTS = \
$(BITMAP_FONTS) \
@@ -29,95 +29,95 @@ all: $(FONTS)
@MAKE_RULES@
-wine_courier.ttf: wine_courier.sfd
+courier.ttf: courier.sfd
$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
-wine_sans_serif.ttf: wine_sans_serif.sfd
+ms_sans_serif.ttf: ms_sans_serif.sfd
$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
-wine_system.ttf: wine_system.sfd
+system.ttf: system.sfd
$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
-wine_courier-1252-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
+courier-1252-96-13.fnt: courier.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 13 1252 96 128 8
-wine_courier-1250-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
+courier-1250-96-13.fnt: courier.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 13 1250 96 128 8
-wine_courier-1251-96-13.fnt: wine_courier.ttf $(SFNT2FNT)
+courier-1251-96-13.fnt: courier.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 13 1251 96 128 8
-wine_sans_serif-1252-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1252-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 13 1252 96 129 5
-wine_sans_serif-1252-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1252-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1252 96 129 7
-wine_sans_serif-1252-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1252-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 20 1252 96 129 8
-wine_sans_serif-1250-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1250-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 13 1250 96 129 5
-wine_sans_serif-1250-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1250-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1250 96 129 7
-wine_sans_serif-1251-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1251-96-13.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 13 1251 96 129 5
-wine_sans_serif-1251-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1251-96-16.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1251 96 129 7
-wine_sans_serif-1251-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT)
+ms_sans_serif-1251-96-20.fnt: ms_sans_serif.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 20 1251 96 129 8
-wine_system-1252-96-16.fnt: wine_system.ttf $(SFNT2FNT)
+system-1252-96-16.fnt: system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1252 96 128 7
-wine_system-1250-96-16.fnt: wine_system.ttf $(SFNT2FNT)
+system-1250-96-16.fnt: system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1250 96 128 7
-wine_system-1251-96-16.fnt: wine_system.ttf $(SFNT2FNT)
+system-1251-96-16.fnt: system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1251 96 128 7
-wine_system-936-96-16.fnt: wine_system.ttf $(SFNT2FNT)
+system-936-96-16.fnt: system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 936 96 128 7
-wine_system-950-96-16.fnt: wine_system.ttf $(SFNT2FNT)
+system-950-96-16.fnt: system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 950 96 128 7
-wine_coure.fon: wine_courier-1252-96-13.fnt $(FNT2FON)
- $(FNT2FON) wine_courier-1252-96-13.fnt $@
+coure.fon: courier-1252-96-13.fnt $(FNT2FON)
+ $(FNT2FON) courier-1252-96-13.fnt $@
-wine_couree.fon: wine_courier-1250-96-13.fnt $(FNT2FON)
- $(FNT2FON) wine_courier-1250-96-13.fnt $@
+couree.fon: courier-1250-96-13.fnt $(FNT2FON)
+ $(FNT2FON) courier-1250-96-13.fnt $@
-wine_courer.fon: wine_courier-1251-96-13.fnt $(FNT2FON)
- $(FNT2FON) wine_courier-1251-96-13.fnt $@
+courer.fon: courier-1251-96-13.fnt $(FNT2FON)
+ $(FNT2FON) courier-1251-96-13.fnt $@
-wine_sserife.fon: wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $(FNT2FON)
- $(FNT2FON) wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $@
+sserife.fon: ms_sans_serif-1252-96-13.fnt ms_sans_serif-1252-96-16.fnt ms_sans_serif-1252-96-20.fnt $(FNT2FON)
+ $(FNT2FON) ms_sans_serif-1252-96-13.fnt ms_sans_serif-1252-96-16.fnt ms_sans_serif-1252-96-20.fnt $@
-wine_sserifee.fon: wine_sans_serif-1250-96-13.fnt wine_sans_serif-1250-96-16.fnt $(FNT2FON)
- $(FNT2FON) wine_sans_serif-1250-96-13.fnt wine_sans_serif-1250-96-16.fnt $@
+sserifee.fon: ms_sans_serif-1250-96-13.fnt ms_sans_serif-1250-96-16.fnt $(FNT2FON)
+ $(FNT2FON) ms_sans_serif-1250-96-13.fnt ms_sans_serif-1250-96-16.fnt $@
-wine_sserifer.fon: wine_sans_serif-1251-96-13.fnt wine_sans_serif-1251-96-16.fnt wine_sans_serif-1251-96-20.fnt $(FNT2FON)
- $(FNT2FON) wine_sans_serif-1251-96-13.fnt wine_sans_serif-1251-96-16.fnt wine_sans_serif-1251-96-20.fnt $@
+sserifer.fon: ms_sans_serif-1251-96-13.fnt ms_sans_serif-1251-96-16.fnt ms_sans_serif-1251-96-20.fnt $(FNT2FON)
+ $(FNT2FON) ms_sans_serif-1251-96-13.fnt ms_sans_serif-1251-96-16.fnt ms_sans_serif-1251-96-20.fnt $@
-wine_vgasys.fon: wine_system-1252-96-16.fnt $(FNT2FON)
- $(FNT2FON) wine_system-1252-96-16.fnt $@
+vgasys.fon: system-1252-96-16.fnt $(FNT2FON)
+ $(FNT2FON) system-1252-96-16.fnt $@
-wine_vgasyse.fon: wine_system-1250-96-16.fnt $(FNT2FON)
- $(FNT2FON) wine_system-1250-96-16.fnt $@
+vgasyse.fon: system-1250-96-16.fnt $(FNT2FON)
+ $(FNT2FON) system-1250-96-16.fnt $@
-wine_vgasysr.fon: wine_system-1251-96-16.fnt $(FNT2FON)
- $(FNT2FON) wine_system-1251-96-16.fnt $@
+vgasysr.fon: system-1251-96-16.fnt $(FNT2FON)
+ $(FNT2FON) system-1251-96-16.fnt $@
-wine_svgasys.fon: wine_system-936-96-16.fnt wine_system-1252-96-16.fnt $(FNT2FON)
- $(FNT2FON) wine_system-936-96-16.fnt wine_system-1252-96-16.fnt $@
+svgasys.fon: system-936-96-16.fnt system-1252-96-16.fnt $(FNT2FON)
+ $(FNT2FON) system-936-96-16.fnt system-1252-96-16.fnt $@
-wine_cvgasys.fon: wine_system-950-96-16.fnt wine_system-1252-96-16.fnt $(FNT2FON)
- $(FNT2FON) wine_system-950-96-16.fnt wine_system-1252-96-16.fnt $@
+cvgasys.fon: system-950-96-16.fnt system-1252-96-16.fnt $(FNT2FON)
+ $(FNT2FON) system-950-96-16.fnt system-1252-96-16.fnt $@
install:: $(FONTS)
$(MKINSTALLDIRS) $(fontdir)
diff -up cvs/hq/wine/fonts/wine_courier.sfd wine/fonts/wine_courier.sfd
--- cvs/hq/wine/fonts/wine_courier.sfd 2004-12-15 20:43:42.000000000 +0800
+++ wine/fonts/wine_courier.sfd 2005-09-07 20:39:27.000000000 +0900
@@ -1,7 +1,7 @@
SplineFontDB: 1.0
-FontName: wine_courier
-FullName: Wine Courier
-FamilyName: Wine Courier
+FontName: courier
+FullName: Courier
+FamilyName: Courier
Weight: Medium
Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov
Comments: 2004-8-6: Created.
@@ -30,7 +30,7 @@ HheadDOffset: 1
ScriptLang: 2
1 latn 1 dflt
1 DFLT 1 dflt
-LangName: 1033 "" "" "" "FontForge 1.0 : Wine Courier : 9-7-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html"
+LangName: 1033 "" "" "" "FontForge 1.0 : Courier : 9-7-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html"
Encoding: unicode
UnicodeInterp: none
DisplaySize: 13
diff -up cvs/hq/wine/fonts/wine_marlett.sfd wine/fonts/wine_marlett.sfd
--- cvs/hq/wine/fonts/wine_marlett.sfd 2005-09-07 20:08:53.000000000 +0900
+++ wine/fonts/wine_marlett.sfd 2005-09-07 20:40:13.000000000 +0900
@@ -1,7 +1,7 @@
SplineFontDB: 1.0
-FontName: Wine_Marlett
-FullName: Wine Marlett
-FamilyName: Wine Marlett
+FontName: marlett
+FullName: Marlett
+FamilyName: Marlett
Weight: Regular
Copyright: Copyright (C) TransGaming Technologies. All rights reserved.
Version: 0.2
diff -up cvs/hq/wine/fonts/wine_sans_serif.sfd wine/fonts/wine_sans_serif.sfd
--- cvs/hq/wine/fonts/wine_sans_serif.sfd 2004-12-15 20:43:42.000000000 +0800
+++ wine/fonts/wine_sans_serif.sfd 2005-09-07 20:51:01.000000000 +0900
@@ -1,7 +1,7 @@
SplineFontDB: 1.0
-FontName: wine_sans_serif
-FullName: Wine Sans Serif
-FamilyName: Wine Sans Serif
+FontName: ms_sans_serif
+FullName: MS Sans Serif
+FamilyName: MS Sans Serif
Weight: Medium
Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov
Comments: 2004-6-17: Created.
@@ -33,7 +33,7 @@ ScriptLang: 2
TtfTable: cvt 4
!!!!)
EndTtf
-LangName: 1033 "" "" "" "FontForge 1.0 : Wine Sans Serif : 14-6-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html"
+LangName: 1033 "" "" "" "FontForge 1.0 : MS Sans Serif : 14-6-2004" "" "" "" "" "Created with FontForge 1.0 (http://fontforge.sourceforge.net)" "Huw D M Davies" "" "http://www.winehq.org" "" "This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version.+AAoA +AAoA-This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.+AAoA +AAoA-You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA+AAoA" "http://www.gnu.org/licenses/lgpl.html"
Encoding: unicode
UnicodeInterp: none
DisplaySize: 20
diff -up cvs/hq/wine/fonts/wine_system.sfd wine/fonts/wine_system.sfd
--- cvs/hq/wine/fonts/wine_system.sfd 2005-08-22 11:43:36.000000000 +0900
+++ wine/fonts/wine_system.sfd 2005-09-07 20:41:32.000000000 +0900
@@ -1,7 +1,7 @@
SplineFontDB: 1.0
-FontName: wine_system
-FullName: Wine System
-FamilyName: Wine System
+FontName: system
+FullName: System
+FamilyName: System
Weight: Bold
Copyright: Copyright (C) 2004 Huw D M Davies, Dmitry Timoshkov
Comments: 2004-7-15: Created.
diff -up cvs/hq/wine/fonts/.cvsignore wine/fonts/.cvsignore
--- cvs/hq/wine/fonts/.cvsignore 2005-08-22 11:43:36.000000000 +0900
+++ wine/fonts/.cvsignore 2005-09-07 21:13:53.000000000 +0900
@@ -1,32 +1,32 @@
Makefile
-wine_coure.fon
-wine_couree.fon
-wine_courer.fon
-wine_courier-1250-96-13.fnt
-wine_courier-1251-96-13.fnt
-wine_courier-1252-96-13.fnt
-wine_courier.ttf
-wine_cvgasys.fon
-wine_marlett.ttf
-wine_sans_serif-1250-96-13.fnt
-wine_sans_serif-1250-96-16.fnt
-wine_sans_serif-1251-96-13.fnt
-wine_sans_serif-1251-96-16.fnt
-wine_sans_serif-1251-96-20.fnt
-wine_sans_serif-1252-96-13.fnt
-wine_sans_serif-1252-96-16.fnt
-wine_sans_serif-1252-96-20.fnt
-wine_sans_serif.ttf
-wine_sserife.fon
-wine_sserifee.fon
-wine_sserifer.fon
-wine_svgasys.fon
-wine_system-1250-96-16.fnt
-wine_system-1251-96-16.fnt
-wine_system-1252-96-16.fnt
-wine_system-936-96-16.fnt
-wine_system-950-96-16.fnt
-wine_system.ttf
-wine_vgasys.fon
-wine_vgasyse.fon
-wine_vgasysr.fon
+coure.fon
+couree.fon
+courer.fon
+courier-1250-96-13.fnt
+courier-1251-96-13.fnt
+courier-1252-96-13.fnt
+courier.ttf
+cvgasys.fon
+marlett.ttf
+ms_sans_serif-1250-96-13.fnt
+ms_sans_serif-1250-96-16.fnt
+ms_sans_serif-1251-96-13.fnt
+ms_sans_serif-1251-96-16.fnt
+ms_sans_serif-1251-96-20.fnt
+ms_sans_serif-1252-96-13.fnt
+ms_sans_serif-1252-96-16.fnt
+ms_sans_serif-1252-96-20.fnt
+ms_sans_serif.ttf
+sserife.fon
+sserifee.fon
+sserifer.fon
+svgasys.fon
+system-1250-96-16.fnt
+system-1251-96-16.fnt
+system-1252-96-16.fnt
+system-936-96-16.fnt
+system-950-96-16.fnt
+system.ttf
+vgasys.fon
+vgasyse.fon
+vgasysr.fon
More information about the wine-patches
mailing list