From 1de82829cce602467cf3e39f8704b4f0a199ae83 Mon Sep 17 00:00:00 2001
From: Makarius Wenzel <makarius@sketis.net>
Date: Wed, 12 Dec 2001 17:02:04 +0000
Subject: incorporate smart X11 font installation (used to be in isatool
 installfonts);

---
 isar/interface | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

(limited to 'isar/interface')

diff --git a/isar/interface b/isar/interface
index 2d129027..715f23bf 100644
--- a/isar/interface
+++ b/isar/interface
@@ -141,6 +141,27 @@ else
 fi
 
 
+## smart X11 font installation
+
+function checkfonts ()
+{
+  XLSFONTS=$(xlsfonts -fn "-xsymb-xsymb0-*" 2>&1) || return 1
+
+  case "$XLSFONTS" in
+    xlsfonts:*)
+      return 1
+      ;;
+  esac
+
+  return 0
+}
+
+function installfonts ()
+{
+  checkfonts "$XSYMBOL_PATTERN" || eval $XSYMBOL_INSTALLFONTS
+}
+
+
 ## main
 
 if [ "$START_PG" = false ]; then
@@ -156,7 +177,7 @@ else
   
   if [ "$WINDOWSYSTEM" = true -a -n "$DISPLAY" ]; then
     ARGS="$ARGS -T Isabelle"
-    [ -n "$XSYMBOL_INSTALLFONTS" -a "$XSYMBOLSETUP" = true ] && "$ISATOOL" installfonts -x
+    [ -n "$XSYMBOL_INSTALLFONTS" -a "$XSYMBOLSETUP" = true ] && installfonts
   else
     ARGS="$ARGS -nw"
     XSYMBOL=false
-- 
cgit v1.2.3