diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 55d703a1..a5e36c6b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1113,3 +1113,4 @@ Stefan Meyknecht Lucian Muresan for updating the Romanian language texts and the iso8859-2 fonts + for making VDR actually use the iso8859-15 fonts diff --git a/HISTORY b/HISTORY index 485e1f2d..24a5dd2b 100644 --- a/HISTORY +++ b/HISTORY @@ -3055,3 +3055,4 @@ Video Disk Recorder Revision History - Taking the complete size of available data into account when deciding whether to clear the transfer buffer to avoid overflows (thanks to Reinhard Nissl). - Updated Romanian language texts and the iso8859-2 fonts (thanks to Lucian Muresan). +- Now actually using the iso8859-15 fonts (thanks to Lucian Muresan). diff --git a/font.c b/font.c index bd6a3b11..29f94944 100644 --- a/font.c +++ b/font.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: font.c 1.8 2004/05/31 14:09:00 kls Exp $ + * $Id: font.c 1.9 2004/10/23 14:06:01 kls Exp $ */ #include "config.h" @@ -28,13 +28,18 @@ #include "fontosd-iso8859-7.c" #include "fontsml-iso8859-7.c" +#include "fontfix-iso8859-15.c" +#include "fontosd-iso8859-15.c" +#include "fontsml-iso8859-15.c" + // --- cFont ----------------------------------------------------------------- static void *FontData[eDvbCodeSize][eDvbFontSize] = { - { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 }, - { FontOsd_iso8859_2, FontFix_iso8859_2, FontSml_iso8859_2 }, - { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5 }, - { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 }, + { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 }, + { FontOsd_iso8859_2, FontFix_iso8859_2, FontSml_iso8859_2 }, + { FontOsd_iso8859_5, FontFix_iso8859_5, FontSml_iso8859_5 }, + { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 }, + { FontOsd_iso8859_15, FontFix_iso8859_15, FontSml_iso8859_15 }, }; static const char *FontCode[eDvbCodeSize] = { @@ -42,6 +47,7 @@ static const char *FontCode[eDvbCodeSize] = { "iso8859-2", "iso8859-5", "iso8859-7", + "iso8859-15", }; eDvbCode cFont::code = code_iso8859_1; diff --git a/font.h b/font.h index 36aab9dc..5d74f66c 100644 --- a/font.h +++ b/font.h @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: font.h 1.8 2004/05/31 14:09:00 kls Exp $ + * $Id: font.h 1.9 2004/10/23 14:06:37 kls Exp $ */ #ifndef __FONT_H @@ -24,7 +24,8 @@ enum eDvbCode { code_iso8859_2, code_iso8859_5, code_iso8859_7, -#define eDvbCodeSize (code_iso8859_7 + 1) + code_iso8859_15, +#define eDvbCodeSize (code_iso8859_15 + 1) }; class cFont {