# HG changeset patch
# User wenzelm
# Date 1316465285 -7200
# Node ID 5bd261075711e5c5858d65b892beada8715de587
# Parent  7591039fb6b4b07443a8daef29de88458949ea71# Parent  9a2d100dd3ebf2480b690f63217f62ac8e63aa8d
merged

diff -r 7591039fb6b4 -r 5bd261075711 Admin/MacOS/App1/script
--- a/Admin/MacOS/App1/script	Mon Sep 19 16:18:34 2011 +0200
+++ b/Admin/MacOS/App1/script	Mon Sep 19 22:48:05 2011 +0200
@@ -12,7 +12,9 @@
 # sane environment defaults
 
 cd "$HOME"
-PATH="$PATH:/opt/local/bin"
+if [ -x /usr/libexec/path_helper ]; then
+  eval $(/usr/libexec/path_helper -s)
+fi
 
 [ -z "$LANG" ] && export LANG=en_US.UTF-8
 
diff -r 7591039fb6b4 -r 5bd261075711 Admin/isatest/isatest-stats
--- a/Admin/isatest/isatest-stats	Mon Sep 19 16:18:34 2011 +0200
+++ b/Admin/isatest/isatest-stats	Mon Sep 19 22:48:05 2011 +0200
@@ -6,7 +6,7 @@
 
 THIS="$(cd "$(dirname "$0")"; pwd)"
 
-PLATFORMS="at-poly at-poly-test afp at64-poly cygwin-poly-e mac-poly-M2 mac-poly-M4 mac-poly64-M4 mac-poly-M8 mac-poly64-M8 at64-poly-5.1-para at-mac-poly-5.1-para at-sml-dev"
+PLATFORMS="at-poly at-poly-test afp at64-poly cygwin-poly-e mac-poly-M2 mac-poly-M4 mac-poly64-M2 mac-poly64-M4 mac-poly-M8 mac-poly64-M8 at64-poly-5.1-para at-mac-poly-5.1-para at-sml-dev"
 
 ISABELLE_SESSIONS="\
   HOL-Plain \
diff -r 7591039fb6b4 -r 5bd261075711 lib/Tools/display
--- a/lib/Tools/display	Mon Sep 19 16:18:34 2011 +0200
+++ b/lib/Tools/display	Mon Sep 19 22:48:05 2011 +0200
@@ -74,7 +74,6 @@
   PRIVATE_FILE="${ISABELLE_TMP:-/tmp}/$$"$(basename "$FILE")
   mv "$FILE" "$PRIVATE_FILE" || fail "Cannot move file: $FILE"
   $VIEWER "$PRIVATE_FILE"
-  sleep 5   #try to avoid races
   rm -f "$PRIVATE_FILE"
 else
   exec $VIEWER "$FILE"
diff -r 7591039fb6b4 -r 5bd261075711 src/Pure/General/symbol.scala
--- a/src/Pure/General/symbol.scala	Mon Sep 19 16:18:34 2011 +0200
+++ b/src/Pure/General/symbol.scala	Mon Sep 19 22:48:05 2011 +0200
@@ -352,6 +352,8 @@
     val sym_chars =
       Set("!", "#", "$", "%", "&", "*", "+", "-", "/", "<", "=", ">", "?", "@", "^", "_", "|", "~")
 
+    val symbolic = recode_set((for { (sym, _) <- symbols; if raw_symbolic(sym) } yield sym): _*)
+
 
     /* control symbols */
 
@@ -391,11 +393,16 @@
   def is_quasi(sym: Symbol): Boolean = sym == "_" || sym == "'"
   def is_letdig(sym: Symbol): Boolean = is_letter(sym) || is_digit(sym) || is_quasi(sym)
   def is_blank(sym: Symbol): Boolean = symbols.blanks.contains(sym)
+
   def is_symbolic_char(sym: Symbol): Boolean = symbols.sym_chars.contains(sym)
-  def is_symbolic(sym: Symbol): Boolean =
+  def is_symbolic(sym: Symbol): Boolean = raw_symbolic(sym) || symbols.symbolic.contains(sym)
+
+  private def raw_symbolic(sym: Symbol): Boolean =
     sym.startsWith("\\<") && sym.endsWith(">") && !sym.startsWith("\\<^")
 
 
+
+
   /* control symbols */
 
   def is_ctrl(sym: Symbol): Boolean =
diff -r 7591039fb6b4 -r 5bd261075711 src/Pure/System/isabelle_process.ML
--- a/src/Pure/System/isabelle_process.ML	Mon Sep 19 16:18:34 2011 +0200
+++ b/src/Pure/System/isabelle_process.ML	Mon Sep 19 22:48:05 2011 +0200
@@ -177,6 +177,9 @@
 
     val _ = quick_and_dirty := true;
     val _ = Goal.parallel_proofs := 0;
+    val _ =
+      if Multithreading.max_threads_value () < 2
+      then Multithreading.max_threads := 2 else ();
     val _ = Context.set_thread_data NONE;
     val _ =
       Unsynchronized.change print_mode
diff -r 7591039fb6b4 -r 5bd261075711 src/Pure/Thy/present.ML
--- a/src/Pure/Thy/present.ML	Mon Sep 19 16:18:34 2011 +0200
+++ b/src/Pure/Thy/present.ML	Mon Sep 19 22:48:05 2011 +0200
@@ -499,8 +499,8 @@
         val base = Path.base path;
         val name =
           (case Path.implode (#1 (Path.split_ext base)) of
-            "" => "DUMMY" ^ serial_string ()
-          | s => s);
+            "" => "DUMMY"
+          | s => s)  ^ serial_string ();
       in
         if File.exists path then
           (((name, base, File.read path), (i, Latex.theory_entry name)), i + 1)
diff -r 7591039fb6b4 -r 5bd261075711 src/Tools/jEdit/src/session_dockable.scala
--- a/src/Tools/jEdit/src/session_dockable.scala	Mon Sep 19 16:18:34 2011 +0200
+++ b/src/Tools/jEdit/src/session_dockable.scala	Mon Sep 19 22:48:05 2011 +0200
@@ -12,11 +12,11 @@
 import scala.actors.Actor._
 import scala.swing.{FlowPanel, Button, TextArea, Label, ListView, Alignment,
   ScrollPane, TabbedPane, Component, Swing}
-import scala.swing.event.{ButtonClicked, SelectionChanged}
+import scala.swing.event.{ButtonClicked, MouseClicked, SelectionChanged}
 
 import java.lang.System
 import java.awt.{BorderLayout, Graphics2D, Insets}
-import javax.swing.{JList, DefaultListCellRenderer, UIManager}
+import javax.swing.{JList, DefaultListCellRenderer, BorderFactory}
 import javax.swing.border.{BevelBorder, SoftBevelBorder}
 
 import org.gjt.sp.jedit.{View, jEdit}
@@ -29,7 +29,14 @@
   private val readme = new HTML_Panel("SansSerif", 14)
   readme.render_document(Isabelle_System.try_read(List(Path.explode("$JEDIT_HOME/README.html"))))
 
-  val status = new ListView(Nil: List[Document.Node.Name])
+  val status = new ListView(Nil: List[Document.Node.Name]) {
+    listenTo(mouse.clicks)
+    reactions += {
+      case MouseClicked(_, point, _, clicks, _) if clicks == 2 =>
+        val index = peer.locationToIndex(point)
+        if (index >= 0) jEdit.openFile(view, listData(index).node)
+    }
+  }
   status.peer.setLayoutOrientation(JList.VERTICAL_WRAP)
   status.selection.intervalMode = ListView.IntervalMode.Single
 
@@ -86,11 +93,11 @@
 
   private var nodes_status: Map[Document.Node.Name, Isar_Document.Node_Status] = Map.empty
 
-  private class Node_Renderer_Component extends Label
+  private object Node_Renderer_Component extends Label
   {
+    opaque = false
     xAlignment = Alignment.Leading
-    border = UIManager.getBorder("List.cellNoFocusBorder")
-    val empty_insets = new Insets(0, 0, 0, 0)
+    border = BorderFactory.createEmptyBorder(2, 2, 2, 2)
 
     var node_name = Document.Node.Name.empty
     override def paintComponent(gfx: Graphics2D)
@@ -98,7 +105,7 @@
       nodes_status.get(node_name) match {
         case Some(st) if st.total > 0 =>
           val size = peer.getSize()
-          val insets = if (border == null) empty_insets else border.getBorderInsets(this.peer)
+          val insets = border.getBorderInsets(this.peer)
           val w = size.width - insets.left - insets.right
           val h = size.height - insets.top - insets.bottom
           var end = size.width - insets.right
@@ -119,18 +126,15 @@
     }
   }
 
-  private class Node_Renderer extends
-    ListView.AbstractRenderer[Document.Node.Name, Node_Renderer_Component](
-      new Node_Renderer_Component)
+  private class Node_Renderer extends ListView.Renderer[Document.Node.Name]
   {
-    def configure(list: ListView[_], isSelected: Boolean, focused: Boolean,
-      name: Document.Node.Name, index: Int)
+    def componentFor(list: ListView[_], isSelected: Boolean, focused: Boolean,
+      name: Document.Node.Name, index: Int): Component =
     {
-      component.opaque = false
-      component.background = list.background
-      component.foreground = list.foreground
+      val component = Node_Renderer_Component
       component.node_name = name
-      component.text = name.theory + " "
+      component.text = name.theory
+      component
     }
   }
   status.renderer = new Node_Renderer