Greek language texts now use iso8859-7 character set

CONTRIBUTORS

@@ -408,6 +408,7 @@ Simon Dean <linux-dvb@sickhack.com>
 Dimitrios Dimitrakos <mail@dimitrios.de>
  for translating OSD texts to the Greek language
  for fixing handling the LOG_LOCALn parameters in the -l option
+ for providing the iso8859-7 fonts
 
 Marcus Kuba <marcus@kuba4u.de>
  for reporting a bug in the unit of the "SVDRP timeout" setup parameter

HISTORY

@@ -2455,3 +2455,5 @@ Video Disk Recorder Revision History
 - Changed font handling to allow language specific character sets.
 - Adopted the small font character set from the "Elchi" patch (originally
   provided by Alessio Sangalli).
+- Greek language texts now use iso8859-7 character set (thanks to Dimitrios
+  Dimitrakos).

Makefile

@@ -4,7 +4,7 @@
 # See the main source file 'vdr.c' for copyright information and
 # how to reach the author.
 #
-# $Id: Makefile 1.59 2003/10/24 12:53:12 kls Exp $
+# $Id: Makefile 1.60 2003/10/24 13:13:02 kls Exp $
 
 .DELETE_ON_ERROR:
 
@@ -42,6 +42,9 @@ OBJS = audio.o channels.o ci.o config.o cutter.o device.o diseqc.o dvbdevice.o d
 FIXFONT_ISO8859_1 = -adobe-courier-bold-r-normal--25-*-100-100-m-*-iso8859-1
 OSDFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--23-*-100-100-p-*-iso8859-1
 SMLFONT_ISO8859_1 = -adobe-helvetica-medium-r-normal--18-*-100-100-p-*-iso8859-1
+FIXFONT_ISO8859_7 = --user-medium-r-normal--26-171-110-110-m-140-iso8859-7
+OSDFONT_ISO8859_7 = --user-medium-r-normal--23-179-85-85-m-120-iso8859-7
+SMLFONT_ISO8859_7 = --user-medium-r-normal--19-160-72-72-m-110-iso8859-7
 
 ifndef NO_KBD
 DEFINES += -DREMOTE_KBD
@@ -65,7 +68,9 @@ DEFINES += -DVFAT
 endif
 
 all: vdr
-font: genfontfile fontfix.c fontosd.c fontsml.c
+font: genfontfile\
+      fontfix.c fontosd.c fontsml.c\
+      fontfix_iso8859_7.c fontosd_iso8859_7.c fontsml_iso8859_7.c
 	@echo "font files created."
 
 # Implicit rules:
@@ -95,6 +100,12 @@ fontosd.c:
 	./genfontfile "cFont::tPixelData FontOsd_iso8859_1" "$(OSDFONT_ISO8859_1)" > $@
 fontsml.c:
 	./genfontfile "cFont::tPixelData FontSml_iso8859_1" "$(SMLFONT_ISO8859_1)" > $@
+fontfix_iso8859_1.c:
+	./genfontfile "cFont::tPixelData FontFix_iso8859_7" "$(FIXFONT_ISO8859_7)" > $@
+fontosd_iso8859_1.c:
+	./genfontfile "cFont::tPixelData FontOsd_iso8859_7" "$(OSDFONT_ISO8859_7)" > $@
+fontsml_iso8859_1.c:
+	./genfontfile "cFont::tPixelData FontSml_iso8859_7" "$(SMLFONT_ISO8859_7)" > $@
 
 # The font file generator:
 
@@ -148,6 +159,6 @@ clean:
 	-rm -rf include
 	-rm -rf srcdoc
 fontclean:
-	-rm -f fontfix.c fontosd.c fontsml.c
+	-rm -f fontfix*.c fontosd*.c fontsml*.c
 CLEAN: clean fontclean
 

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.3 2003/10/24 12:51:43 kls Exp $
+ * $Id: font.c 1.4 2003/10/24 12:59:35 kls Exp $
  */
 
 #include "font.h"
@@ -14,12 +14,18 @@
 #include "fontosd.c"
 #include "fontsml.c"
 
+#include "fontfix-iso8859-7.c"
+#include "fontosd-iso8859-7.c"
+#include "fontsml-iso8859-7.c"
+
 static void *FontData[eDvbCodeSize][eDvbFontSize] = {
   { FontOsd_iso8859_1, FontFix_iso8859_1, FontSml_iso8859_1 },
+  { FontOsd_iso8859_7, FontFix_iso8859_7, FontSml_iso8859_7 }
   };
 
 static const char *FontCode[eDvbCodeSize] = {
   "iso8859-1",
+  "iso8859-7"
   };
 
 eDvbCode cFont::code = code_iso8859_1;

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.3 2003/10/24 12:52:46 kls Exp $
+ * $Id: font.h 1.4 2003/10/24 12:59:45 kls Exp $
  */
 
 #ifndef __FONT_H
@@ -21,7 +21,8 @@ enum eDvbFont {
 
 enum eDvbCode {
   code_iso8859_1,
-#define eDvbCodeSize (code_iso8859_1 + 1)
+  code_iso8859_7
+#define eDvbCodeSize (code_iso8859_7 + 1)
   };
 
 class cFont {