equal
deleted
inserted
replaced
208 document_model(buffer) match { |
208 document_model(buffer) match { |
209 case Some(model) => Some(model) |
209 case Some(model) => Some(model) |
210 case None => |
210 case None => |
211 val (master_dir, path) = buffer_path(buffer) |
211 val (master_dir, path) = buffer_path(buffer) |
212 Thy_Header.thy_name(path) match { |
212 Thy_Header.thy_name(path) match { |
213 case Some(name) => |
213 case Some((prefix, name)) => |
214 Some(Document_Model.init(session, buffer, master_dir, path, name)) |
214 Some(Document_Model.init(session, buffer, master_dir, prefix + name, name)) |
215 case None => None |
215 case None => None |
216 } |
216 } |
217 } |
217 } |
218 if (opt_model.isDefined) { |
218 if (opt_model.isDefined) { |
219 for (text_area <- jedit_text_areas(buffer)) { |
219 for (text_area <- jedit_text_areas(buffer)) { |
325 { |
325 { |
326 /* editor file store */ |
326 /* editor file store */ |
327 |
327 |
328 private val file_store = new Session.File_Store |
328 private val file_store = new Session.File_Store |
329 { |
329 { |
330 def append(master_dir: String, path: Path): String = |
330 def append(master_dir: String, source_path: Path): String = |
331 { |
331 { |
332 val vfs = VFSManager.getVFSForPath(master_dir) |
332 val path = source_path.expand |
333 if (vfs.isInstanceOf[FileVFS]) |
333 if (path.is_absolute) Isabelle_System.platform_path(path) |
334 MiscUtilities.resolveSymlinks( |
334 else { |
335 vfs.constructPath(master_dir, Isabelle_System.platform_path(path))) |
335 val vfs = VFSManager.getVFSForPath(master_dir) |
336 else vfs.constructPath(master_dir, Isabelle_System.standard_path(path)) |
336 if (vfs.isInstanceOf[FileVFS]) |
|
337 MiscUtilities.resolveSymlinks( |
|
338 vfs.constructPath(master_dir, Isabelle_System.platform_path(path))) |
|
339 else vfs.constructPath(master_dir, Isabelle_System.standard_path(path)) |
|
340 } |
337 } |
341 } |
338 |
342 |
339 def require(canonical_name: String) |
343 def require(canonical_name: String) |
340 { |
344 { |
341 Swing_Thread.later { |
345 Swing_Thread.later { |