From 12ccdb75a93c9b5f1e846941f2ddee44816b134c Mon Sep 17 00:00:00 2001
From: robertmh <robertmh@localhost>
Date: Tue, 22 Jul 2008 22:23:45 +0000
Subject: [PATCH] 2008-07-23  Robert Millan  <rmh@aybabtu.com>

        * Makefile.in (UNICODE_ARROWS, UNICODE_LINES): New variables (they
        define the codes for arrows and lines used for the menu).
        (ascii.pff): Generate fonts for $(UNICODE_ARROWS) and $(UNICODE_LINES)
        as well.

        * util/update-grub_lib.in (font_path): Prefer ascii.pff over complete
        fonts, because the latter are too slow.
---
 ChangeLog               | 10 ++++++++++
 Makefile.in             |  7 ++++++-
 util/update-grub_lib.in |  5 +++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2fe222616..dec4574a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-07-23  Robert Millan  <rmh@aybabtu.com>
+
+	* Makefile.in (UNICODE_ARROWS, UNICODE_LINES): New variables (they
+	define the codes for arrows and lines used for the menu).
+	(ascii.pff): Generate fonts for $(UNICODE_ARROWS) and $(UNICODE_LINES)
+	as well.
+
+	* util/update-grub_lib.in (font_path): Prefer ascii.pff over complete
+	fonts, because the latter are too slow.
+
 2008-07-21  Bean  <bean123ch@gmail.com>
 
 	* kern/i386/pc/startup.S (gate_a20_try_bios): Change test order for
diff --git a/Makefile.in b/Makefile.in
index 6f9474c9c..34b5bd0e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -143,11 +143,16 @@ partmap.lst: $(PARTMAPFILES)
 ifeq (, $(UNIFONT_HEX))
 else
 pkgdata_DATA += unicode.pff ascii.pff
+
+# Arrows and lines are needed to draw the menu, so we always include them
+UNICODE_ARROWS=0x2190-0x2193
+UNICODE_LINES=0x2501-0x251B
+
 unicode.pff: $(UNIFONT_HEX)
 	ruby $(srcdir)/util/unifont2pff.rb $(UNIFONT_HEX) > $@
 
 ascii.pff: $(UNIFONT_HEX)
-	ruby $(srcdir)/util/unifont2pff.rb 0-127 $(UNIFONT_HEX) > $@
+	ruby $(srcdir)/util/unifont2pff.rb 0x0-0x7f $(UNICODE_ARROWS) $(UNICODE_LINES) $(UNIFONT_HEX) > $@
 endif
 
 all-local: $(PROGRAMS) $(PKGLIB) $(PKGDATA) $(SCRIPTS) $(MKFILES)
diff --git a/util/update-grub_lib.in b/util/update-grub_lib.in
index c488a85d0..03a96ce8f 100644
--- a/util/update-grub_lib.in
+++ b/util/update-grub_lib.in
@@ -131,8 +131,9 @@ prepare_grub_to_access_device ()
 font_path ()
 {
   for dir in ${pkgdatadir} /boot/grub /usr/share/grub ; do
-    # Prefer complete fonts over incomplete ones.
-    for basename in unicode unifont ascii ; do
+    # FIXME: We prefer ascii because loading complete fonts is too slow (and
+    # we don't yet provide the gettext magic that would make unicode useful).
+    for basename in ascii unicode unifont ; do
       path="${dir}/${basename}.pff"
       if is_path_readable_by_grub ${path} > /dev/null ; then
         echo "${path}"