Fonts (+liberation again...)

[Louis. Lenders]

Hi , a few weeks ago posted something about if liberation fonts could be included in wine. There didn't seem to be one view of how to do that. Of course 'winetricks liberation' is great, but i'd like to see something that works out of the box on a fresh .wine. Attached is a patch, that generates Arial.ttf from liberation font (just like winetricks) but this is an attempt to get it included in wine's source. To summarize, i added a file arial.ttf2sfd that changes a liberation font into "arial.sfd", change appropriate family/font name, and then generate the arial.ttf. All is done by fonforge.

Of course this patch lacks checking for presence of liberation, and has ugly hard-coded path for the liberation-font, but that could be worked on later on.

Simple question: Could something like this  be  included in the source, otherwise i'm not gonna spend any time improving it. Any hints welcomed.

Regards, louis

---------------------------------
 Yahoo! Answers - Get better answers from someone who knows. Tryit now.

diff --git a/Make.rules.in b/Make.rules.in
index a32b276..257598e 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -126,7 +126,7 @@ LINTS  = $(C_SRCS:.c=.ln)

# Implicit rules

-.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .man.in .man _c.c _i.c _p.c _s.c
+.SUFFIXES: .mc .rc .mc.rc .res .res.o .spec .spec.o .idl .tlb .h .y .l .tab.c .tab.h .yy.c .ok .sfd .ttf .ttf2sfd .man.in .man _c.c _i.c _p.c _s.c

.c.o:
    $(CC) -c $(ALLCFLAGS) -o $@ $<
@@ -179,6 +179,9 @@ LINTS  = $(C_SRCS:.c=.ln)
 .c.ok:
    $(RUNTEST) $(RUNTESTFLAGS) $< && touch $@

+.ttf2sfd.sfd:
+	$(FONTFORGE) -script $(TOPSRCDIR)/fonts/$< $< $@
+
 .sfd.ttf:
    $(FONTFORGE) -script $(TOPSRCDIR)/fonts/genttf.ff $< $@

diff --git a/configure b/configure
diff --git a/dlls/gdi32/dc.c b/dlls/gdi32/dc.c
diff --git a/dlls/shell32/shell32_En.rc b/dlls/shell32/shell32_En.rc
diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c
diff --git a/fonts/Makefile.in b/fonts/Makefile.in
index 2a69d6a..35d1e71 100644
--- a/fonts/Makefile.in
+++ b/fonts/Makefile.in
@@ -47,11 +47,16 @@ BITMAP_FONTS  = \
    vgas1257.fon \
    vgas874.fon

+TTF2SFD = \
+        arial.sfd
+
 TRUETYPE_FONTS = \
-	marlett.ttf
+	marlett.ttf \
+        arial.ttf

FONTS = \
    $(BITMAP_FONTS) \
+	$(TTF2SFD) \
    $(TRUETYPE_FONTS)

all: $(FONTS)
diff --git a/fonts/arial.ttf2sfd b/fonts/arial.ttf2sfd
new file mode 100644
index 0000000..2ce704e
--- /dev/null
+++ b/fonts/arial.ttf2sfd
@@ -0,0 +1,3 @@
+Open("/usr/share/fonts/liberation/LiberationSans-Regular.ttf");
+SetFontNames("ArialMT", "Arial", "Arial");
+Generate($2);
diff --git a/include/setupapi.h b/include/setupapi.h
diff --git a/tools/wine.inf b/tools/wine.inf

[Alexandre Julliard]

"Louis. Lenders"  writes:
> Of course this patch lacks checking for presence of liberation, and
> has ugly hard-coded path for the liberation-font, but that could be
> worked on later on.
>
> Simple question: Could something like this be included in the
> source, otherwise i'm not gonna spend any time improving it. Any
> hints welcomed.

No, it can't be included, the fonts are GPL not LGPL, and you don't
want to silently insert them into the Wine binary packages.

[mark cox]

Louis, What about a wine-fonts package? That would avoid the gpl issue.

On 13/08/07, Alexandre Julliard  wrote:
> "Louis. Lenders"  writes:
> > Of course this patch lacks checking for presence of liberation, and
> > has ugly hard-coded path for the liberation-font, but that could be
> > worked on later on.
> >
> > Simple question: Could something like this be included in the
> > source, otherwise i'm not gonna spend any time improving it. Any
> > hints welcomed.
>
> No, it can't be included, the fonts are GPL not LGPL, and you don't
> want to silently insert them into the Wine binary packages.
>
> --
> Alexandre Julliard
> [e-mail]