Skip to content

W
wine-winehq
Commit 8b00c3d6 authored by Robert Shearman's avatar Robert Shearman Committed by Alexandre Julliard
Browse files
Options

ttf files for bitmap fonts should be generated with an extension of

just "." to work around a quirk in fontforge (with thanks to George Williams for helping me fix this).
parent d5ebfb54
Show whitespace changes
Inline Side-by-side
Showing with 43 additions and 35 deletions
Make.rules.in
View file @ 8b00c3d6
...@@ -147,7 +147,7 @@ LINTS = $(C_SRCS:.c=.ln) ...@@ -147,7 +147,7 @@ LINTS = $(C_SRCS:.c=.ln)
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@ $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
.sfd.ttf: .sfd.ttf:
$(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
# 'all' target first in case the enclosing Makefile didn't define any target # 'all' target first in case the enclosing Makefile didn't define any target
......
fonts/.cvsignore
View file @ 8b00c3d6
...@@ -5,7 +5,7 @@ wine_courer.fon ...@@ -5,7 +5,7 @@ wine_courer.fon
wine_courier-1250-96-13.fnt wine_courier-1250-96-13.fnt
wine_courier-1251-96-13.fnt wine_courier-1251-96-13.fnt
wine_courier-1252-96-13.fnt wine_courier-1252-96-13.fnt
wine_courier.ttf wine_courier.
wine_marlett.ttf wine_marlett.ttf
wine_sans_serif-1250-96-13.fnt wine_sans_serif-1250-96-13.fnt
wine_sans_serif-1250-96-16.fnt wine_sans_serif-1250-96-16.fnt
...@@ -15,14 +15,14 @@ wine_sans_serif-1251-96-20.fnt ...@@ -15,14 +15,14 @@ wine_sans_serif-1251-96-20.fnt
wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-13.fnt
wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-16.fnt
wine_sans_serif-1252-96-20.fnt wine_sans_serif-1252-96-20.fnt
wine_sans_serif.ttf wine_sans_serif.
wine_sserife.fon wine_sserife.fon
wine_sserifee.fon wine_sserifee.fon
wine_sserifer.fon wine_sserifer.fon
wine_system-1250-96-16.fnt wine_system-1250-96-16.fnt
wine_system-1251-96-16.fnt wine_system-1251-96-16.fnt
wine_system-1252-96-16.fnt wine_system-1252-96-16.fnt
wine_system.ttf wine_system.
wine_vgasys.fon wine_vgasys.fon
wine_vgasyse.fon wine_vgasyse.fon
wine_vgasysr.fon wine_vgasysr.fon
fonts/Makefile.in
View file @ 8b00c3d6
...@@ -27,47 +27,56 @@ all: $(FONTS) ...@@ -27,47 +27,56 @@ all: $(FONTS)
@MAKE_RULES@ @MAKE_RULES@
wine_courier-1252-96-13.fnt: wine_courier.ttf $(SFNT2FNT) wine_courier.: wine_courier.sfd
$(LDPATH) $(SFNT2FNT) wine_courier.ttf 13 1252 96 128 8 $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
wine_courier-1250-96-13.fnt: wine_courier.ttf $(SFNT2FNT) wine_sans_serif.: wine_sans_serif.sfd
$(LDPATH) $(SFNT2FNT) wine_courier.ttf 13 1250 96 128 8 $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
wine_courier-1251-96-13.fnt: wine_courier.ttf $(SFNT2FNT) wine_system.: wine_system.sfd
$(LDPATH) $(SFNT2FNT) wine_courier.ttf 13 1251 96 128 8 $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@
wine_sans_serif-1252-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_courier-1252-96-13.fnt: wine_courier. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 13 1252 96 129 5 $(LDPATH) $(SFNT2FNT) $< 13 1252 96 128 8
wine_sans_serif-1252-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_courier-1250-96-13.fnt: wine_courier. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 16 1252 96 129 7 $(LDPATH) $(SFNT2FNT) $< 13 1250 96 128 8
wine_sans_serif-1252-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_courier-1251-96-13.fnt: wine_courier. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 20 1252 96 129 8 $(LDPATH) $(SFNT2FNT) $< 13 1251 96 128 8
wine_sans_serif-1250-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_sans_serif-1252-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 13 1250 96 129 5 $(LDPATH) $(SFNT2FNT) $< 13 1252 96 129 5
wine_sans_serif-1250-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_sans_serif-1252-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 16 1250 96 129 7 $(LDPATH) $(SFNT2FNT) $< 16 1252 96 129 7
wine_sans_serif-1251-96-13.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_sans_serif-1252-96-20.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 13 1251 96 129 5 $(LDPATH) $(SFNT2FNT) $< 20 1252 96 129 8
wine_sans_serif-1251-96-16.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_sans_serif-1250-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 16 1251 96 129 7 $(LDPATH) $(SFNT2FNT) $< 13 1250 96 129 5
wine_sans_serif-1251-96-20.fnt: wine_sans_serif.ttf $(SFNT2FNT) wine_sans_serif-1250-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_sans_serif.ttf 20 1251 96 129 8 $(LDPATH) $(SFNT2FNT) $< 16 1250 96 129 7
wine_system-1252-96-16.fnt: wine_system.ttf $(SFNT2FNT) wine_sans_serif-1251-96-13.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_system.ttf 16 1252 96 128 7 $(LDPATH) $(SFNT2FNT) $< 13 1251 96 129 5
wine_system-1250-96-16.fnt: wine_system.ttf $(SFNT2FNT) wine_sans_serif-1251-96-16.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_system.ttf 16 1250 96 128 7 $(LDPATH) $(SFNT2FNT) $< 16 1251 96 129 7
wine_system-1251-96-16.fnt: wine_system.ttf $(SFNT2FNT) wine_sans_serif-1251-96-20.fnt: wine_sans_serif. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) wine_system.ttf 16 1251 96 128 7 $(LDPATH) $(SFNT2FNT) $< 20 1251 96 129 8
wine_system-1252-96-16.fnt: wine_system. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1252 96 128 7
wine_system-1250-96-16.fnt: wine_system. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1250 96 128 7
wine_system-1251-96-16.fnt: wine_system. $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1251 96 128 7
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) 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 $@ $(FNT2FON) wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $@
...@@ -105,6 +114,6 @@ uninstall:: ...@@ -105,6 +114,6 @@ uninstall::
-rmdir $(fontdir) -rmdir $(fontdir)
clean:: clean::
$(RM) *.fon *.fnt *.ttf $(RM) *.fon *.fnt *.ttf wine_courier. wine_sans_serif. wine_system.
### Dependencies: ### Dependencies:
fonts/genttf.ff
View file @ 8b00c3d6
Open($1) Open($1)
ttfname = $1:t:r + ".ttf" Generate($2, "ttf", 0);
Generate(ttfname, "ttf", 0);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment