diff --git a/src/Pure/General/file.scala b/src/Pure/General/file.scala
--- a/src/Pure/General/file.scala
+++ b/src/Pure/General/file.scala
@@ -1,329 +1,329 @@
 /*  Title:      Pure/General/file.scala
     Author:     Makarius
 
 File-system operations.
 */
 
 package isabelle
 
 
 import java.io.{BufferedWriter, OutputStreamWriter, FileOutputStream, BufferedOutputStream,
   OutputStream, InputStream, FileInputStream, BufferedInputStream, BufferedReader,
   InputStreamReader, File => JFile, IOException}
 import java.nio.file.{StandardOpenOption, Path => JPath, Files, SimpleFileVisitor,
   FileVisitOption, FileVisitResult}
 import java.nio.file.attribute.BasicFileAttributes
 import java.net.{URL, MalformedURLException}
 import java.util.zip.{GZIPInputStream, GZIPOutputStream}
 import java.util.EnumSet
 
 import org.tukaani.xz.{XZInputStream, XZOutputStream}
 
 import scala.collection.mutable
 
 
 object File {
   /* standard path (Cygwin or Posix) */
 
   def standard_path(path: Path): String = path.expand.implode
 
   def standard_path(platform_path: String): String =
     isabelle.setup.Environment.standard_path(platform_path)
 
   def standard_path(file: JFile): String = standard_path(file.getPath)
 
   def standard_url(name: String): String =
     try {
       val url = new URL(name)
       if (url.getProtocol == "file" && Url.is_wellformed_file(name))
         standard_path(Url.parse_file(name))
       else name
     }
     catch { case _: MalformedURLException => standard_path(name) }
 
 
   /* platform path (Windows or Posix) */
 
   def platform_path(standard_path: String): String =
     isabelle.setup.Environment.platform_path(standard_path)
 
   def platform_path(path: Path): String = platform_path(standard_path(path))
   def platform_file(path: Path): JFile = new JFile(platform_path(path))
 
 
   /* platform files */
 
   def absolute(file: JFile): JFile = file.toPath.toAbsolutePath.normalize.toFile
   def absolute_name(file: JFile): String = absolute(file).getPath
 
   def canonical(file: JFile): JFile = file.getCanonicalFile
   def canonical_name(file: JFile): String = canonical(file).getPath
 
   def path(file: JFile): Path = Path.explode(standard_path(file))
   def pwd(): Path = path(Path.current.absolute_file)
 
 
   /* relative paths */
 
   def relative_path(base: Path, other: Path): Option[Path] = {
     val base_path = base.java_path
     val other_path = other.java_path
     if (other_path.startsWith(base_path))
       Some(path(base_path.relativize(other_path).toFile))
     else None
   }
 
 
   /* bash path */
 
   def bash_path(path: Path): String = Bash.string(standard_path(path))
   def bash_path(file: JFile): String = Bash.string(standard_path(file))
 
   def bash_platform_path(path: Path): String = Bash.string(platform_path(path))
 
 
   /* directory entries */
 
   def check_dir(path: Path): Path =
     if (path.is_dir) path else error("No such directory: " + path)
 
   def check_file(path: Path): Path =
     if (path.is_file) path else error("No such file: " + path)
 
 
   /* directory content */
 
   def read_dir(dir: Path): List[String] = {
     if (!dir.is_dir) error("No such directory: " + dir.toString)
     val files = dir.file.listFiles
     if (files == null) Nil
     else files.toList.map(_.getName).sorted
   }
 
   def get_dir(dir: Path): String =
     read_dir(dir).filter(name => (dir + Path.basic(name)).is_dir) match {
       case List(entry) => entry
       case dirs =>
         error("Exactly one directory entry expected: " + commas_quote(dirs.sorted))
     }
 
   def find_files(
     start: JFile,
     pred: JFile => Boolean = _ => true,
     include_dirs: Boolean = false,
     follow_links: Boolean = false
   ): List[JFile] = {
     val result = new mutable.ListBuffer[JFile]
     def check(file: JFile): Unit = if (pred(file)) result += file
 
     if (start.isFile) check(start)
     else if (start.isDirectory) {
       val options =
         if (follow_links) EnumSet.of(FileVisitOption.FOLLOW_LINKS)
         else EnumSet.noneOf(classOf[FileVisitOption])
       Files.walkFileTree(start.toPath, options, Integer.MAX_VALUE,
         new SimpleFileVisitor[JPath] {
           override def preVisitDirectory(
             path: JPath,
             attrs: BasicFileAttributes
           ): FileVisitResult = {
             if (include_dirs) check(path.toFile)
             FileVisitResult.CONTINUE
           }
           override def visitFile(
             path: JPath,
             attrs: BasicFileAttributes
           ): FileVisitResult = {
             val file = path.toFile
             if (include_dirs || !file.isDirectory) check(file)
             FileVisitResult.CONTINUE
           }
         }
       )
     }
 
     result.toList
   }
 
 
   /* read */
 
   def read(file: JFile): String = Bytes.read(file).text
   def read(path: Path): String = read(path.file)
 
 
   def read_stream(reader: BufferedReader): String = {
     val output = new StringBuilder(100)
     var c = -1
     while ({ c = reader.read; c != -1 }) output += c.toChar
     reader.close()
     output.toString
   }
 
   def read_stream(stream: InputStream): String =
     read_stream(new BufferedReader(new InputStreamReader(stream, UTF8.charset)))
 
   def read_gzip(file: JFile): String =
     read_stream(new GZIPInputStream(new BufferedInputStream(new FileInputStream(file))))
   def read_gzip(path: Path): String = read_gzip(path.file)
 
   def read_xz(file: JFile): String =
     read_stream(new XZInputStream(new BufferedInputStream(new FileInputStream(file))))
   def read_xz(path: Path): String = read_xz(path.file)
 
 
   /* read lines */
 
   def read_line(reader: BufferedReader): Option[String] = {
     val line =
       try { reader.readLine}
       catch { case _: IOException => null }
     Option(line).map(Library.trim_line)
   }
 
   def read_lines(reader: BufferedReader, progress: String => Unit): List[String] = {
     val result = new mutable.ListBuffer[String]
     var line: Option[String] = None
     while ({ line = read_line(reader); line.isDefined }) {
       progress(line.get)
       result += line.get
     }
     reader.close()
     result.toList
   }
 
 
   /* write */
 
   def writer(file: JFile): BufferedWriter =
     new BufferedWriter(new OutputStreamWriter(new FileOutputStream(file), UTF8.charset))
 
   def write_file(
     file: JFile,
     text: String,
     make_stream: OutputStream => OutputStream
   ): Unit = {
     val stream = make_stream(new FileOutputStream(file))
     using(new BufferedWriter(new OutputStreamWriter(stream, UTF8.charset)))(_.append(text))
   }
 
   def write(file: JFile, text: String): Unit = write_file(file, text, s => s)
   def write(path: Path, text: String): Unit = write(path.file, text)
 
   def write_gzip(file: JFile, text: String): Unit =
     write_file(file, text, (s: OutputStream) => new GZIPOutputStream(new BufferedOutputStream(s)))
   def write_gzip(path: Path, text: String): Unit = write_gzip(path.file, text)
 
   def write_xz(file: JFile, text: String, options: XZ.Options): Unit =
     File.write_file(file, text, s => new XZOutputStream(new BufferedOutputStream(s), options))
   def write_xz(file: JFile, text: String): Unit = write_xz(file, text, XZ.options())
   def write_xz(path: Path, text: String, options: XZ.Options): Unit =
     write_xz(path.file, text, options)
   def write_xz(path: Path, text: String): Unit = write_xz(path, text, XZ.options())
 
   def write_backup(path: Path, text: String): Unit = {
     if (path.is_file) Isabelle_System.move_file(path, path.backup)
     write(path, text)
   }
 
   def write_backup2(path: Path, text: String): Unit = {
     if (path.is_file) Isabelle_System.move_file(path, path.backup2)
     write(path, text)
   }
 
 
   /* append */
 
   def append(file: JFile, text: String): Unit =
     Files.write(file.toPath, UTF8.bytes(text),
       StandardOpenOption.APPEND, StandardOpenOption.CREATE)
 
   def append(path: Path, text: String): Unit = append(path.file, text)
 
 
   /* change */
 
   def change(
     path: Path,
     init: Boolean = false,
     strict: Boolean = false
   )(f: String => String): Unit = {
     if (!path.is_file && init) write(path, "")
     val x = read(path)
     val y = f(x)
     if (x != y) write(path, y)
     else if (strict) error("Unchanged file: " + path)
   }
 
   def change_lines(path: Path, init: Boolean = false, strict: Boolean = false)(
       f: List[String] => List[String]): Unit =
     change(path, init = init, strict = strict)(text => cat_lines(f(split_lines(text))))
 
 
   /* eq */
 
   def eq(file1: JFile, file2: JFile): Boolean =
     try { Files.isSameFile(file1.toPath, file2.toPath) }
     catch { case ERROR(_) => false }
 
   def eq(path1: Path, path2: Path): Boolean = eq(path1.file, path2.file)
 
 
   /* eq_content */
 
   def eq_content(file1: JFile, file2: JFile): Boolean =
     if (eq(file1, file2)) true
     else if (file1.length != file2.length) false
     else Bytes.read(file1) == Bytes.read(file2)
 
   def eq_content(path1: Path, path2: Path): Boolean = eq_content(path1.file, path2.file)
 
 
   /* permissions */
 
   def is_executable(path: Path): Boolean = {
     if (Platform.is_windows) Isabelle_System.bash("test -x " + bash_path(path)).check.ok
     else path.file.canExecute
   }
 
   def set_executable(path: Path, flag: Boolean): Unit = {
     if (Platform.is_windows && flag) Isabelle_System.chmod("a+x", path)
     else if (Platform.is_windows) Isabelle_System.chmod("a-x", path)
     else path.file.setExecutable(flag, false)
   }
 
 
   /* content */
 
   object Content {
-    def apply(path: Path, content: Bytes): Content = new Content_Bytes(path, content)
-    def apply(path: Path, content: String): Content = new Content_String(path, content)
+    def apply(path: Path, content: Bytes): Content_Bytes = new Content_Bytes(path, content)
+    def apply(path: Path, content: String): Content_String = new Content_String(path, content)
     def apply(path: Path, content: XML.Body): Content_XML = new Content_XML(path, content)
   }
 
   trait Content {
     def path: Path
     def write(dir: Path): Unit
   }
 
-  final class Content_Bytes private[File](val path: Path, content: Bytes) extends Content {
+  final class Content_Bytes private[File](val path: Path, val content: Bytes) extends Content {
     def write(dir: Path): Unit = {
       val full_path = dir + path
       Isabelle_System.make_directory(full_path.expand.dir)
       Bytes.write(full_path, content)
     }
   }
 
-  final class Content_String private[File](val path: Path, content: String) extends Content {
+  final class Content_String private[File](val path: Path, val content: String) extends Content {
     def write(dir: Path): Unit = {
       val full_path = dir + path
       Isabelle_System.make_directory(full_path.expand.dir)
       File.write(full_path, content)
     }
   }
 
-  final class Content_XML private[File](val path: Path, content: XML.Body) {
+  final class Content_XML private[File](val path: Path, val content: XML.Body) {
     def output(out: XML.Body => String): Content_String =
       new Content_String(path, out(content))
   }
 }