[Pingus-CVS] r2978 - in branches/pingus_sdl: . contrib data/images/fonts src

[grumbel at BerliOS]

Author: grumbel
Date: 2007-08-16 22:30:27 +0200 (Thu, 16 Aug 2007)
New Revision: 2978

Added:
   branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font
   branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font
   branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font
   branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.png
   branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font
   branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.png
   branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.png
   branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font
   branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.png
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.png
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font
   branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.png
   branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font
   branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font
Modified:
   branches/pingus_sdl/TODO
   branches/pingus_sdl/contrib/extract-gettext.rb
   branches/pingus_sdl/src/pingus_main.cpp
Log:
- added Tomas Blaha's iso-8859-2 and iso-8859-9 fonts

Modified: branches/pingus_sdl/TODO
===================================================================
--- branches/pingus_sdl/TODO    2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/TODO    2007-08-16 20:30:27 UTC (rev 2978)
@@ -48,6 +48,9 @@
 Important:
 ==========
 
+- copy all translations in level files over to the LANG.po file (take care of 
encoding!)
+
+
 - paralax handling is different between 0.6 and SDL, see
   data/levels/playable/slidenride1-grumbel.pingus
 
@@ -63,9 +66,14 @@
 
 - src/components/pingus_counter.hpp font should be fixed-width/monospace
 
+- forgein languages break many parts of the GUI
+
+
 Nice to Have:
 =============
 
+- sv.po - ISO-8859-1 - (incomplete)
+
 - story graphics have a missing vertical line (due to age old gimp scaling bug)
 
 - separate gfx/colmap surfaces aren't used

Modified: branches/pingus_sdl/contrib/extract-gettext.rb
===================================================================
--- branches/pingus_sdl/contrib/extract-gettext.rb      2007-08-16 19:28:27 UTC 
(rev 2977)
+++ branches/pingus_sdl/contrib/extract-gettext.rb      2007-08-16 20:30:27 UTC 
(rev 2978)
@@ -22,15 +22,22 @@
 lang = ARGV[0]
 ARGV[1..-1].each{|arg|
   doc = REXML::Document.new(File.new(arg))
-  REXML::XPath.each(doc, "/pingus-level/global/address@hidden'en']") { 
|element|
+
+  ["/pingus-level/global/description", 
"/pingus-level/global/levelname"].each{|tree|
+    element = REXML::XPath.match(doc, "address@hidden'en']")
+    
     puts "#: #{arg.gsub(/^\.\.\/\.\.\/pingus_0_6\//, "")}"
-    puts "msgid \"#{element.text.gsub(/\s+/, " ")}\""
-  }
+    puts "msgid \"#{element[0].text.gsub(/\s+/, " ")}\""
 
-  REXML::XPath.each(doc, "/pingus-level/global/address@hidden'#{lang}']") { 
|element|
-    puts "msgstr \"#{element.text.gsub(/\s+/, " ")}\""    
+    element = REXML::XPath.match(doc, "address@hidden'#{lang}']")
+    if (element.length >= 1)
+      puts "msgstr \"#{element[0].text.gsub(/\s+/, " ")}\""    
+    else
+      puts "msgstr \"\""
+    end 
+
+    puts ""
   }
-  puts ""
 }
 
 # EOF #

Added: branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font   
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-2.font   
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Chalk Large")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/chalk_large-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font   
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/chalk_large-iso-8859-9.font   
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Chalk Large")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/chalk_large-iso-8859-9.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font  
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-2.font  
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Chalk Normal")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/chalk_normal-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font  
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/chalk_normal-iso-8859-9.font  
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Chalk Normal")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/chalk_normal-iso-8859-9.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font   
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-2.font   
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Chalk Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/chalk_small-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font   
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/chalk_small-iso-8859-9.font   
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Chalk Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/chalk_small-iso-8859-9.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font 
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.font 
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/courier_small-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-2.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font 
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.font 
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/courier_small-iso-8859-9.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_sdl/data/images/fonts/courier_small-iso-8859-9.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font        
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.font        
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.png
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-2.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font        
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.font        
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus-iso-8859-9.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.png
===================================================================
(Binary files differ)


Property changes on: branches/pingus_sdl/data/images/fonts/pingus-iso-8859-9.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font  
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.font  
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-2.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-2.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font  
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.font  
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-9.png"))
+
+;; EOF ;;

Added: branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.png
===================================================================
(Binary files differ)


Property changes on: 
branches/pingus_sdl/data/images/fonts/pingus_small-iso-8859-9.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: 
branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font  
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-2.font  
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-2.png"))
+
+;; EOF ;;

Added: 
branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font
===================================================================
--- branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font  
2007-08-16 19:28:27 UTC (rev 2977)
+++ branches/pingus_sdl/data/images/fonts/pingus_small_fix_num-iso-8859-9.font  
2007-08-16 20:30:27 UTC (rev 2978)
@@ -0,0 +1,11 @@
+;; -*- scheme -*-
+(pingus-font
+ (name "Pingus Small")
+ (space-length    8)
+ (alpha-threshold  0)
+ (characters "!\"#$%&'()*+,-./0123456789:;<=>?@"
+             "ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"
+             
"�����������������������������������������������������������������������������������������������")
+ (image "data/images/fonts/pingus_small-iso-8859-9.png"))
+
+;; EOF ;;

Modified: branches/pingus_sdl/src/pingus_main.cpp
===================================================================
--- branches/pingus_sdl/src/pingus_main.cpp     2007-08-16 19:28:27 UTC (rev 
2977)
+++ branches/pingus_sdl/src/pingus_main.cpp     2007-08-16 20:30:27 UTC (rev 
2978)
@@ -231,6 +231,8 @@
                   _("Test a font"));
   argp.add_option(364, "language", "LANG",
                   _("Select language for use with Pingus"));
+  argp.add_option(365, "list-languages", "",
+                  _("List all available languages"));
   argp.add_option('v', "verbose", "", 
                   _("Print some more messages to stdout, can be set multiple 
times to increase verbosity"));
   argp.add_option('V', "version", "", 
@@ -539,6 +541,19 @@
           dictionary_manager.set_language(argp.get_argument()); 
           break;
 
+        case 365: // list-languages
+          {
+            std::cout << "Available languages are:" << std::endl;
+            std::cout << "========================" << std::endl;
+            std::set<std::string> lst = dictionary_manager.get_languages();
+            for (std::set<std::string>::iterator i = lst.begin(); i != 
lst.end(); ++i)
+              std::cout << TinyGetText::get_language_def(*i).name << " (" << 
*i << ")" << std::endl;
+
+            std::cout << "\nLanguages can be used via:\n\n    pingus 
--language de\n" << std::endl; 
+          }
+          exit(EXIT_SUCCESS);
+          break;
+
         case 'h':
           argp.print_help();
           exit(EXIT_SUCCESS);
@@ -623,17 +638,17 @@
   if(language == "cs" || language == "sr")
     {
       dictionary_manager.set_charset("ISO-8859-2");
-      //Pingus::Fonts::encoding = "ISO-8859-2";
+      Fonts::encoding = "iso-8859-2";
     }
   else if(language == "tr")
     {
       dictionary_manager.set_charset("ISO-8859-9");
-      //Pingus::Fonts::encoding = "ISO-8859-9";
+      Fonts::encoding = "iso-8859-9";
     }
   else
     {
       dictionary_manager.set_charset("ISO-8859-1");
-      //Pingus::Fonts::encoding = "ISO-8859-1";
+      Fonts::encoding = "iso-8859-1";
     }
 
   if (maintainer_mode)