1.1 --- a/etc/settings	Thu Jun 02 15:54:11 2005 +0200
     1.2 +++ b/etc/settings	Thu Jun 02 18:29:46 2005 +0200
     1.3 @@ -1,6 +1,5 @@
     1.4  # -*- shell-script -*-
     1.5  # $Id$
     1.6 -# Author: Markus Wenzel, TU Muenchen
     1.7  #
     1.8  # Isabelle settings -- site defaults.
     1.9  # Do *NOT* copy this file into your personal isabelle directory!!!
    1.10 @@ -60,36 +59,24 @@
    1.11  
    1.12  
    1.13  ###
    1.14 -### Compilation options for isatool usedir
    1.15 -### (as on command line)
    1.16 +### Compilation options (cf. isatool usedir)
    1.17  ###
    1.18  
    1.19  ISABELLE_USEDIR_OPTIONS="-v true"
    1.20  
    1.21 -# for overriding proof objects in HOL image
    1.22 -HOL_PROOF_OBJECTS=""
    1.23 +# Specifically for the HOL image
    1.24 +HOL_USEDIR_OPTIONS=""
    1.25  
    1.26  
    1.27  ###
    1.28 -### Document preparation
    1.29 +### Document preparation (cf. isatool latex/document)
    1.30  ###
    1.31  
    1.32 -# latex command for isatool latex/document
    1.33  ISABELLE_LATEX="latex"
    1.34 -
    1.35 -# pdflatex command for isatool latex/document
    1.36  ISABELLE_PDFLATEX="pdflatex"
    1.37 -
    1.38 -# bibtex command for isatool latex/document
    1.39  ISABELLE_BIBTEX="bibtex"
    1.40 -
    1.41 -# makeindex command for isatool latex/document
    1.42  ISABELLE_MAKEINDEX="makeindex"
    1.43 -
    1.44 -# dvips command for isatool latex/document
    1.45  ISABELLE_DVIPS="dvips -D 600"
    1.46 -
    1.47 -# epstopdf command for isatool latex/document
    1.48  ISABELLE_EPSTOPDF="epstopdf"
    1.49  
    1.50  # Paranoia setting for strange latex installations ...
    1.51 @@ -97,8 +84,6 @@
    1.52  
    1.53  # If ISABELLE_THUMBPDF is set, isatool tries to
    1.54  # generate thumbnails for proof documents
    1.55 -#
    1.56 -# probably not generally available ...
    1.57  #type -path thumbpdf >/dev/null && ISABELLE_THUMBPDF="thumbpdf"
    1.58  
    1.59  
    1.60 @@ -115,7 +100,6 @@
    1.61  # Location for temporary files (should be on a local file system).
    1.62  ISABELLE_TMP_PREFIX="/tmp/isabelle-$USER"
    1.63  
    1.64 -
    1.65  # Heap input locations. ML system identifier is included in lookup.
    1.66  ISABELLE_PATH="$ISABELLE_HOME_USER/heaps:$ISABELLE_HOME/heaps"
    1.67  
    1.68 @@ -129,14 +113,15 @@
    1.69    ISABELLE_BROWSER_INFO="$ISABELLE_HOME_USER/browser_info"
    1.70  fi
    1.71  
    1.72 -# Site settings check -- just to make it a little bit harder to copy this file!
    1.73 +# Site settings check -- just to make it a little bit harder to copy this file verbatim!
    1.74  [ -n "$ISABELLE_SITE_SETTINGS_PRESENT" ] && \
    1.75    { echo >&2 "### Isabelle site settings already present!  Maybe copied etc/settings in full?"; }
    1.76  
    1.77  
    1.78  ###
    1.79 -### default logic, users may want to override this.
    1.80 +### default logic (users may want to override this in their own settings file)
    1.81  ###
    1.82 +
    1.83  ISABELLE_LOGIC=HOL
    1.84  
    1.85  
    1.86 @@ -144,25 +129,25 @@
    1.87  ### Docs
    1.88  ###
    1.89  
    1.90 -#Where to look for docs (multiple dirs separated by ':').
    1.91 +# Where to look for docs (multiple dirs separated by ':').
    1.92  ISABELLE_DOCS="$ISABELLE_HOME/doc"
    1.93  
    1.94 -#Preferred document format
    1.95 +# Preferred document format
    1.96  ISABELLE_DOC_FORMAT=pdf
    1.97  
    1.98 -#The dvi file viewer
    1.99 +# The dvi file viewer
   1.100  DVI_VIEWER=xdvi
   1.101  #DVI_VIEWER="xdvi -geometry 498x704 -expert -s 5"
   1.102  #DVI_VIEWER="xdvi -geometry 711x1005 -expert -s 7"
   1.103  #DVI_VIEWER="xdvi -geometry 500x704 -expert -s 10"
   1.104  #DVI_VIEWER="xdvi -geometry 555x782 -expert -s 9"
   1.105  
   1.106 -#The pdf file viewer
   1.107 +# The pdf file viewer
   1.108  PDF_VIEWER=acroread
   1.109  #PDF_VIEWER=xpdf
   1.110 -#PDF_VIEWER=open  ##best for Mac users: will open in default PDF viewer
   1.111 +#PDF_VIEWER=open  #best for Mac users: will open in default PDF viewer
   1.112  
   1.113 -#Printer spool command for PS files
   1.114 +# Printer spool command for PS files
   1.115  PRINT_COMMAND=lp
   1.116  
   1.117  
   1.118 @@ -236,4 +221,3 @@
   1.119  
   1.120  # Jerusat 1.3 (SAT Solver)
   1.121  #JERUSAT_HOME=/usr/local/bin
   1.122 -