Fixed font issues by replacing acknowledge2 completely.

In the playtime area, we're now using multipass_digits.ttf, which I
created from the original Multipass' bitmap font. In other places we're
now using Silkscreen Bold.

diff --git a/README b/README
index 20a0857349c5a2d6562166d5c5be9acc5ef5c863..128822ceeae0becbe8b330f03dfc40a1c200c763 100644 (file)
--- a/README
+++ b/README
@@ -6,6 +6,9 @@
 # All images by R. Peter Clark (rpeterclark at hotmail com),
 # Edje/Embryo code by Tilman Sauerbeck (tilman at code-monkey de).
 #
-# The font used in this theme, acknowledge2.ttf, was created by
-# Brian Kent (kentp at norwich net) and edited by Tilman Sauerbeck.
-# See acknowledge.txt for further information.
+# The font slkscrb.ttf (Silkscreen bold) was created by
+# Jason Kottke, and is available under the Open Font License at
+# http://openfontlibrary.org/media/files/jkottke/218
+#
+# multipass_digits.ttf was created by Tilman Sauerbeck, using the bitmaps
+# from the original Multipass' bitmapfont-display-digits.png.

diff --git a/Rakefile b/Rakefile
index 20270a4607559b443904ad2a371dd599971c9ff4..03a1f9662dc9e9b8be0046728011624d9e61bece 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -13,7 +13,7 @@ task :test => [EDJ] do |t|
        sh "edje #{EDJ}"
 end
 
-deps = FileList["**/*.{rb,sma,ttf}", "README", "acknowledge.txt"]
+deps = FileList["**/*.{rb,sma,ttf}", "README"]
 
 desc "Build #{EDJ}"
 file EDJ => deps do |t|

diff --git a/acknowledge.txt b/acknowledge.txt
deleted file mode 100644 (file)
index bdfd429..0000000
--- a/acknowledge.txt
+++ /dev/null
@@ -1,82 +0,0 @@
-# __________________________________\r
-# Acknowledge  Created by Brian Kent\r
-# ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\r
-# \r
-# Thanks for Downloading Acknowledge.\r
-# \r
-# \r
-# -Acknowledge TT    [.ttf]\r
-# -Acknowledge [7pt] [.fon]\r
-# \r
-#   'Acknowle.fon' is a Windows Bitmap Font (.fon).  This font is best\r
-# used at 7pt.  To use it at larger point sizes (for images), try using\r
-# a graphics program like Photoshop, Paint Shop Pro, or the Paint\r
-# program that comes with Windows.  Type out your text at the recommended\r
-# point size [7pt], then resize the image.   Set the color mode to 256\r
-# or 2 colors so the edges don't get blured when resizing, then after you\r
-# have the text to the size that you want, then change back to a higher\r
-# color mode and edit the image.\r
-# \r
-#   For programs that don't show Bitmap Fonts in the Font Selector, you\r
-# may be able to get the font to work by typing in:\r
-# acknowledge -brk-\r
-# \r
-# \r
-# If you have any questions or comments, you can e-mail me at\r
-# kentpw@norwich.net\r
-# \r
-# You can visit my Homepage <ÆNIGMA GAMES & FONTS> at\r
-# http://www.aenigmafonts.com/\r
-# \r
-# ____________\r
-# !!! NOTE !!!\r
-# ¯¯¯¯¯¯¯¯¯¯¯¯\r
-# This font has been updated!  I've edited the (BRK) in the font name\r
-# to just BRK.  It seems that Adobe Illustrator and web pages with CSS\r
-# don't like fonts with ( and ) in their name.\r
-# \r
-# ________________\r
-# INSTALLING FONTS\r
-# ¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯\r
-#   There's a couple of ways to install Fonts. The 'easy' way to\r
-# install fonts is to just Unzip/place the font file into your\r
-# Windows\Fonts directory (I always use this method). If you're unable\r
-# to do it the 'easy' way, then try to do it this way (for Windows\r
-# 95/98/NT):\r
-# \r
-# 1] Unzip the Font(s) to a folder (or somewhere, just remember where\r
-# you unzipped it) on your Computer.\r
-# \r
-# 2] Next, click on the START button, then select SETTINGS then\r
-# CONTROL PANEL.\r
-# \r
-# 3] When the Control Panel Window pops up, Double Click on FONTS.\r
-# \r
-# 4] When the FONTS window pops up, select File then Install New Font...\r
-# \r
-# 5] A Add Fonts window will pop up, just go to the folder that you\r
-# unzipped the Font(s) to, select the Font(s) and then click on OK.\r
-# Now the Font(s) are installed.\r
-# \r
-#   Now you can use the Font(s) in programs the utilize Fonts.  Make\r
-# sure that you install the font(s) first, then open up your apps\r
-# (so the app will recognize the font).    Sometimes you'll have to\r
-# wait until you computer 'auto-refreshes' for programs to recognize\r
-# fonts (Windows is sometimes slow to do that).  You can refresh your\r
-# computer quicker by going into Windows Explorer -or- My Computer and\r
-# press F5 (or in the menubar select VIEW then REFRESH).\r
-# \r
-# \r
-# __________\r
-# DISCLAIMER\r
-# ¯¯¯¯¯¯¯¯¯¯\r
-# -The font(s) in this zip file were created by me (Brian Kent).  All\r
-# of my Fonts are Freeware, you can use them any way you want to\r
-# (Personal use, Commercial use, or whatever).\r
-# \r
-# -If you have a Font related site and would like to offer my fonts on\r
-# your site, go right ahead. All I ask is that you keep this text file\r
-# intact with the Font.\r
-# \r
-# -You may not Sell or Distribute my Fonts for profit or alter them in\r
-# any way without asking me first.  [e-mail -  kentpw@norwich.net]\r

diff --git a/fonts/acknowledge2.ttf b/fonts/acknowledge2.ttf
deleted file mode 100644 (file)
index bfccdc6..0000000
Binary files a/fonts/acknowledge2.ttf and /dev/null differ

diff --git a/fonts/multipass_digits.sfd b/fonts/multipass_digits.sfd
new file mode 100644 (file)
index 0000000..bb4f2d7
--- /dev/null
+++ b/fonts/multipass_digits.sfd
@@ -0,0 +1,295 @@
+SplineFontDB: 2.0
+FontName: multipass_digits
+FullName: multipass_digits
+FamilyName: multipass_digits
+Weight: Medium
+Copyright: Created by Tilman Sauerbeck with FontForge 2.0 (http://fontforge.sf.net), based on bitmaps from R. Peter Clark's Multipass theme for WinAmp 5 (http://www.deviantart.com/deviation/9420043/).
+Comments: 2007-12-23: Created.
+Version: 001.000
+ItalicAngle: 0
+UnderlinePosition: -204
+UnderlineWidth: 102
+Ascent: 1638
+Descent: 410
+Order2: 1
+XUID: [1021 993 1038774076 68600]
+FSType: 0
+OS2Version: 0
+OS2_WeightWidthSlopeOnly: 0
+OS2_UseTypoMetrics: 1
+CreationTime: 1198447070
+ModificationTime: 1198505996
+PfmFamily: 17
+TTFWeight: 500
+TTFWidth: 5
+LineGap: 184
+VLineGap: 184
+OS2TypoAscent: 0
+OS2TypoAOffset: 1
+OS2TypoDescent: 0
+OS2TypoDOffset: 1
+OS2TypoLinegap: 184
+OS2WinAscent: 0
+OS2WinAOffset: 1
+OS2WinDescent: 0
+OS2WinDOffset: 1
+HheadAscent: 0
+HheadAOffset: 1
+HheadDescent: 0
+HheadDOffset: 1
+OS2Vendor: 'PfEd'
+DEI: 0
+LangName: 1033 
+Encoding: ISO8859-1
+UnicodeInterp: none
+NameList: Adobe Glyph List
+DisplaySize: -24
+AntiAlias: 1
+FitToEm: 1
+WinInfo: 0 50 23
+TeXData: 1 0 0 346030 173015 115343 0 -1048576 115343 783286 444596 497025 792723 393216 433062 380633 303038 157286 324010 404750 52429 2506097 1059062 262144
+BeginChars: 256 12
+StartChar: zero
+Encoding: 48 48 0
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+597 341 m 25,0,-1
+ 939 341 l 25,1,-1
+ 939 1365 l 25,2,-1
+ 597 1365 l 25,3,-1
+ 597 341 l 25,0,-1
+256 1707 m 25,4,-1
+ 1280 1707 l 25,5,-1
+ 1280 0 l 29,6,-1
+ 256 0 l 25,7,-1
+ 256 1707 l 25,4,-1
+EndSplineSet
+EndChar
+StartChar: one
+Encoding: 49 49 1
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+427 1707 m 25,0,-1
+ 1109 1707 l 25,1,-1
+ 1109 0 l 25,2,-1
+ 768 0 l 25,3,-1
+ 768 1366 l 25,4,-1
+ 427 1366 l 25,5,-1
+ 427 1707 l 25,0,-1
+EndSplineSet
+EndChar
+StartChar: two
+Encoding: 50 50 2
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+256 1707 m 25,0,-1
+ 1280 1707 l 25,1,-1
+ 1280 682 l 25,2,-1
+ 597 682 l 25,3,-1
+ 597 341 l 25,4,-1
+ 1280 341 l 25,5,-1
+ 1280 0 l 25,6,-1
+ 256 0 l 25,7,-1
+ 256 1024 l 25,8,-1
+ 939 1024 l 25,9,-1
+ 939 1365 l 25,10,-1
+ 256 1365 l 25,11,-1
+ 256 1707 l 25,0,-1
+EndSplineSet
+EndChar
+StartChar: three
+Encoding: 51 51 3
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+256 1707 m 25,0,-1
+ 1280 1707 l 25,1,-1
+ 1280 0 l 25,2,-1
+ 256 0 l 25,3,-1
+ 256 341 l 25,4,-1
+ 939 341 l 25,5,-1
+ 939 682 l 25,6,-1
+ 597 682 l 29,7,-1
+ 597 1024 l 25,8,-1
+ 939 1024 l 25,9,-1
+ 939 1364 l 25,10,-1
+ 256 1364 l 25,11,-1
+ 256 1707 l 25,0,-1
+EndSplineSet
+EndChar
+StartChar: four
+Encoding: 52 52 4
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+256 1707 m 25,0,-1
+ 597 1707 l 25,1,-1
+ 597 1024 l 25,2,-1
+ 939 1024 l 25,3,-1
+ 939 1707 l 25,4,-1
+ 1280 1707 l 25,5,-1
+ 1280 0 l 25,6,-1
+ 939 0 l 25,7,-1
+ 939 682 l 25,8,-1
+ 256 682 l 25,9,-1
+ 256 1707 l 25,0,-1
+EndSplineSet
+EndChar
+StartChar: five
+Encoding: 53 53 5
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+256 1707 m 25,0,-1
+ 1280 1707 l 25,1,-1
+ 1280 1365 l 25,2,-1
+ 597 1365 l 25,3,-1
+ 597 1024 l 25,4,-1
+ 1280 1024 l 25,5,-1
+ 1280 0 l 25,6,-1
+ 256 0 l 25,7,-1
+ 256 341 l 25,8,-1
+ 939 341 l 25,9,-1
+ 939 682 l 25,10,-1
+ 256 682 l 25,11,-1
+ 256 1707 l 25,0,-1
+EndSplineSet
+EndChar
+StartChar: six
+Encoding: 54 54 6
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+597 341 m 25,0,-1
+ 939 341 l 25,1,-1
+ 939 682 l 25,2,-1
+ 597 682 l 25,3,-1
+ 597 341 l 25,0,-1
+256 1707 m 25,4,-1
+ 1280 1707 l 25,5,-1
+ 1280 1365 l 25,6,-1
+ 597 1365 l 25,7,-1
+ 597 1024 l 25,8,-1
+ 1280 1024 l 25,9,-1
+ 1280 0 l 25,10,-1
+ 256 0 l 25,11,-1
+ 256 1707 l 25,4,-1
+EndSplineSet
+EndChar
+StartChar: colon
+Encoding: 58 58 7
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+597 682 m 25,0,-1
+ 939 682 l 29,1,-1
+ 939 341 l 25,2,-1
+ 597 341 l 25,3,-1
+ 597 682 l 25,0,-1
+597 1365 m 25,4,-1
+ 939 1365 l 25,5,-1
+ 939 1024 l 25,6,-1
+ 597 1024 l 25,7,-1
+ 597 1365 l 25,4,-1
+EndSplineSet
+EndChar
+StartChar: seven
+Encoding: 55 55 8
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+256 1707 m 25,0,-1
+ 1280 1707 l 25,1,-1
+ 1280 0 l 25,2,-1
+ 939 0 l 25,3,-1
+ 939 682 l 25,4,-1
+ 597 682 l 25,5,-1
+ 597 1024 l 25,6,-1
+ 939 1024 l 25,7,-1
+ 939 1365 l 25,8,-1
+ 256 1365 l 25,9,-1
+ 256 1707 l 25,0,-1
+EndSplineSet
+EndChar
+StartChar: eight
+Encoding: 56 56 9
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+597 341 m 25,0,-1
+ 939 341 l 25,1,-1
+ 939 682 l 25,2,-1
+ 597 682 l 25,3,-1
+ 597 341 l 25,0,-1
+597 1024 m 25,4,-1
+ 939 1024 l 25,5,-1
+ 939 1365 l 25,6,-1
+ 597 1365 l 25,7,-1
+ 597 1024 l 25,4,-1
+256 1707 m 25,8,-1
+ 1280 1707 l 25,9,-1
+ 1280 0 l 25,10,-1
+ 256 0 l 25,11,-1
+ 256 1707 l 25,8,-1
+EndSplineSet
+EndChar
+StartChar: nine
+Encoding: 57 57 10
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+597 1024 m 25,0,-1
+ 939 1024 l 25,1,-1
+ 939 1365 l 25,2,-1
+ 597 1365 l 25,3,-1
+ 597 1024 l 25,0,-1
+256 1707 m 25,4,-1
+ 1280 1707 l 25,5,-1
+ 1280 0 l 25,6,-1
+ 939 0 l 25,7,-1
+ 939 682 l 25,8,-1
+ 256 682 l 25,9,-1
+ 256 1707 l 25,4,-1
+EndSplineSet
+EndChar
+StartChar: hyphen
+Encoding: 45 45 11
+Width: 1536
+VWidth: 0
+Flags: W
+Validated: 1
+Fore
+341 1024 m 25,0,-1
+ 1195 1024 l 25,1,-1
+ 1195 682 l 25,2,-1
+ 341 682 l 25,3,-1
+ 341 1024 l 25,0,-1
+EndSplineSet
+EndChar
+EndChars
+EndSplineFont

diff --git a/fonts/multipass_digits.ttf b/fonts/multipass_digits.ttf
new file mode 100644 (file)
index 0000000..9c3c31b
Binary files /dev/null and b/fonts/multipass_digits.ttf differ

diff --git a/fonts/slkscrb.ttf b/fonts/slkscrb.ttf
new file mode 100644 (file)
index 0000000..d91dc0a
Binary files /dev/null and b/fonts/slkscrb.ttf differ

diff --git a/multipass.rb b/multipass.rb
index ed6d0112f35c0ba2976fbede4b90db609c4fec9f..3a8552acd1bb79b54e0bc47b63164a4afdca33d0 100644 (file)
--- a/multipass.rb
+++ b/multipass.rb
@@ -4,7 +4,6 @@ require "src/button.rb"
 include Redact
 
 load "README"
-load "acknowledge.txt"
 
 load "src/player.rb"
 load "src/playlist.rb"

diff --git a/src/player-display-track.rb b/src/player-display-track.rb
index 6c037c6d948930573e9e474f691bb7b2ee8bb355..ebad32cf076cc946d9c16207be5991a67fa91d15 100644 (file)
--- a/src/player-display-track.rb
+++ b/src/player-display-track.rb
@@ -6,19 +6,20 @@ OUTLINE_COLOR = "#01366bc1"
 
 c.part("player.time", :text) do |p|
        p.effect = :outline
+       p.use_alternate_font_metrics = true
 
        p.description do |d|
                d.rel[0].to = d.rel[1].to = parent
-               d.rel[0].set_offset(15, 9)
+               d.rel[0].set_offset(15, 6)
                d.rel[1].set_rel(0.0, 0.0)
-               d.rel[1].set_offset(75, 24)
+               d.rel[1].set_offset(75, 21)
 
                d.color = TEXT_COLOR
                d.outline_color = OUTLINE_COLOR
 
                d.text = "00:06:35"
-               d.font = "acknowledge2.ttf"
-               d.font_size = 15
+               d.font = "multipass_digits.ttf"
+               d.font_size = 12
                d.set_text_align(1.0, 0.5)
        end
 end
@@ -33,8 +34,8 @@ c.part("player.songname", :text) do |p|
                d.set_align(0.0)
 
                d.text = "Metallica - Battery"
-               d.font = "acknowledge2.ttf"
-               d.font_size = 14
+               d.font = "slkscrb.ttf"
+               d.font_size = 8
                d.set_text_min(true, true)
                d.set_text_align(0.0)
        end
@@ -43,9 +44,9 @@ end
 c.part("player.songname.clip", :rect) do |p|
        p.description do |d|
                d.rel[0].to = d.rel[1].to = parent
-               d.rel[0].set_offset(13, 66)
+               d.rel[0].set_offset(13, 67)
                d.rel[1].set_rel(0.0, 0.0)
-               d.rel[1].set_offset(154, 78)
+               d.rel[1].set_offset(154, 79)
        end
 
        c.part("player.songname").clip = p

diff --git a/src/playlist_item.rb b/src/playlist_item.rb
index 56b298c44a3a8fd8f4537ce60cb601117a9215c4..cec85721a5cc82a1ff7a892bbe40d0feabb8909d 100644 (file)
--- a/src/playlist_item.rb
+++ b/src/playlist_item.rb
@@ -18,8 +18,8 @@ EDJE.collection("playlist_item") do |c|
                                        d.color = color
                                        d.outline_color = OUTLINE_COLOR
 
-                                       d.font = "acknowledge2.ttf"
-                                       d.font_size = 12
+                                       d.font = "slkscrb.ttf"
+                                       d.font_size = 8
                                        d.text = "Dark Tranquillity - Through Smudged Lenses"
                                        d.set_text_align(0.0)
                                end