clarified ISABELLE_DOC_FORMAT -- eliminated slightly odd fall-back;
authorwenzelm
Tue, 25 Jun 2013 19:25:40 +0200
changeset 52448 082a1c8c2c89
parent 52447 9a74000426e2
child 52449 79e7fd57acc4
clarified ISABELLE_DOC_FORMAT -- eliminated slightly odd fall-back;
src/Pure/Tools/doc.scala
--- a/src/Pure/Tools/doc.scala	Tue Jun 25 19:13:37 2013 +0200
+++ b/src/Pure/Tools/doc.scala	Tue Jun 25 19:25:40 2013 +0200
@@ -53,19 +53,12 @@
 
   def view(name: String)
   {
-    val formats = List(Isabelle_System.getenv_strict("ISABELLE_DOC_FORMAT"), "dvi")
-    val docs =
-      for {
-        dir <- dirs()
-        fmt <- formats
-        doc = name + "." + fmt
-        if (dir + Path.basic(doc)).is_file
-      } yield (dir, doc)
-    docs match {
-      case (dir, doc) :: _ =>
+    val doc = name + "." + Isabelle_System.getenv_strict("ISABELLE_DOC_FORMAT")
+    dirs().find(dir => (dir + Path.basic(doc)).is_file) match {
+      case Some(dir) =>
         Isabelle_System.bash_env(dir.file, null,
           "\"$ISABELLE_TOOL\" display " + quote(doc) + " >/dev/null 2>/dev/null &")
-      case Nil => error("Missing Isabelle documentation: " + quote(name))
+      case None => error("Missing Isabelle documentation file: " + quote(doc))
     }
   }