diff options
-rw-r--r-- | isa/interface | 13 | ||||
-rw-r--r-- | isar/interface | 13 |
2 files changed, 20 insertions, 6 deletions
diff --git a/isa/interface b/isa/interface index 8a6cfe48..f41dbdea 100644 --- a/isa/interface +++ b/isa/interface @@ -25,11 +25,12 @@ function usage() echo echo " Options are:" echo " -I BOOL use Isabelle/Isar instead of classic Isabelle (default $ISAR)" + echo " -X BOOL configure the X-Symbol package on startup (default true)" echo " -l NAME logic image name (default \$ISABELLE_LOGIC=$ISABELLE_LOGIC)" echo " -p NAME Emacs program name (default xemacs)" echo " -u BOOL use personal .emacs file (default true)" echo " -w BOOL use window system (default true)" - echo " -x BOOL enable x-symbol package" + echo " -x BOOL enable the X-Symbol package on startup (default false)" echo echo "Starts Proof General for Isabelle with theory and proof FILES" echo "(default Scratch.thy)." @@ -55,16 +56,20 @@ PROGNAME="xemacs" INITFILE="true" WINDOWSYSTEM="true" XSYMBOL="" +XSYMBOLSETUP=true function getoptions() { OPTIND=1 - while getopts "I:l:p:u:w:x:" OPT + while getopts "I:X:l:p:u:w:x:" OPT do case "$OPT" in I) ISAR="$OPTARG" ;; + X) + XSYMBOLSETUP="$OPTARG" + ;; l) LOGIC="$OPTARG" ;; @@ -117,12 +122,14 @@ ARGS="" if [ "$WINDOWSYSTEM" = true -a -n "$DISPLAY" ]; then ARGS="$ARGS -T Isabelle" - [ -n "$XSYMBOL_INSTALLFONTS" ] && "$ISATOOL" installfonts -x + [ -n "$XSYMBOL_INSTALLFONTS" -a "$XSYMBOLSETUP" = true ] && "$ISATOOL" installfonts -x else ARGS="$ARGS -nw" XSYMBOL=false fi +[ ! "$XSYMBOLSETUP" = true ] && XSYMBOL_HOME="" + ARGS="$ARGS -l $PROOFGENERAL_HOME/isa/interface-setup.el" diff --git a/isar/interface b/isar/interface index 8a6cfe48..f41dbdea 100644 --- a/isar/interface +++ b/isar/interface @@ -25,11 +25,12 @@ function usage() echo echo " Options are:" echo " -I BOOL use Isabelle/Isar instead of classic Isabelle (default $ISAR)" + echo " -X BOOL configure the X-Symbol package on startup (default true)" echo " -l NAME logic image name (default \$ISABELLE_LOGIC=$ISABELLE_LOGIC)" echo " -p NAME Emacs program name (default xemacs)" echo " -u BOOL use personal .emacs file (default true)" echo " -w BOOL use window system (default true)" - echo " -x BOOL enable x-symbol package" + echo " -x BOOL enable the X-Symbol package on startup (default false)" echo echo "Starts Proof General for Isabelle with theory and proof FILES" echo "(default Scratch.thy)." @@ -55,16 +56,20 @@ PROGNAME="xemacs" INITFILE="true" WINDOWSYSTEM="true" XSYMBOL="" +XSYMBOLSETUP=true function getoptions() { OPTIND=1 - while getopts "I:l:p:u:w:x:" OPT + while getopts "I:X:l:p:u:w:x:" OPT do case "$OPT" in I) ISAR="$OPTARG" ;; + X) + XSYMBOLSETUP="$OPTARG" + ;; l) LOGIC="$OPTARG" ;; @@ -117,12 +122,14 @@ ARGS="" if [ "$WINDOWSYSTEM" = true -a -n "$DISPLAY" ]; then ARGS="$ARGS -T Isabelle" - [ -n "$XSYMBOL_INSTALLFONTS" ] && "$ISATOOL" installfonts -x + [ -n "$XSYMBOL_INSTALLFONTS" -a "$XSYMBOLSETUP" = true ] && "$ISATOOL" installfonts -x else ARGS="$ARGS -nw" XSYMBOL=false fi +[ ! "$XSYMBOLSETUP" = true ] && XSYMBOL_HOME="" + ARGS="$ARGS -l $PROOFGENERAL_HOME/isa/interface-setup.el" |