removed .png/.stf files for hard-coloured fonts (blue, gold, gray) and doubled conten...

SVN-Revision: 5766

diff --git a/data/fonts/README b/data/fonts/README
index e4b61ef..feebe7d 100644 (file)
--- a/data/fonts/README
+++ b/data/fonts/README
@@ -38,43 +38,3 @@ addonname-foo.stf to be added to font foo.stf
       $strings)
   )
 )
-These files describes glyphs, contained on images 
-at data/images/engine/fonts/ 
-(or any subdirectory)
-
-Each file describes separate font.
-When extended fotns put in addon, names should be prefixed, like 
-addonname-foo.stf to be added to font foo.stf
-
-(supertux-font
-  ; height of font and glyph on images
-  (glyph-height $h)    
-  
-  ; default width of glyph on images and width of fixed-font
-  (glyph-width $w)   
-
-  ; one or more surfaces, containing glyph images
-  (surface              
- 
-    ; may override default width
-    (glyph-width $w)    
-
-    ; may prevent to form variable-width glyphs from this surface
-    (monospace #t)      
-
-    ; filename containing glyph images,
-    ; related to data/images/engine/fonts/
-    ; any dimentions, RGBS pixel format
-    (glyphs $filename)   
-    
-    ; filename containing shadow images, 
-    ; should fit glyph image
-    (shadows $filename)  
-
-    ; charset definition
-    ; each string represent separate row of glyphs on image
-    ; spaces may be put to skip glyph (not drawn)
-    (chars 
-      $strings)
-  )
-)

diff --git a/data/fonts/andale10.stf b/data/fonts/andale10.stf
index 9611d52..55ebbd2 100644 (file)
--- a/data/fonts/andale10.stf
+++ b/data/fonts/andale10.stf
@@ -27,32 +27,3 @@
       "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
   ) )
 )
-(supertux-font
-  (glyph-width 6)
-  (glyph-height 13)
-  (surface
-    (glyphs "andale10.png")
-    (shadows "andale10-shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/andale12.stf b/data/fonts/andale12.stf
index 06770ff..fe08dd9 100644 (file)
--- a/data/fonts/andale12.stf
+++ b/data/fonts/andale12.stf
@@ -27,32 +27,3 @@
       "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
   ) )
 )
-(supertux-font
-  (glyph-width 7)
-  (glyph-height 14)
-  (surface
-    (glyphs "andale12.png")
-    (shadows "andale12-shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/blue.stf b/data/fonts/blue.stf
deleted file mode 100644 (file)
index f824897..0000000
--- a/data/fonts/blue.stf
+++ /dev/null
@@ -1,58 +0,0 @@
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "blue.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "blue.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/console2.stf b/data/fonts/console2.stf
index 1e52ff1..0908a92 100644 (file)
--- a/data/fonts/console2.stf
+++ b/data/fonts/console2.stf
@@ -27,32 +27,3 @@
       "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
   ) )
 )
-(supertux-font
-  (glyph-width 8)
-  (glyph-height 14)
-  (glyphs
-    (glyph-image "console2.png")
-    (shadow-image "console2-shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/gold.stf b/data/fonts/gold.stf
deleted file mode 100644 (file)
index ba16457..0000000
--- a/data/fonts/gold.stf
+++ /dev/null
@@ -1,58 +0,0 @@
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "gold.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "gold.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/gray.stf b/data/fonts/gray.stf
deleted file mode 100644 (file)
index cebd180..0000000
--- a/data/fonts/gray.stf
+++ /dev/null
@@ -1,58 +0,0 @@
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "gray.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "gray.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/white-big.stf b/data/fonts/white-big.stf
index 400de3a..2c850ff 100644 (file)
--- a/data/fonts/white-big.stf
+++ b/data/fonts/white-big.stf
@@ -27,32 +27,3 @@
       "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
   ) )
 )
-(supertux-font
-  (glyph-width 20)
-  (glyph-height 22)
-  (surface
-    (glyphs "white-big.png")
-    (shadows "shadow-big.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/white-small.stf b/data/fonts/white-small.stf
index ed3d5f4..b762762 100644 (file)
--- a/data/fonts/white-small.stf
+++ b/data/fonts/white-small.stf
@@ -27,32 +27,3 @@
       "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
   ) )
 )
-(supertux-font
-  (glyph-width 8)
-  (glyph-height 9)
-  (surface
-    (glyphs "white-small.png")
-    (shadows "shadow-small.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/fonts/white.stf b/data/fonts/white.stf
index 1de35ca..77fff98 100644 (file)
--- a/data/fonts/white.stf
+++ b/data/fonts/white.stf
@@ -27,32 +27,3 @@
       "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
   ) )
 )
-(supertux-font
-  (glyph-width 16)
-  (glyph-height 18)
-  (surface
-    (glyphs "white.png")
-    (shadows "shadow.png")
-    (chars
-      " !\"\#$%&'()*+,-./"
-      "0123456789:;<=>?"
-      "@ABCDEFGHIJKLMNO"
-      "PQRSTUVWXYZ[\\]^_"
-      "`abcdefghijklmno"
-      "pqrstuvwxyz{|}~ "
-      " ¡¢£¤¥¦§¨©ª«¬ ®¯"
-      "°±²³´µ¶·¸¹º»¼½¾¿"
-      "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏ"
-      "ÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞß"
-      "àáâãäåæçèéêëìíîï"
-      "ðñòóôõö÷øùúûüýþÿ"
-      "ĀāĂ㥹ĆćĈĉĊċČčĎď"
-      "ĐđĒēĔĕĖėĘęĚěĜĝĞğ"
-      "ĠġĢģĤĥĦħĨĩĪīĬĭĮį"
-      "İıIJijĴĵĶķĸĹĺĻļĽľĿ"
-      "ŀŁłŃńŅņŇňʼnŊŋŌōŎŏ"
-      "ŐőŒœŔŕŖŗŘřŚśŜŝŞş"
-      "ŠšŢţŤťŦŧŨũŪūŬŭŮů"
-      "ŰűŲųŴŵŶŷŸŹźŻżŽžſ"
-  ) )
-)

diff --git a/data/images/engine/fonts/blue.png b/data/images/engine/fonts/blue.png
deleted file mode 100644 (file)
index 72e50ad..0000000
Binary files a/data/images/engine/fonts/blue.png and /dev/null differ

diff --git a/data/images/engine/fonts/gold.png b/data/images/engine/fonts/gold.png
deleted file mode 100644 (file)
index 2cf1b28..0000000
Binary files a/data/images/engine/fonts/gold.png and /dev/null differ

diff --git a/data/images/engine/fonts/gray.png b/data/images/engine/fonts/gray.png
deleted file mode 100644 (file)
index 3655ee6..0000000
Binary files a/data/images/engine/fonts/gray.png and /dev/null differ