1.1 --- a/etc/settings	Mon Mar 08 08:42:05 2021 +0100
     1.2 +++ b/etc/settings	Mon Mar 08 09:11:09 2021 +0100
     1.3 @@ -12,18 +12,27 @@
     1.4  ### Isabelle/Scala
     1.5  ###
     1.6  
     1.7 -ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0 -Djdk.gtk.version=2.2"
     1.8 +ISABELLE_JAVA_SYSTEM_OPTIONS="-server -Dfile.encoding=UTF-8 -Disabelle.threads=0"
     1.9  
    1.10 -ISABELLE_TOOL_JAVA_OPTIONS="-Djava.awt.headless=true -Xms512m -Xmx2560m -Xss16m"
    1.11 +ISABELLE_TOOL_JAVA_OPTIONS="-Djava.awt.headless=true -Xms512m -Xmx4g -Xss16m"
    1.12  
    1.13 -ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.8 -Xmax-classfile-name 130 -J-Xms512m -J-Xmx2560m -J-Xss16m"
    1.14 +ISABELLE_SCALAC_OPTIONS="-encoding UTF-8 -nowarn -target:jvm-1.8 -J-Xms512m -J-Xmx4g -J-Xss16m"
    1.15  
    1.16  classpath "$ISABELLE_HOME/lib/classes/Pure.jar"
    1.17  
    1.18 -isabelle_scala_tools 'isabelle.Tools'
    1.19 -[ -d "$ISABELLE_HOME/Admin" ] && isabelle_scala_tools 'isabelle.Admin_Tools'
    1.20 +isabelle_scala_service 'isabelle.Tools'
    1.21 +[ -d "$ISABELLE_HOME/Admin" ] && isabelle_scala_service 'isabelle.Admin_Tools'
    1.22  
    1.23 -isabelle_file_format 'isabelle.Bibtex$File_Format'
    1.24 +isabelle_scala_service 'isabelle.Scala_Functions'
    1.25 +
    1.26 +isabelle_scala_service 'isabelle.Sessions$File_Format'
    1.27 +isabelle_scala_service 'isabelle.Bibtex$File_Format'
    1.28 +
    1.29 +isabelle_scala_service 'isabelle.ML_Statistics$Handler'
    1.30 +isabelle_scala_service 'isabelle.Scala$Handler'
    1.31 +isabelle_scala_service 'isabelle.Print_Operation$Handler'
    1.32 +isabelle_scala_service 'isabelle.Simplifier_Trace$Handler'
    1.33 +isabelle_scala_service 'isabelle.Server_Commands'
    1.34  
    1.35  #paranoia settings -- avoid intrusion of alien options
    1.36  unset "_JAVA_OPTIONS"
    1.37 @@ -51,30 +60,28 @@
    1.38  ### Document preparation (cf. isabelle latex/document)
    1.39  ###
    1.40  
    1.41 -ISABELLE_LATEX="latex -file-line-error"
    1.42 -ISABELLE_PDFLATEX="pdflatex -file-line-error"
    1.43 +ISABELLE_PDFLATEX="lualatex --file-line-error"
    1.44  ISABELLE_BIBTEX="bibtex"
    1.45  ISABELLE_MAKEINDEX="makeindex"
    1.46  ISABELLE_EPSTOPDF="epstopdf"
    1.47  
    1.48 -if [ "$ISABELLE_PLATFORM_FAMILY" = "windows" ]; then
    1.49 -  ISABELLE_LATEX="latex -c-style-errors"
    1.50 -  ISABELLE_PDFLATEX="pdflatex -c-style-errors"
    1.51 -fi
    1.52 -
    1.53  
    1.54  ###
    1.55  ### Misc path settings
    1.56  ###
    1.57  
    1.58 -ISABELLE_COMPONENT_REPOSITORY="https://isabelle.in.tum.de/components"
    1.59 +isabelle_directory '~'
    1.60 +isabelle_directory '$ISABELLE_HOME_USER'
    1.61 +isabelle_directory '~~'
    1.62 +
    1.63 +ISABELLE_COMPONENT_REPOSITORY="https://isabelle.sketis.net/components"
    1.64  ISABELLE_COMPONENTS_BASE="$USER_HOME/.isabelle/contrib"
    1.65  
    1.66  # The place for user configuration, heap files, etc.
    1.67  if [ -z "$ISABELLE_IDENTIFIER" ]; then
    1.68 -  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac"
    1.69 +  ISABELLE_HOME_USER="$USER_HOME/.isabelle"
    1.70  else
    1.71 -  ISABELLE_HOME_USER="$USER_HOME/.isabelle/isabisac"
    1.72 +  ISABELLE_HOME_USER="$USER_HOME/.isabelle/$ISABELLE_IDENTIFIER"
    1.73  fi
    1.74  
    1.75  # Where to look for isabelle tools (multiple dirs separated by ':').
    1.76 @@ -105,14 +112,14 @@
    1.77  
    1.78  
    1.79  ###
    1.80 -### Docs
    1.81 +### Docs and external files
    1.82  ###
    1.83  
    1.84  # Where to look for docs (multiple dirs separated by ':').
    1.85  ISABELLE_DOCS="$ISABELLE_HOME/doc"
    1.86  
    1.87  ISABELLE_DOCS_RELEASE_NOTES="~~/ANNOUNCE:~~/README:~~/NEWS:~~/COPYRIGHT:~~/CONTRIBUTORS:~~/contrib/README:~~/src/Tools/jEdit/README:~~/README_REPOSITORY"
    1.88 -ISABELLE_DOCS_EXAMPLES="~~/src/HOL/ex/Seq.thy:~~/src/HOL/ex/ML.thy:~~/src/HOL/Unix/Unix.thy:~~/src/HOL/Isar_Examples/Drinker.thy:~~/src/Tools/SML/Examples.thy:~~/src/Pure/ROOT.ML"
    1.89 +ISABELLE_DOCS_EXAMPLES="~~/src/HOL/Examples/Seq.thy:~~/src/HOL/Examples/Drinker.thy:~~/src/HOL/Examples/ML.thy:~~/src/HOL/Unix/Unix.thy:~~/src/Tools/SML/Examples.thy:~~/src/Pure/ROOT.ML"
    1.90  
    1.91  # "open" within desktop environment (potentially asynchronous)
    1.92  case "$ISABELLE_PLATFORM_FAMILY" in
    1.93 @@ -128,7 +135,8 @@
    1.94  esac
    1.95  
    1.96  PDF_VIEWER="$ISABELLE_OPEN"
    1.97 -DVI_VIEWER="$ISABELLE_OPEN"
    1.98 +
    1.99 +ISABELLE_EXTERNAL_FILES="bmp:eps:gif:jpeg:jpg:pdf:png:xmp"
   1.100  
   1.101  
   1.102  ###
   1.103 @@ -144,7 +152,7 @@
   1.104  
   1.105  ISABELLE_OPAM_ROOT="$USER_HOME/.opam"
   1.106  
   1.107 -ISABELLE_OCAML_VERSION="ocaml-base-compiler.4.05.0"
   1.108 +ISABELLE_OCAML_VERSION="ocaml-base-compiler.4.07.0"
   1.109  
   1.110  
   1.111  ###
   1.112 @@ -153,9 +161,9 @@
   1.113  
   1.114  ISABELLE_STACK_ROOT="$USER_HOME/.stack"
   1.115  
   1.116 -ISABELLE_STACK_RESOLVER="lts-13.19"
   1.117 +ISABELLE_STACK_RESOLVER="lts-16.31"
   1.118  
   1.119 -ISABELLE_GHC_VERSION="ghc-8.6.4"
   1.120 +ISABELLE_GHC_VERSION="ghc-8.8.4"
   1.121  
   1.122  
   1.123  ###