Unicode Text-file support

- lyrics, song-title, artist, etc. are now UTF8 strings
- filenames need some work (UTF-8 on Mac, otherwise still native encoding. Should always be UTF-8 instead)

File encoding:
- if the file starts with a UTF-8 BOM, UTF-8 is assumed
- if the file contains an encoding header (#ENCODING: UTF8/CP1252/CP1250), the given encoding is used
- if neither of the previous applies the default encoding (stored in the config-file, default CP1252 = USDX 1.01a encoding) is used

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/experimental@1510 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 116 insertions, 96 deletions

diff --git a/unicode/src/base/USongs.pas b/unicode/src/base/USongs.pas
index 6f66bf3f..be880433 100644
--- a/unicode/src/base/USongs.pas
+++ b/unicode/src/base/USongs.pas
@@ -156,7 +156,8 @@ uses StrUtils,
      UCovers,
      UFiles,
      UMain,
-     UIni;
+     UIni,
+     UUnicodeUtils;
 
 constructor TSongs.Create();
 begin
@@ -459,14 +460,14 @@ procedure TCatSongs.Refresh;
 var
   SongIndex:   integer;
   CurSong:     TSong;
-  CatIndex:    integer; // index of current song in Song
-  Letter:      char;    // current letter for sorting using letter
-  CurCategory: string;  // current edition for sorting using edition, genre etc.
-  Order:       integer; // number used for ordernum
-  LetterTmp:   char;
-  CatNumber:   integer; // Number of Song in Category
-
-  procedure AddCategoryButton(const CategoryName: string);
+  CatIndex:    integer;    // index of current song in Song
+  Letter:      UCS4Char;   // current letter for sorting using letter
+  CurCategory: UTF8String; // current edition for sorting using edition, genre etc.
+  Order:       integer;    // number used for ordernum
+  LetterTmp:   UCS4Char;
+  CatNumber:   integer;    // Number of Song in Category
+
+  procedure AddCategoryButton(const CategoryName: UTF8String);
   var
     PrevCatBtnIndex: integer;
   begin
@@ -501,7 +502,7 @@ begin
   // Note: do NOT set Letter to ' ', otherwise no category-button will be
   // created for songs beginning with ' ' if songs of this category exist.
   // TODO: trim song-properties so ' ' will not occur as first chararcter. 
-  Letter := #0;
+  Letter := 0;
 
   // clear song-list
   for SongIndex := 0 to Songs.SongList.Count-1 do
@@ -520,101 +521,120 @@ begin
     // if tabs are on, add section buttons for each new section
     if (Ini.Tabs = 1) then
     begin
-      if (Ini.Sorting = sEdition) and
-         (CompareText(CurCategory, CurSong.Edition) <> 0) then
-      begin
-        CurCategory := CurSong.Edition;
-
-        // TODO: remove this block if it is not needed anymore
-        {
-        if CurSection = 'Singstar Part 2' then CoverName := 'Singstar';
-        if CurSection = 'Singstar German' then CoverName := 'Singstar';
-        if CurSection = 'Singstar Spanish' then CoverName := 'Singstar';
-        if CurSection = 'Singstar Italian' then CoverName := 'Singstar';
-        if CurSection = 'Singstar French' then CoverName := 'Singstar';
-        if CurSection = 'Singstar 80s Polish' then CoverName := 'Singstar 80s';
-        }
-
-        // add Category Button
-        AddCategoryButton(CurCategory);
-      end
-
-      else if (Ini.Sorting = sGenre) and
-              (CompareText(CurCategory, CurSong.Genre) <> 0) then
-      begin
-        CurCategory := CurSong.Genre;
-        // add Genre Button
-        AddCategoryButton(CurCategory);
-      end
-
-      else if (Ini.Sorting = sLanguage) and
-              (CompareText(CurCategory, CurSong.Language) <> 0) then
-      begin
-        CurCategory := CurSong.Language;
-        // add Language Button
-        AddCategoryButton(CurCategory);
-      end
+      case (Ini.Sorting) of
+        sEdition: begin
+          if (CompareText(CurCategory, CurSong.Edition) <> 0) then
+          begin
+            CurCategory := CurSong.Edition;
+
+            // TODO: remove this block if it is not needed anymore
+            {
+            if CurSection = 'Singstar Part 2' then CoverName := 'Singstar';
+            if CurSection = 'Singstar German' then CoverName := 'Singstar';
+            if CurSection = 'Singstar Spanish' then CoverName := 'Singstar';
+            if CurSection = 'Singstar Italian' then CoverName := 'Singstar';
+            if CurSection = 'Singstar French' then CoverName := 'Singstar';
+            if CurSection = 'Singstar 80s Polish' then CoverName := 'Singstar 80s';
+            }
+
+            // add Category Button
+            AddCategoryButton(CurCategory);
+          end;
+        end;
 
-      else if (Ini.Sorting = sTitle) and
-              (Length(CurSong.Title) >= 1) and
-              (Letter <> UpperCase(CurSong.Title)[1]) then
-      begin
-        Letter := Uppercase(CurSong.Title)[1];
-        // add a letter Category Button
-        AddCategoryButton(Letter);
-      end
+        sGenre: begin
+          if (CompareText(CurCategory, CurSong.Genre) <> 0) then
+          begin
+            CurCategory := CurSong.Genre;
+            // add Genre Button
+            AddCategoryButton(CurCategory);
+          end;
+        end;
 
-      else if (Ini.Sorting = sArtist) and
-              (Length(CurSong.Artist) >= 1) and
-              (Letter <> UpperCase(CurSong.Artist)[1]) then
-      begin
-        Letter := UpperCase(CurSong.Artist)[1];
-        // add a letter Category Button
-        AddCategoryButton(Letter);
-      end
+        sLanguage: begin
+          if (CompareText(CurCategory, CurSong.Language) <> 0) then
+          begin
+            CurCategory := CurSong.Language;
+            // add Language Button
+            AddCategoryButton(CurCategory);
+          end
+        end;
 
-      else if (Ini.Sorting = sFolder) and
-              (CompareText(CurCategory, CurSong.Folder) <> 0) then
-      begin
-        CurCategory := CurSong.Folder;
-        // add folder tab
-        AddCategoryButton(CurCategory);
-      end
+        sTitle: begin
+          if (Length(CurSong.Title) >= 1) then
+          begin
+            LetterTmp := UCS4UpperCase(UTF8ToUCS4String(CurSong.Title)[0]);
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
+        end;
 
-      else if (Ini.Sorting = sTitle2) and
-              (Length(CurSong.Title) >= 1) then
-      begin
-        // pack all numbers into a category named '#'
-        if (CurSong.Title[1] >= '0') and (CurSong.Title[1] <= '9') then
-          LetterTmp := '#'
-        else
-          LetterTmp := UpperCase(CurSong.Title)[1];
+        sArtist: begin
+          if (Length(CurSong.Artist) >= 1) then
+          begin
+            LetterTmp := UCS4UpperCase(UTF8ToUCS4String(CurSong.Artist)[0]);
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
+        end;
 
-        if (Letter <> LetterTmp) then
-        begin
-          Letter := LetterTmp;
-          // add a letter Category Button
-          AddCategoryButton(Letter);
+        sFolder: begin
+          if (CompareText(CurCategory, CurSong.Folder) <> 0) then
+          begin
+            CurCategory := CurSong.Folder;
+            // add folder tab
+            AddCategoryButton(CurCategory);
+          end;
         end;
-      end
 
-      else if (Ini.Sorting = sArtist2) and
-              (Length(CurSong.Artist)>=1) then
-      begin
-        // pack all numbers into a category named '#'
-        if (CurSong.Artist[1] >= '0') and (CurSong.Artist[1] <= '9') then
-          LetterTmp := '#'
-        else
-          LetterTmp := UpperCase(CurSong.Artist)[1];
+        sTitle2: begin
+          if (Length(CurSong.Title) >= 1) then
+          begin
+            LetterTmp := UTF8ToUCS4String(CurSong.Title)[0];
+            // pack all numbers into a category named '#'
+            if (LetterTmp in [UCS4Char('0') .. UCS4Char('9')]) then
+              LetterTmp := UCS4Char('#')
+            else
+              LetterTmp := UCS4UpperCase(LetterTmp);
+
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
+        end;
 
-        if (Letter <> LetterTmp) then
-        begin
-          Letter := LetterTmp;
-          // add a letter Category Button
-          AddCategoryButton(Letter);
+        sArtist2: begin
+          if (Length(CurSong.Artist) >= 1) then
+          begin
+            LetterTmp := UTF8ToUCS4String(CurSong.Artist)[0];
+            // pack all numbers into a category named '#'
+            if (LetterTmp in [UCS4Char('0') .. UCS4Char('9')]) then
+              LetterTmp := UCS4Char('#')
+            else
+              LetterTmp := UCS4UpperCase(LetterTmp);
+
+            if (Letter <> LetterTmp) then
+            begin
+              Letter := LetterTmp;
+              // add a letter Category Button
+              AddCategoryButton(UCS4ToUTF8String(Letter));
+            end;
+          end;
         end;
-      end;
-    end;
+        
+      end; // case (Ini.Sorting)
+    end; // if (Ini.Tabs = 1)
 
     CatIndex := Length(Song);
     SetLength(Song, CatIndex+1);