BitmapFont.st
changeset 6080 a754f2b9a9ef
parent 4077 ab3991c6a6b0
child 6931 babe431ab64c
--- a/BitmapFont.st	Thu Jun 13 15:59:34 2013 +0200
+++ b/BitmapFont.st	Sun Jun 16 10:35:30 2013 +0200
@@ -23,7 +23,6 @@
  OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  SUCH DAMAGE.
 "
-
 "{ Package: 'stx:libview' }"
 
 FontDescription subclass:#BitmapFont
@@ -224,83 +223,7 @@
 
     characters := Array new:256.
     characters 
-	at:(Character space asciiValue + 1) 
-	put:(Form 
-		width:16 
-		height:16 
-		fromArray:#[2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000]).
-
-    characters 
-	at:($a asciiValue + 1) 
-	put:(Form 
-		width:16 
-		height:16 
-		fromArray:#[2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00011111 2r11111000
-			    2r00011111 2r11111000
-			    2r00011000 2r00011000
-			    2r00011000 2r00011000
-			    2r00011000 2r00011000
-			    2r00011000 2r00011000
-			    2r00011000 2r00011000
-			    2r00011000 2r00011000
-			    2r00011111 2r11111110
-			    2r00011111 2r11111110
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000]).
-
-    characters 
-	at:($z asciiValue + 1) 
-	put:(Form 
-		width:16 
-		height:16 
-		fromArray:#[2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00011111 2r11111000
-			    2r00011111 2r11111000
-			    2r00000000 2r00110000
-			    2r00000000 2r01100000
-			    2r00011111 2r11111000
-			    2r00011111 2r11111000
-			    2r00000110 2r00000000
-			    2r00001100 2r00000000
-			    2r00011111 2r11111000
-			    2r00011111 2r11111000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000
-			    2r00000000 2r00000000]).
-
-    ^ characters
-!
-
-smilyGlyhps
-    "return the bitmap array for a smily font
-     (only contains glyphs for $a, $b and $c)"
-
-    |characters|
-
-    characters := Array new:256.
-    characters 
-        at:(Character space asciiValue + 1) 
+        at:(Character space codePoint + 1) 
         put:(Form 
                 width:16 
                 height:16 
@@ -322,7 +245,83 @@
                             2r00000000 2r00000000]).
 
     characters 
-        at:($a asciiValue + 1) 
+        at:($a codePoint + 1) 
+        put:(Form 
+                width:16 
+                height:16 
+                fromArray:#[2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00011111 2r11111000
+                            2r00011111 2r11111000
+                            2r00011000 2r00011000
+                            2r00011000 2r00011000
+                            2r00011000 2r00011000
+                            2r00011000 2r00011000
+                            2r00011000 2r00011000
+                            2r00011000 2r00011000
+                            2r00011111 2r11111110
+                            2r00011111 2r11111110
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000]).
+
+    characters 
+        at:($z codePoint + 1) 
+        put:(Form 
+                width:16 
+                height:16 
+                fromArray:#[2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00011111 2r11111000
+                            2r00011111 2r11111000
+                            2r00000000 2r00110000
+                            2r00000000 2r01100000
+                            2r00011111 2r11111000
+                            2r00011111 2r11111000
+                            2r00000110 2r00000000
+                            2r00001100 2r00000000
+                            2r00011111 2r11111000
+                            2r00011111 2r11111000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000]).
+
+    ^ characters
+!
+
+smilyGlyhps
+    "return the bitmap array for a smily font
+     (only contains glyphs for $a, $b and $c)"
+
+    |characters|
+
+    characters := Array new:256.
+    characters 
+        at:(Character space codePoint + 1) 
+        put:(Form 
+                width:16 
+                height:16 
+                fromArray:#[2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000
+                            2r00000000 2r00000000]).
+
+    characters 
+        at:($a codePoint + 1) 
         put:(Form 
                 width:16 
                 height:16 
@@ -344,7 +343,7 @@
                             2r00000001 2r10000000]).
 
     characters 
-        at:($b asciiValue + 1) 
+        at:($b codePoint + 1) 
         put:(Form 
                 width:16 
                 height:16 
@@ -366,7 +365,7 @@
                             2r00000001 2r10000000]).
 
     characters 
-        at:($c asciiValue + 1) 
+        at:($c codePoint + 1) 
         put:(Form 
                 width:16 
                 height:16 
@@ -459,7 +458,7 @@
 
     glyph := characterBitmaps at:(ascii + 1) ifAbsent:nil.
     glyph isNil ifTrue:[
-        glyph := characterBitmaps at:(Character space asciiValue + 1).
+        glyph := characterBitmaps at:(Character space codePoint + 1).
     ].
     ^ glyph
 !
@@ -621,5 +620,6 @@
 !BitmapFont class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/BitmapFont.st,v 1.10 2004-03-05 22:19:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/BitmapFont.st,v 1.11 2013-06-16 08:35:30 cg Exp $'
 ! !
+