From 157e32950dcded05cef247a9be36f9f4eb6a9ffb Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Sun, 2 Apr 2017 02:37:28 +0300
Subject: Use a correct character conversion table for Finnish/Swedish.

---
 displaybase.c |  2 +-
 osdteletext.c |  3 +--
 txtfont.c     | 12 ++++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/displaybase.c b/displaybase.c
index 87d1084..b01079a 100644
--- a/displaybase.c
+++ b/displaybase.c
@@ -386,7 +386,7 @@ void cDisplay::DrawChar(int x, int y, cTeletextChar c) {
     }
 
     if (Zoom == Zoom_Lower) {
-        y -=11;
+        y -= 11;
     }
 
     int vx = x * fontWidth / 2;
diff --git a/osdteletext.c b/osdteletext.c
index e2dadf1..1c3eeb4 100644
--- a/osdteletext.c
+++ b/osdteletext.c
@@ -317,8 +317,7 @@ void cTeletextSetupPage::Store(void) {
    ttSetup.HideMainMenu=temp.HideMainMenu;
    ttSetup.txtFontName=temp.txtFontNames[temp.txtFontIndex];
    //ttSetup.inactivityTimeout=temp.inactivityTimeout;
-   std::cout << "store " << (const char *)temp.txtFontName << " " << temp.txtFontIndex << std::endl;
-   
+
    for (int i=0;i<LastActionKey;i++) {
       SetupStore(actionKeyNames[i].internalName, ttSetup.mapKeyToAction[i]);
    }
diff --git a/txtfont.c b/txtfont.c
index 36e624c..62caed3 100644
--- a/txtfont.c
+++ b/txtfont.c
@@ -3163,7 +3163,7 @@ int NationalOptionSubsetRO[13]=
 int NationalOptionSubsetSR_HR_SL[13]=
     {0x23,0   ,0   ,0   ,0   ,0xfb,0   ,0xdb,0   ,0   ,0   ,0   ,0   };
 int NationalOptionSubsetSV_FI[13]=
-    {0x23,0x94,0x90,0x5b,0x5c,0x9d,0x5d,0x5f,0x91,0x7b,0x7c,0x99,0x7d};
+    {0x23,0xa4,0xc9,0xc4,0xd6,0xc5,0xdc,0x5f,0xe9,0xe4,0xf6,0xe5,0xfc};
 int NationalOptionSubsetTR[13]=
     {0   ,0   ,0   ,0   ,0x5c,0xd7,0x5d,0   ,0   ,0   ,0x7c,0xcc,0x7d};
 #endif
@@ -3185,8 +3185,8 @@ inline int NationalOptionSubset(int chr) {
         case 0x7d: return 11;
         case 0x7e: return 12;
     }
-    return -1;      
-}   
+    return -1;
+}
 
 inline unsigned int LeftBits(unsigned int bits) {
     // Scale bit positions 0xfc00 to 0xfff0 positions
@@ -3412,9 +3412,9 @@ unsigned int* GetFontChar(cTeletextChar c, unsigned int *buffer) {
 unsigned int GetVTXChar(cTeletextChar c) {
     // convert  character for character/charset to utf8
     int convertedChar = 0;
-    enumCharsets font=c.GetCharset();
-    int chr=c.GetChar();
-    int NationalOption=NationalOptionSubset(chr);
+    enumCharsets font = c.GetCharset();
+    int chr = c.GetChar();
+    int NationalOption = NationalOptionSubset(chr);
 
     switch (font) {
     case CHARSET_LATIN_G0:
-- 
cgit v1.2.3