Improve rendering of HWID to match other text.

BUG=chrome-os-partner:8510
TEST=run 'make' in newbitmaps. install bmpblock_x86.bin on kiev machine
and verify HWID is displayed in a similar style to other text.

Change-Id: I1054a404bbce4d0639bf7c31da723d072bf58e0e
Reviewed-on: https://gerrit.chromium.org/gerrit/29243
Reviewed-by: Hung-Te Lin <hungte@chromium.org>
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Tested-by: Dave Parker <dparker@chromium.org>

5 files changed, 22 insertions, 14 deletions

diff --git a/scripts/newbitmaps/Makefile b/scripts/newbitmaps/Makefile
index 70435fc5..de34f7b9 100644
--- a/scripts/newbitmaps/Makefile
+++ b/scripts/newbitmaps/Makefile
@@ -26,7 +26,7 @@ outside_chroot:
 
 fonts:
 	cd fonts && ./make_ascii_bmps.py
-	bmpblk_font --outfile images/hwid_fonts.bin fonts/outdir/*
+	bmpblk_font --outfile images/hwid_fonts.bin fonts/outdir/*.bmp
 
 x86:
 	$(MAKE) -C strings/localized_text PT=15
diff --git a/scripts/newbitmaps/bmpblock_x86.bin b/scripts/newbitmaps/bmpblock_x86.bin
index 18a9c2c3..5e50901a 100644
--- a/scripts/newbitmaps/bmpblock_x86.bin
+++ b/scripts/newbitmaps/bmpblock_x86.bin
diff --git a/scripts/newbitmaps/fonts/make_ascii_bmps.py b/scripts/newbitmaps/fonts/make_ascii_bmps.py
index 27b50110..2b36275a 100755
--- a/scripts/newbitmaps/fonts/make_ascii_bmps.py
+++ b/scripts/newbitmaps/fonts/make_ascii_bmps.py
@@ -26,7 +26,7 @@ def main():
   parser.add_option("--background", default='#ffffff',
                     dest="bg", action="store", metavar="COLOR",
                     help="background color (%default)")
-  parser.add_option("--font", default='Helvetica',
+  parser.add_option("--font", default='Droid Sans',
                     dest="font", action="store",
                     help="font to use (%default)")
   parser.add_option("--size", default='15', metavar="POINTSIZE",
@@ -37,7 +37,6 @@ def main():
                     help="output directory (%default)")
   (options, args) = parser.parse_args()
 
-
   if not os.path.isdir(options.outdir):
     os.mkdir(options.outdir)
 
@@ -59,24 +58,33 @@ def main():
 
   count=0
   for ascii in chars:
-    outfile = os.path.join(options.outdir,
+    pngfile = os.path.join(options.outdir,
+                           "idx%03d_%x.png" % (count,ord(ascii)))
+    bmpfile = os.path.join(options.outdir,
                            "idx%03d_%x.bmp" % (count,ord(ascii)))
-    print outfile
+    cmd = ('pango-view', '-q', '--no-auto-dir',
+           '--background=%s' % options.bg,
+           '--foreground=%s' % options.fg,
+           '--font="%s %s"' % (options.font, options.size),
+           '--dpi', '72',
+           '--margin', '0',
+           '--text="%s"' % ascii,
+           '-o', pngfile)
+
+    cmd = ' '.join(cmd)
+    print cmd
+    os.system(cmd) # This must be run in a subshell for correct font rendering.
+
     cmd = ('convert',
-           '-font', options.font,
-           '-background', options.bg,
-           '-fill', options.fg,
            '-bordercolor', options.bg,
            '-border', '0x3',
-           '-gravity', 'Center',
-           '-pointsize', options.size,
-           '-resize', '120%x100',               # Yes, magic.
-           '-scale', '59%x78%',                 # Here, too.
-           'label:%s' % ascii,
+           '-resize', '59%x78%',          # Scale the same as other images.
+           '-colors', '256',
            '-remap', gradient_file,
            '-compress', 'none',
            '-alpha', 'off',
-           outfile)
+           pngfile,
+           bmpfile)
     print ' '.join(cmd)
     count += 1
     subprocess.call(cmd)
diff --git a/scripts/newbitmaps/images/hwid_fonts.bin b/scripts/newbitmaps/images/hwid_fonts.bin
index 2ec1f6ed..c9b3ae14 100644
--- a/scripts/newbitmaps/images/hwid_fonts.bin
+++ b/scripts/newbitmaps/images/hwid_fonts.bin
diff --git a/scripts/newbitmaps/images/hwid_unknown.bmp b/scripts/newbitmaps/images/hwid_unknown.bmp
index be196e3b..c1bcce2f 100644
--- a/scripts/newbitmaps/images/hwid_unknown.bmp
+++ b/scripts/newbitmaps/images/hwid_unknown.bmp