diff options
| -rw-r--r-- | isa/interface | 23 | ||||
| -rw-r--r-- | isar/interface | 23 |
2 files changed, 44 insertions, 2 deletions
diff --git a/isa/interface b/isa/interface index 2d129027..715f23bf 100644 --- a/isa/interface +++ b/isa/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 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 |