[Libreoffice] [PATCH] Re: Liberation fonts in Windows

Please find attached the patch in any case.

Thanks

Olivier


Em 27-10-2011 11:04, Kálmán „KAMI” Szalai escreveu:
> I guess this is not a decision just a legacy thing. I think we could 
> enable it.
>
> KAMI
>
> On 10/27/2011 01:55 PM, Olivier Hallot wrote:
> > Hi
> >
> > in a recent discussion in the UX list, I questioned why Liberation 
> > Sans|Serif are not bundled in Windows (see
> >
> > http://opengrok.libreoffice.org/xref/core/scp2/source/ooo/file_font_ooo.scp 
> > )
> >
> > I got a guess from Andras Timar, but I really would like to 
> > understand this decision and if possible review it.
> >
> > For instance, why are we distributing other fonts (Deja Vu, 
> > Libertine, Bioline...) for all platforms and this one (Liberation) 
> > explicitely not in Windows.
> >
> > Thanks for the response.
> _______________________________________________
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

--
Olivier Hallot
Founder, Steering Commitee Member - The Document Foundation
LibreOffice translation leader for Brazilian Portuguese
+55-21-8822-8812

From d50e539893284e39e4c7e65c3e427a3bb4ea5357 Mon Sep 17 00:00:00 2001
From: Olivier Hallot <olivier.hallot@alta.org.br>
Date: Thu, 27 Oct 2011 11:27:27 -0200
Subject: [PATCH] Remove restriction for Liberation fonts in Windows build

---
 scp2/source/ooo/file_font_ooo.scp |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/scp2/source/ooo/file_font_ooo.scp b/scp2/source/ooo/file_font_ooo.scp
index 55e1f0f..fef7b3b 100644
--- a/scp2/source/ooo/file_font_ooo.scp
+++ b/scp2/source/ooo/file_font_ooo.scp
@@ -91,33 +91,27 @@ STD_FONT_FILE( gid_File_Fnt_LibSansNarrow_BoldItalic, LiberationSansNarrow-BoldI
 
 // Liberation Mono
 #ifndef WITHOUT_FONTS 
-#ifndef WNT 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_Regular, LiberationMono-Regular.ttf, Liberation Mono 
Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_Bold, LiberationMono-Bold.ttf, Liberation Mono Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_Italic, LiberationMono-Italic.ttf, Liberation Mono 
Italic) 
 STD_FONT_FILE( gid_File_Fnt_LiberationMono_BoldItalic, LiberationMono-BoldItalic.ttf, Liberation 
Mono Bold Italic) 
 #endif
-#endif
 
 // Liberation Sans
 #ifndef WITHOUT_FONTS 
-#ifndef WNT 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Regular, LiberationSans-Regular.ttf, Liberation Sans 
Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Italic, LiberationSans-Italic.ttf, Liberation Sans 
Italic) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_Bold, LiberationSans-Bold.ttf, Liberation Serif Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSans_BoldItalic, LiberationSans-BoldItalic.ttf, Liberation 
Sans Bold Italic) 
 #endif
-#endif
 
 // Liberation Serif
 #ifndef WITHOUT_FONTS 
-#ifndef WNT 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Regular, LiberationSerif-Regular.ttf, Liberation Serif 
Regular) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Bold, LiberationSerif-Bold.ttf, Liberation Serif Bold) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_Italic, LiberationSerif-Italic.ttf, Liberation Serif 
Italic) 
 STD_FONT_FILE( gid_File_Fnt_LiberationSerif_BoldItalic, LiberationSerif-BoldItalic.ttf, Liberation 
Serif Bold Italic) 
 #endif
-#endif
 
 // Gentium fonts
 
-- 
1.7.5.4