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.

diff --git a/ChangeLog b/ChangeLog
index 2fe222616ab63dd8dd9aa60a5b6a4e87e46dfaaf..dec4574a609542f1ae9f53cd90bb4122794472d0 100644 (file)
--- 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 6f9474c9c98c19e5103a0901b7b81c67f3b9d35a..34b5bd0e68e3e3df43b1367fee201aea2ac24028 100644 (file)
--- 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 c488a85d02b7c41b36d80628c0b5bab8470f306f..03a96ce8fcdf7b2c662bcd9cf7c3275312e0cc1c 100644 (file)
--- 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}"