src/Tools/jEdit/src/plugin.scala
author wenzelm
Sun, 25 Nov 2012 21:23:20 +0100
changeset 50207 54be125d8cdc
parent 50206 6626bc5ed053
child 50208 1382ad6d4774
permissions -rw-r--r--
tuned signature;
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
43282
5d294220ca43 moved sources -- eliminated Netbeans artifact of jedit package directory;
wenzelm
parents: 41537
diff changeset
     1
/*  Title:      Tools/jEdit/src/plugin.scala
36760
b82a698ef6c9 tuned headers;
wenzelm
parents: 36015
diff changeset
     2
    Author:     Makarius
b82a698ef6c9 tuned headers;
wenzelm
parents: 36015
diff changeset
     3
b82a698ef6c9 tuned headers;
wenzelm
parents: 36015
diff changeset
     4
Main Isabelle/jEdit plugin setup.
b82a698ef6c9 tuned headers;
wenzelm
parents: 36015
diff changeset
     5
*/
34407
aad6834ba380 added some headers and comments;
wenzelm
parents: 34406
diff changeset
     6
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
     7
package isabelle.jedit
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
     8
34429
wenzelm
parents: 34422
diff changeset
     9
36015
6111de7c916a adapted to Scala 2.8.0 Beta 1;
wenzelm
parents: 34871
diff changeset
    10
import isabelle._
6111de7c916a adapted to Scala 2.8.0 Beta 1;
wenzelm
parents: 34871
diff changeset
    11
44573
51f8895b9ad9 some dialog for auto loading of required files (still inactive);
wenzelm
parents: 44434
diff changeset
    12
import javax.swing.JOptionPane
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
    13
49246
248e66e8321f more systematic JEdit_Options.make_component;
wenzelm
parents: 49245
diff changeset
    14
import scala.swing.{ListView, ScrollPane}
34406
f81cd75ae331 restructured: independent provers in different buffers
immler@in.tum.de
parents: 34337
diff changeset
    15
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    16
import org.gjt.sp.jedit.{jEdit, EBMessage, EBPlugin, Buffer, View}
39043
a0d7e9b580ec added gfx_range convenience;
wenzelm
parents: 38854
diff changeset
    17
import org.gjt.sp.jedit.textarea.{JEditTextArea, TextArea}
43452
5cf548485529 avoid setTokenMarker fluctuation on buffer reload etc. via static isabelle_token_marker, which is installed by hijacking the jEdit ModeProvider;
wenzelm
parents: 43449
diff changeset
    18
import org.gjt.sp.jedit.syntax.{Token => JEditToken, ModeProvider}
49100
e7aecf2a5fc4 prefer old startup dialog scheme (cf. 514bb82514df);
wenzelm
parents: 49099
diff changeset
    19
import org.gjt.sp.jedit.msg.{EditorStarted, BufferUpdate, EditPaneUpdate, PropertiesChanged}
37068
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
    20
import org.gjt.sp.jedit.gui.DockableWindowManager
34429
wenzelm
parents: 34422
diff changeset
    21
43443
5d9693c2337e basic support for extended syntax styles: sub/superscript;
wenzelm
parents: 43390
diff changeset
    22
import org.gjt.sp.util.SyntaxUtilities
39241
e9a442606db3 Isabelle.load_icon with some sanity checks;
wenzelm
parents: 39167
diff changeset
    23
44721
ba478c3f7255 tuned imports;
wenzelm
parents: 44699
diff changeset
    24
import scala.actors.Actor._
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
    25
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
    26
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
    27
object PIDE
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
    28
{
34784
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
    29
  /* plugin instance */
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
    30
49245
cb70157293c0 manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
wenzelm
parents: 49195
diff changeset
    31
  val options = new JEdit_Options
cb70157293c0 manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
wenzelm
parents: 49195
diff changeset
    32
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
    33
  @volatile var startup_failure: Option[Throwable] = None
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
    34
  @volatile var startup_notified = false
34784
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
    35
49101
21c8d2070be9 continue with more robust dummy session after failed startup;
wenzelm
parents: 49100
diff changeset
    36
  @volatile var plugin: Plugin = null
21c8d2070be9 continue with more robust dummy session after failed startup;
wenzelm
parents: 49100
diff changeset
    37
  @volatile var session: Session = new Session(new JEdit_Thy_Load(Set.empty, Outer_Syntax.empty))
21c8d2070be9 continue with more robust dummy session after failed startup;
wenzelm
parents: 49100
diff changeset
    38
48870
4accee106f0f clarified initialization of Thy_Load, Thy_Info, Session;
wenzelm
parents: 48791
diff changeset
    39
  def thy_load(): JEdit_Thy_Load =
4accee106f0f clarified initialization of Thy_Load, Thy_Info, Session;
wenzelm
parents: 48791
diff changeset
    40
    session.thy_load.asInstanceOf[JEdit_Thy_Load]
44955
9adaf5cd4f1c tuned signature;
wenzelm
parents: 44954
diff changeset
    41
48884
963b50ec6d73 clarified global get_recent_syntax: session always has its base_syntax, but it might be absent itself;
wenzelm
parents: 48872
diff changeset
    42
  def get_recent_syntax(): Option[Outer_Syntax] =
963b50ec6d73 clarified global get_recent_syntax: session always has its base_syntax, but it might be absent itself;
wenzelm
parents: 48872
diff changeset
    43
  {
963b50ec6d73 clarified global get_recent_syntax: session always has its base_syntax, but it might be absent itself;
wenzelm
parents: 48872
diff changeset
    44
    val current_session = session
49101
21c8d2070be9 continue with more robust dummy session after failed startup;
wenzelm
parents: 49100
diff changeset
    45
    if (current_session.recent_syntax == Outer_Syntax.empty) None
21c8d2070be9 continue with more robust dummy session after failed startup;
wenzelm
parents: 49100
diff changeset
    46
    else Some(current_session.recent_syntax)
48884
963b50ec6d73 clarified global get_recent_syntax: session always has its base_syntax, but it might be absent itself;
wenzelm
parents: 48872
diff changeset
    47
  }
963b50ec6d73 clarified global get_recent_syntax: session always has its base_syntax, but it might be absent itself;
wenzelm
parents: 48872
diff changeset
    48
34784
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
    49
43449
591598bc52bc convenience functions;
wenzelm
parents: 43443
diff changeset
    50
  /* document model and view */
591598bc52bc convenience functions;
wenzelm
parents: 43443
diff changeset
    51
591598bc52bc convenience functions;
wenzelm
parents: 43443
diff changeset
    52
  def document_model(buffer: Buffer): Option[Document_Model] = Document_Model(buffer)
591598bc52bc convenience functions;
wenzelm
parents: 43443
diff changeset
    53
  def document_view(text_area: JEditTextArea): Option[Document_View] = Document_View(text_area)
591598bc52bc convenience functions;
wenzelm
parents: 43443
diff changeset
    54
44379
1079ab6b342b added official Text.Range.Ordering;
wenzelm
parents: 44238
diff changeset
    55
  def document_views(buffer: Buffer): List[Document_View] =
1079ab6b342b added official Text.Range.Ordering;
wenzelm
parents: 44238
diff changeset
    56
    for {
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    57
      text_area <- JEdit_Lib.jedit_text_areas(buffer).toList
46997
395b7277ed76 misc tuning to accomodate scala-2.10.0-M2;
wenzelm
parents: 46918
diff changeset
    58
      doc_view = document_view(text_area)
44379
1079ab6b342b added official Text.Range.Ordering;
wenzelm
parents: 44238
diff changeset
    59
      if doc_view.isDefined
1079ab6b342b added official Text.Range.Ordering;
wenzelm
parents: 44238
diff changeset
    60
    } yield doc_view.get
1079ab6b342b added official Text.Range.Ordering;
wenzelm
parents: 44238
diff changeset
    61
47058
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    62
  def exit_model(buffer: Buffer)
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    63
  {
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    64
    JEdit_Lib.swing_buffer_lock(buffer) {
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    65
      JEdit_Lib.jedit_text_areas(buffer).foreach(Document_View.exit)
47058
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    66
      Document_Model.exit(buffer)
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    67
    }
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    68
  }
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    69
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    70
  def init_model(buffer: Buffer)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    71
  {
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    72
    JEdit_Lib.swing_buffer_lock(buffer) {
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    73
      val opt_model =
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    74
        JEdit_Lib.buffer_node_name(buffer) match {
48717
622251b2b0f1 clarified Sidekick configuration, including minor modes;
wenzelm
parents: 48709
diff changeset
    75
          case Some(node_name) =>
47058
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    76
            document_model(buffer) match {
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    77
              case Some(model) if model.name == node_name => Some(model)
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    78
              case _ => Some(Document_Model.init(session, buffer, node_name))
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    79
            }
47058
34761733526c refined init_model: allow change of buffer name as caused by "Save as", for example;
wenzelm
parents: 46997
diff changeset
    80
          case None => None
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    81
        }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    82
      if (opt_model.isDefined) {
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    83
        for (text_area <- JEdit_Lib.jedit_text_areas(buffer)) {
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    84
          if (document_view(text_area).map(_.model) != opt_model)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    85
            Document_View.init(opt_model.get, text_area)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    86
        }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    87
      }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    88
    }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    89
  }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    90
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    91
  def init_view(buffer: Buffer, text_area: JEditTextArea)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    92
  {
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
    93
    JEdit_Lib.swing_buffer_lock(buffer) {
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    94
      document_model(buffer) match {
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    95
        case Some(model) => Document_View.init(model, text_area)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    96
        case None =>
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    97
      }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    98
    }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
    99
  }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   100
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   101
  def exit_view(buffer: Buffer, text_area: JEditTextArea)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   102
  {
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
   103
    JEdit_Lib.swing_buffer_lock(buffer) {
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   104
      Document_View.exit(text_area)
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   105
    }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   106
  }
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   107
43449
591598bc52bc convenience functions;
wenzelm
parents: 43443
diff changeset
   108
37068
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   109
  /* dockable windows */
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   110
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   111
  private def wm(view: View): DockableWindowManager = view.getDockableWindowManager
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   112
39515
57ceabb0bb8e basic setup for prover session panel;
wenzelm
parents: 39241
diff changeset
   113
  def docked_session(view: View): Option[Session_Dockable] =
57ceabb0bb8e basic setup for prover session panel;
wenzelm
parents: 39241
diff changeset
   114
    wm(view).getDockableWindow("isabelle-session") match {
57ceabb0bb8e basic setup for prover session panel;
wenzelm
parents: 39241
diff changeset
   115
      case dockable: Session_Dockable => Some(dockable)
57ceabb0bb8e basic setup for prover session panel;
wenzelm
parents: 39241
diff changeset
   116
      case _ => None
57ceabb0bb8e basic setup for prover session panel;
wenzelm
parents: 39241
diff changeset
   117
    }
57ceabb0bb8e basic setup for prover session panel;
wenzelm
parents: 39241
diff changeset
   118
37068
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   119
  def docked_output(view: View): Option[Output_Dockable] =
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   120
    wm(view).getDockableWindow("isabelle-output") match {
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   121
      case dockable: Output_Dockable => Some(dockable)
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   122
      case _ => None
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   123
    }
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   124
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   125
  def docked_raw_output(view: View): Option[Raw_Output_Dockable] =
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   126
    wm(view).getDockableWindow("isabelle-raw-output") match {
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   127
      case dockable: Raw_Output_Dockable => Some(dockable)
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   128
      case _ => None
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   129
    }
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   130
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   131
  def docked_protocol(view: View): Option[Protocol_Dockable] =
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   132
    wm(view).getDockableWindow("isabelle-protocol") match {
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   133
      case dockable: Protocol_Dockable => Some(dockable)
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   134
      case _ => None
07936a4efe93 access statically typed dockable windows;
wenzelm
parents: 37019
diff changeset
   135
    }
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   136
}
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   137
34429
wenzelm
parents: 34422
diff changeset
   138
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   139
class Plugin extends EBPlugin
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   140
{
44577
96b6388d06c4 separate module for jEdit primitives for loading theory files;
wenzelm
parents: 44574
diff changeset
   141
  /* theory files */
44574
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   142
44573
51f8895b9ad9 some dialog for auto loading of required files (still inactive);
wenzelm
parents: 44434
diff changeset
   143
  private lazy val delay_load =
50207
54be125d8cdc tuned signature;
wenzelm
parents: 50206
diff changeset
   144
    Swing_Thread.delay_last(PIDE.options.seconds("editor_load_delay"))
44574
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   145
    {
44963
4662dddc2fd8 explicit check_file wrt. jEdit VFS, to avoid slightly confusing empty buffer after IO error;
wenzelm
parents: 44955
diff changeset
   146
      val view = jEdit.getActiveView()
4662dddc2fd8 explicit check_file wrt. jEdit VFS, to avoid slightly confusing empty buffer after IO error;
wenzelm
parents: 44955
diff changeset
   147
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
   148
      val buffers = JEdit_Lib.jedit_buffers().toList
46761
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   149
      if (buffers.forall(_.isLoaded)) {
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   150
        def loaded_buffer(name: String): Boolean =
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
   151
          buffers.exists(buffer => JEdit_Lib.buffer_name(buffer) == name)
44574
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   152
46761
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   153
        val thys =
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   154
          for (buffer <- buffers; model <- PIDE.document_model(buffer))
46761
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   155
            yield model.name
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   156
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   157
        val thy_info = new Thy_Info(PIDE.thy_load)
46761
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   158
        // FIXME avoid I/O in Swing thread!?!
49098
673e0ed547af bypass slow check for inlined files, where it is not really required;
wenzelm
parents: 48884
diff changeset
   159
        val files = thy_info.dependencies(true, thys).deps.map(_._1.node).
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   160
          filter(file => !loaded_buffer(file) && PIDE.thy_load.check_file(view, file))
44574
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   161
46761
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   162
        if (!files.isEmpty) {
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   163
          val files_list = new ListView(files.sorted)
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   164
          for (i <- 0 until files.length)
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   165
            files_list.selection.indices += i
44606
b625650aa2db improved auto loading: selectable file list;
wenzelm
parents: 44580
diff changeset
   166
46761
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   167
          val answer =
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   168
            Library.confirm_dialog(view,
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   169
              "Auto loading of required files",
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   170
              JOptionPane.YES_NO_OPTION,
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   171
              "The following files are required to resolve theory imports.",
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   172
              "Reload selected files now?",
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   173
              new ScrollPane(files_list))
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   174
          if (answer == 0) {
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   175
            files.foreach(file =>
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   176
              if (files_list.selection.items.contains(file))
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   177
                jEdit.openFile(null: View, file))
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   178
          }
b0a797158e34 avoid buffer loading overrun;
wenzelm
parents: 46740
diff changeset
   179
        }
44606
b625650aa2db improved auto loading: selectable file list;
wenzelm
parents: 44580
diff changeset
   180
      }
44574
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   181
    }
44573
51f8895b9ad9 some dialog for auto loading of required files (still inactive);
wenzelm
parents: 44434
diff changeset
   182
44574
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   183
24444588fddd actual auto loading of required files;
wenzelm
parents: 44573
diff changeset
   184
  /* session manager */
44573
51f8895b9ad9 some dialog for auto loading of required files (still inactive);
wenzelm
parents: 44434
diff changeset
   185
39633
26a28110ece5 simplified Session.Phase;
wenzelm
parents: 39631
diff changeset
   186
  private val session_manager = actor {
26a28110ece5 simplified Session.Phase;
wenzelm
parents: 39631
diff changeset
   187
    loop {
26a28110ece5 simplified Session.Phase;
wenzelm
parents: 39631
diff changeset
   188
      react {
39735
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   189
        case phase: Session.Phase =>
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   190
          phase match {
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   191
            case Session.Failed =>
46918
1752164d916b prefer asynchronous context switch from actor to swing thread, to reduce danger of deadlocks;
wenzelm
parents: 46771
diff changeset
   192
              Swing_Thread.later {
48022
e237a3fc7ba3 tuned message;
wenzelm
parents: 48020
diff changeset
   193
                Library.error_dialog(jEdit.getActiveView, "Prover process failure",
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   194
                    "Isabelle Syslog", Library.scrollable_text(PIDE.session.current_syslog()))
39735
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   195
              }
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   196
44573
51f8895b9ad9 some dialog for auto loading of required files (still inactive);
wenzelm
parents: 44434
diff changeset
   197
            case Session.Ready =>
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   198
              PIDE.session.global_options.event(Session.Global_Options(PIDE.options.value))
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   199
              JEdit_Lib.jedit_buffers.foreach(PIDE.init_model)
49195
9d10bd85c1be more explicit Delay operations;
wenzelm
parents: 49101
diff changeset
   200
              Swing_Thread.later { delay_load.invoke() }
44573
51f8895b9ad9 some dialog for auto loading of required files (still inactive);
wenzelm
parents: 44434
diff changeset
   201
46740
852baa599351 explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents: 46204
diff changeset
   202
            case Session.Shutdown =>
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   203
              JEdit_Lib.jedit_buffers.foreach(PIDE.exit_model)
49195
9d10bd85c1be more explicit Delay operations;
wenzelm
parents: 49101
diff changeset
   204
              Swing_Thread.later { delay_load.revoke() }
46740
852baa599351 explicitly revoke delay, to avoid spurious timer events after deactivation of related components;
wenzelm
parents: 46204
diff changeset
   205
39735
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   206
            case _ =>
969ede84aac0 more uniform init/exit model/view in session_manager, trading race wrt. session.phase for race wrt. global editor state;
wenzelm
parents: 39702
diff changeset
   207
          }
49406
38db4832b210 somewhat more general JEdit_Lib;
wenzelm
parents: 49288
diff changeset
   208
        case bad => java.lang.System.err.println("session_manager: ignoring bad message " + bad)
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
   209
      }
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
   210
    }
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
   211
  }
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
   212
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
   213
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   214
  /* main plugin plumbing */
34433
3da749b53842 renamed Plugin.plugin to Plugin.self;
wenzelm
parents: 34429
diff changeset
   215
34767
8dd19c5f8c56 added properties_changed event bus;
wenzelm
parents: 34764
diff changeset
   216
  override def handleMessage(message: EBMessage)
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   217
  {
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   218
    Swing_Thread.assert()
39630
44181423183a explicit Session.Phase indication with associated event bus;
wenzelm
parents: 39628
diff changeset
   219
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   220
    if (PIDE.startup_failure.isDefined && !PIDE.startup_notified) {
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   221
      message match {
49100
e7aecf2a5fc4 prefer old startup dialog scheme (cf. 514bb82514df);
wenzelm
parents: 49099
diff changeset
   222
        case msg: EditorStarted =>
e7aecf2a5fc4 prefer old startup dialog scheme (cf. 514bb82514df);
wenzelm
parents: 49099
diff changeset
   223
          Library.error_dialog(null, "Isabelle plugin startup failure",
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   224
            Library.scrollable_text(Exn.message(PIDE.startup_failure.get)),
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   225
            "Prover IDE inactive!")
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   226
          PIDE.startup_notified = true
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   227
        case _ =>
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   228
      }
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   229
    }
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   230
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   231
    if (PIDE.startup_failure.isEmpty) {
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   232
      message match {
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   233
        case msg: EditorStarted =>
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   234
          if (PIDE.options.bool("jedit_auto_start"))
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   235
            PIDE.session.start(Isabelle_Logic.session_args())
37557
1ae272fd4082 refresh Isabelle token marker after buffer properties changed, e.g. when fold mode is switched;
wenzelm
parents: 37241
diff changeset
   236
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   237
        case msg: BufferUpdate
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   238
        if msg.getWhat == BufferUpdate.LOADED || msg.getWhat == BufferUpdate.PROPERTIES_CHANGED =>
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   239
          if (PIDE.session.is_ready) {
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   240
            val buffer = msg.getBuffer
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   241
            if (buffer != null && !buffer.isLoading) PIDE.init_model(buffer)
49195
9d10bd85c1be more explicit Delay operations;
wenzelm
parents: 49101
diff changeset
   242
            Swing_Thread.later { delay_load.invoke() }
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   243
          }
34784
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
   244
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   245
        case msg: EditPaneUpdate
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   246
        if (msg.getWhat == EditPaneUpdate.BUFFER_CHANGING ||
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   247
            msg.getWhat == EditPaneUpdate.BUFFER_CHANGED ||
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   248
            msg.getWhat == EditPaneUpdate.CREATED ||
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   249
            msg.getWhat == EditPaneUpdate.DESTROYED) =>
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   250
          val edit_pane = msg.getEditPane
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   251
          val buffer = edit_pane.getBuffer
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   252
          val text_area = edit_pane.getTextArea
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   253
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   254
          if (buffer != null && text_area != null) {
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   255
            if (msg.getWhat == EditPaneUpdate.BUFFER_CHANGED ||
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   256
                msg.getWhat == EditPaneUpdate.CREATED) {
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   257
              if (PIDE.session.is_ready)
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   258
                PIDE.init_view(buffer, text_area)
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   259
            }
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   260
            else PIDE.exit_view(buffer, text_area)
43510
17d431c92575 init/exit model/view synchronously within the swing thread -- EditBus.send in jedit-4.4.1 always runs there;
wenzelm
parents: 43487
diff changeset
   261
          }
34784
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
   262
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   263
        case msg: PropertiesChanged =>
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   264
          PIDE.session.global_options.event(Session.Global_Options(PIDE.options.value))
34784
02959dcea756 split Theory_View into Document_Model (connected to Buffer) and Document_View (connected to JEditTextArea);
wenzelm
parents: 34782
diff changeset
   265
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   266
        case _ =>
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   267
      }
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   268
    }
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   269
  }
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   270
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   271
  override def start()
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   272
  {
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   273
    try {
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   274
      PIDE.plugin = this
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   275
      Isabelle_System.init()
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   276
      Isabelle_System.install_fonts()
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   277
49245
cb70157293c0 manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
wenzelm
parents: 49195
diff changeset
   278
      val init_options = Options.init()
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   279
      Swing_Thread.now { PIDE.options.update(init_options)  }
49245
cb70157293c0 manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
wenzelm
parents: 49195
diff changeset
   280
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   281
      SyntaxUtilities.setStyleExtender(new Token_Markup.Style_Extender)
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   282
      if (ModeProvider.instance.isInstanceOf[ModeProvider])
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   283
        ModeProvider.instance = new Token_Markup.Mode_Provider(ModeProvider.instance)
48870
4accee106f0f clarified initialization of Thy_Load, Thy_Info, Session;
wenzelm
parents: 48791
diff changeset
   284
49246
248e66e8321f more systematic JEdit_Options.make_component;
wenzelm
parents: 49245
diff changeset
   285
      val content = Isabelle_Logic.session_content(false)
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   286
      val thy_load = new JEdit_Thy_Load(content.loaded_theories, content.syntax)
49524
68796a77c42b Thy_Syntax.consolidate_spans is subject to editor_reparse_limit, for improved experience of unbalanced comments etc.;
wenzelm
parents: 49523
diff changeset
   287
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   288
      PIDE.session = new Session(thy_load) {
50207
54be125d8cdc tuned signature;
wenzelm
parents: 50206
diff changeset
   289
        override def output_delay = PIDE.options.seconds("editor_output_delay")
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   290
        override def reparse_limit = PIDE.options.int("editor_reparse_limit")
49288
2c9272cb4568 more options;
wenzelm
parents: 49272
diff changeset
   291
      }
48870
4accee106f0f clarified initialization of Thy_Load, Thy_Info, Session;
wenzelm
parents: 48791
diff changeset
   292
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   293
      PIDE.session.phase_changed += session_manager
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   294
      PIDE.startup_failure = None
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   295
    }
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   296
    catch {
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   297
      case exn: Throwable =>
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   298
        PIDE.startup_failure = Some(exn)
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   299
        PIDE.startup_notified = false
49099
10e899bb6530 more permissive handling of plugin startup failure;
wenzelm
parents: 49098
diff changeset
   300
    }
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   301
  }
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   302
39628
f6e82967b5cd Plugin.stop: refrain from invalidating Isabelle.session -- some actors/dockables out there might still refer to it;
wenzelm
parents: 39518
diff changeset
   303
  override def stop()
34618
e45052ff7233 added Boolean_Property, Int_Property;
wenzelm
parents: 34615
diff changeset
   304
  {
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   305
    if (PIDE.startup_failure.isEmpty)
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   306
      PIDE.options.value.save_prefs()
49245
cb70157293c0 manage Isabelle/jEdit options as Isabelle/Scala options (with persistent preferences);
wenzelm
parents: 49195
diff changeset
   307
50205
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   308
    PIDE.session.phase_changed -= session_manager
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   309
    JEdit_Lib.jedit_buffers.foreach(PIDE.exit_model)
788c8263e634 renamed main plugin object to PIDE;
wenzelm
parents: 50183
diff changeset
   310
    PIDE.session.stop()
34318
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   311
  }
c13e168a8ae6 original sources from Johannes Hölzl a48e0c6ab1aea77c52d596f7efc007a543d3d10c with minor modifications of directory layout;
wenzelm
parents:
diff changeset
   312
}