equal
deleted
inserted
replaced
133 import_name(session_base.theory_qualifier(name), name.master_dir, s) |
133 import_name(session_base.theory_qualifier(name), name.master_dir, s) |
134 |
134 |
135 def import_name(info: Sessions.Info, s: String): Document.Node.Name = |
135 def import_name(info: Sessions.Info, s: String): Document.Node.Name = |
136 import_name(info.name, info.dir.implode, s) |
136 import_name(info.name, info.dir.implode, s) |
137 |
137 |
138 def theory_name(default_qualifier: String, file: JFile): Option[Document.Node.Name] = |
138 def find_theory(default_qualifier: String, file: JFile): Option[Document.Node.Name] = |
139 { |
139 { |
140 val dir = File.canonical(file).getParentFile |
140 val dir = File.canonical(file).getParentFile |
141 val qualifier = session_base.session_directories.get(dir).getOrElse(default_qualifier) |
141 val qualifier = session_base.session_directories.get(dir).getOrElse(default_qualifier) |
142 Thy_Header.theory_name(file.getName) match { |
142 Thy_Header.theory_name(file.getName) match { |
143 case "" => None |
143 case "" => None |